self review

Author: jandro996

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

@@ -66,11 +66,9 @@ public boolean preSampleRequest(final @Nonnull AppSecRequestContext ctx) {
     }
     long hash = computeApiHash(route, method, statusCode);
     ctx.setApiSecurityEndpointHash(hash);
-
     if (!isApiAccessExpired(hash)) {
       return false;
     }
-
     if (counter.tryAcquire()) {
       log.debug("API security sampling is required for this request (presampled)");
       ctx.setKeepOpenForApiSecurityPostProcessing(true);
@@ -95,6 +93,7 @@ public boolean sampleRequest(AppSecRequestContext ctx) {
     }
     final Long hash = ctx.getApiSecurityEndpointHash();
     if (hash == null) {
+      // This should never happen, it should have been short-circuited before.
       return false;
     }
     return true;

dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java

@@ -837,19 +837,15 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
     Map<String, Object> tags = spanInfo.getTags();
 
     boolean sampledForApiSec = maybeSampleForApiSecurity(ctx, spanInfo, tags);
-    boolean apmTracingEnabled = Config.get().isApmTracingEnabled();
 
     if (!sampledForApiSec) {
       ctx.closeWafContext();
     }
 
     // AppSec report metric and events for web span only
     if (traceSeg != null) {
-      // Set API Security sampling tags if needed
-      if (sampledForApiSec && !apmTracingEnabled) {
+      if (sampledForApiSec && !Config.get().isApmTracingEnabled()) {
         traceSeg.setTagTop(Tags.ASM_KEEP, true);
-        // Must set _dd.p.ts locally so TraceCollector respects force-keep in standalone mode
-        // (TraceCollector.java lines 67-74 ignore force-keep without _dd.p.ts when APM disabled)
         traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
       }
 
@@ -869,8 +865,7 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
 
       // If detected any events - mark span at appsec.event
       if (!collectedEvents.isEmpty()) {
-        boolean manuallyKept = ctx.isManuallyKept();
-        if (manuallyKept) {
+        if (ctx.isManuallyKept()) {
           // Set asm keep in case that root span was not available when events are detected
           traceSeg.setTagTop(Tags.ASM_KEEP, true);
           traceSeg.setTagTop(Tags.PROPAGATED_TRACE_SOURCE, ProductTraceSource.ASM);
@@ -942,14 +937,11 @@ private NoopFlow onRequestEnded(RequestContext ctx_, IGSpanInfo spanInfo) {
   private boolean maybeSampleForApiSecurity(
       AppSecRequestContext ctx, IGSpanInfo spanInfo, Map<String, Object> tags) {
     log.debug("Checking API Security for end of request handler on span: {}", spanInfo.getSpanId());
-
     // API Security sampling requires http.route tag.
     final Object route = tags.get(Tags.HTTP_ROUTE);
-
     if (route != null) {
       ctx.setRoute(route.toString());
     }
-
     ApiSecuritySampler requestSampler = requestSamplerSupplier.get();
     return requestSampler.preSampleRequest(ctx);
   }