wip

Author: smola

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadContext.java

@@ -2,7 +2,7 @@
 
 import static datadog.trace.api.iast.IastDetectionMode.UNLIMITED;
 
-import datadog.trace.util.NonBlockingSemaphore;
+import com.datadog.iast.util.NonBlockingSemaphore;
 
 public class OverheadContext {
 

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java

@@ -4,6 +4,7 @@
 
 import com.datadog.iast.IastRequestContext;
 import com.datadog.iast.IastSystem;
+import com.datadog.iast.util.NonBlockingSemaphore;
 import datadog.trace.api.Config;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.gateway.RequestContextSlot;
@@ -12,7 +13,6 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.NonBlockingSemaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nullable;

…dog/trace/util/NonBlockingSemaphore.java …adog/iast/util/NonBlockingSemaphore.javainternal-api/src/main/java/datadog/trace/util/NonBlockingSemaphore.java renamed to dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java internal-api/src/main/java/datadog/trace/util/NonBlockingSemaphore.java renamed to dd-java-agent/agent-iast/src/main/java/com/datadog/iast/util/NonBlockingSemaphore.java

@@ -1,4 +1,4 @@
-package datadog.trace.util;
+package com.datadog.iast.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;

…ace/util/NonBlockingSemaphoreTest.groovy …ast/util/NonBlockingSemaphoreTest.groovyinternal-api/src/test/groovy/datadog/trace/util/NonBlockingSemaphoreTest.groovy renamed to dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/NonBlockingSemaphoreTest.groovy internal-api/src/test/groovy/datadog/trace/util/NonBlockingSemaphoreTest.groovy renamed to dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/NonBlockingSemaphoreTest.groovy

@@ -1,4 +1,4 @@
-package datadog.trace.util
+package com.datadog.iast.util
 
 
 import groovy.transform.CompileDynamic

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

@@ -2,15 +2,15 @@
 
 import com.datadog.appsec.gateway.AppSecRequestContext;
 import datadog.trace.api.Config;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
 import datadog.trace.api.time.SystemTimeSource;
 import datadog.trace.api.time.TimeSource;
-import datadog.trace.util.NonBlockingSemaphore;
 import java.util.Deque;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.Semaphore;
 import javax.annotation.Nonnull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ApiSecurityRequestSampler {
 
@@ -32,11 +32,13 @@ public class ApiSecurityRequestSampler {
   private final long expirationTimeInMs;
   private final int capacity;
   private final TimeSource timeSource;
-  private final NonBlockingSemaphore counter =
-      NonBlockingSemaphore.withPermitCount(MAX_POST_PROCESSING_TASKS);
+  private final Semaphore counter = new Semaphore(MAX_POST_PROCESSING_TASKS);
 
   public ApiSecurityRequestSampler() {
-    this(MAX_SIZE, (long) (Config.get().getApiSecuritySampleDelay() * 1_000), SystemTimeSource.INSTANCE);
+    this(
+        MAX_SIZE,
+        (long) (Config.get().getApiSecuritySampleDelay() * 1_000),
+        SystemTimeSource.INSTANCE);
   }
 
   public ApiSecurityRequestSampler(
@@ -75,7 +77,7 @@ public void preSampleRequest(final @Nonnull AppSecRequestContext ctx) {
       log.debug("API security sampling is not required for this request");
       return;
     }
-    if (counter.acquire()) {
+    if (counter.tryAcquire()) {
       log.debug("API security sampling is required for this request (presampled)");
       ctx.setKeepOpenForApiSecurityPostProcessing(true);
     }

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -1318,7 +1318,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     apiSecurityRequestSampleRate =
         configProvider.getFloat(
             API_SECURITY_REQUEST_SAMPLE_RATE, DEFAULT_API_SECURITY_REQUEST_SAMPLE_RATE);
-    apiSecuritySampleDelay = configProvider.getFloat(API_SECURITY_SAMPLE_DELAY, DEFAULT_API_SECURITY_SAMPLE_DELAY);
+    apiSecuritySampleDelay =
+        configProvider.getFloat(API_SECURITY_SAMPLE_DELAY, DEFAULT_API_SECURITY_SAMPLE_DELAY);
 
     iastDebugEnabled = configProvider.getBoolean(IAST_DEBUG_ENABLED, DEFAULT_IAST_DEBUG_ENABLED);