wip

Author: smola

dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java

@@ -59,6 +59,10 @@ public void process(@Nonnull AgentSpan span, @Nonnull BooleanSupplier timeoutChe
     } finally {
       ctx.setKeepOpenForApiSecurityPostProcessing(false);
       try {
+        // XXX: Close the additive first. This is not strictly needed, but it'll prevent getting it
+        // detected as a
+        // missed request-ended event.
+        ctx.closeAdditive();
         ctx.close();
       } catch (Exception e) {
         log.debug("Error closing AppSecRequestContext", e);

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/AppSecSpanPostProcessorTest.groovy

@@ -37,6 +37,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * producer.publishDataEvent(_, ctx, _, _)
     1 * ctx.commitDerivatives(traceSegment)
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close()
     1 * sampler.releaseOne()
     0 * _
@@ -61,6 +62,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * ctx.isKeepOpenForApiSecurityPostProcessing() >> true
     1 * sampler.sampleRequest(_) >> false
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close()
     1 * sampler.releaseOne()
     0 * _
@@ -88,6 +90,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * reqCtx.getTraceSegment() >> traceSegment
     1 * producer.getDataSubscribers(_) >> null
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close() >> { throw new RuntimeException() }
     1 * sampler.releaseOne()
     0 * _
@@ -111,6 +114,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * reqCtx.getData(_) >> ctx
     1 * ctx.isKeepOpenForApiSecurityPostProcessing() >> true
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close()
     1 * sampler.releaseOne()
     0 * _
@@ -208,6 +212,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * producer.getDataSubscribers(_) >> subInfo
     1 * subInfo.isEmpty() >> true
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close()
     1 * sampler.releaseOne()
     0 * _
@@ -238,6 +243,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification {
     1 * subInfo.isEmpty() >> false
     1 * producer.publishDataEvent(_, ctx, _, _) >> { throw new ExpiredSubscriberInfoException() }
     1 * ctx.setKeepOpenForApiSecurityPostProcessing(false)
+    1 * ctx.closeAdditive()
     1 * ctx.close()
     1 * sampler.releaseOne()
     0 * _