Remove old java 8 implementation and reintroduce jctools for 1.8

Author: amarziali

dd-java-agent/agent-builder/gradle.lockfile

@@ -109,6 +109,7 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
+org.jctools:jctools-core:3.3.0=runtimeClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.12.2=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-debugger/gradle.lockfile

@@ -123,6 +123,7 @@ org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.14=jacocoAnt
 org.jacoco:org.jacoco.report:0.8.14=jacocoAnt
+org.jctools:jctools-core:3.3.0=testRuntimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21=testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21=testRuntimeClasspath

dd-java-agent/agent-llmobs/build.gradle

@@ -12,6 +12,7 @@ minimumInstructionCoverage = 0.0
 
 dependencies {
   api libs.slf4j
+  implementation libs.jctools
 
   implementation project(':communication')
   implementation project(':components:json')

dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/EvalProcessingWorker.java

@@ -12,7 +12,7 @@
 import datadog.communication.http.OkHttpUtils;
 import datadog.trace.api.Config;
 import datadog.trace.llmobs.domain.LLMObsEval;
-import datadog.trace.util.queue.BaseQueue;
+import datadog.trace.util.queue.BlockingConsumerNonBlockingQueue;
 import datadog.trace.util.queue.Queues;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +35,7 @@ public class EvalProcessingWorker implements AutoCloseable {
 
   private static final Logger log = LoggerFactory.getLogger(EvalProcessingWorker.class);
 
-  private final BaseQueue<LLMObsEval> queue;
+  private final BlockingConsumerNonBlockingQueue<LLMObsEval> queue;
   private final Thread serializerThread;
 
   public EvalProcessingWorker(
@@ -44,7 +44,7 @@ public EvalProcessingWorker(
       final TimeUnit timeUnit,
       final SharedCommunicationObjects sco,
       Config config) {
-    this.queue = Queues.mpscArrayQueue(capacity);
+    this.queue = Queues.mpscBlockingConsumerArrayQueue(capacity);
 
     boolean isAgentless = config.isLlmObsAgentlessEnabled();
     if (isAgentless && (config.getApiKey() == null || config.getApiKey().isEmpty())) {
@@ -99,7 +99,7 @@ public static class EvalSerializingHandler implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(EvalSerializingHandler.class);
     private static final int FLUSH_THRESHOLD = 50;
 
-    private final BaseQueue<LLMObsEval> queue;
+    private final BlockingConsumerNonBlockingQueue<LLMObsEval> queue;
     private final long ticksRequiredToFlush;
     private long lastTicks;
 
@@ -112,7 +112,7 @@ public static class EvalSerializingHandler implements Runnable {
     private final List<LLMObsEval> buffer = new ArrayList<>();
 
     public EvalSerializingHandler(
-        final BaseQueue<LLMObsEval> queue,
+        final BlockingConsumerNonBlockingQueue<LLMObsEval> queue,
         final long flushInterval,
         final TimeUnit timeUnit,
         final HttpUrl submissionUrl,

dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

@@ -14,6 +14,7 @@ testJvmConstraints {
 dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller')
 
+  implementation libs.jctools
   implementation libs.slf4j
 
   annotationProcessor libs.autoservice.processor

dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/AnnotationSubstitutionProcessorInstrumentation.java

@@ -37,6 +37,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public String[] helperClassNames() {
     return new String[] {
       packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
+      packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
       packageName + ".Target_org_datadog_jmxfetch_App",
       packageName + ".Target_org_datadog_jmxfetch_Status",
       packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter",
@@ -51,6 +52,7 @@ public String[] muzzleIgnoredClassNames() {
       "jdk.vm.ci.meta.ResolvedJavaField",
       // ignore helper class names as usual
       packageName + ".Target_com_datadog_profiling_agent_ProcessContext",
+      packageName + ".Target_datadog_jctools_util_UnsafeRefArrayAccess",
       packageName + ".Target_org_datadog_jmxfetch_App",
       packageName + ".Target_org_datadog_jmxfetch_Status",
       packageName + ".Target_org_datadog_jmxfetch_reporter_JsonReporter",
@@ -61,6 +63,7 @@ public static class FindTargetClassesAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void onExit(@Advice.Return(readOnly = false) List<Class<?>> result) {
       result.add(Target_com_datadog_profiling_agent_ProcessContext.class);
+      result.add(Target_datadog_jctools_util_UnsafeRefArrayAccess.class);
       result.add(Target_org_datadog_jmxfetch_App.class);
       result.add(Target_org_datadog_jmxfetch_Status.class);
       result.add(Target_org_datadog_jmxfetch_reporter_JsonReporter.class);

dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/Target_datadog_jctools_util_UnsafeRefArrayAccess.java

@@ -0,0 +1,12 @@
+package datadog.trace.instrumentation.graal.nativeimage;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(className = "datadog.jctools.util.UnsafeRefArrayAccess")
+public final class Target_datadog_jctools_util_UnsafeRefArrayAccess {
+  @Alias
+  @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.ArrayIndexShift, declClass = Object[].class)
+  public static int REF_ELEMENT_SHIFT;
+}

dd-trace-core/build.gradle

@@ -75,6 +75,7 @@ dependencies {
 
   implementation libs.slf4j
   implementation libs.moshi
+  implementation libs.jctools
 
   implementation group: 'com.datadoghq', name: 'sketches-java', version: '0.8.3'
 

dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java

@@ -4,7 +4,7 @@
 
 import datadog.trace.common.metrics.SignalItem.StopSignal;
 import datadog.trace.core.util.LRUCache;
-import datadog.trace.util.queue.BaseQueue;
+import datadog.trace.util.queue.NonBlockingQueue;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Iterator;
 import java.util.Map;
@@ -23,7 +23,7 @@ final class Aggregator implements Runnable {
   private static final Logger log = LoggerFactory.getLogger(Aggregator.class);
 
   private final Queue<Batch> batchPool;
-  private final BaseQueue<InboxItem> inbox;
+  private final NonBlockingQueue<InboxItem> inbox;
   private final LRUCache<MetricKey, AggregateMetric> aggregates;
   private final ConcurrentMap<MetricKey, Batch> pending;
   private final Set<MetricKey> commonKeys;
@@ -43,7 +43,7 @@ final class Aggregator implements Runnable {
   Aggregator(
       MetricWriter writer,
       Queue<Batch> batchPool,
-      BaseQueue<InboxItem> inbox,
+      NonBlockingQueue<InboxItem> inbox,
       ConcurrentMap<MetricKey, Batch> pending,
       final Set<MetricKey> commonKeys,
       int maxAggregates,
@@ -64,7 +64,7 @@ final class Aggregator implements Runnable {
   Aggregator(
       MetricWriter writer,
       Queue<Batch> batchPool,
-      BaseQueue<InboxItem> inbox,
+      NonBlockingQueue<InboxItem> inbox,
       ConcurrentMap<MetricKey, Batch> pending,
       final Set<MetricKey> commonKeys,
       int maxAggregates,

dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java

@@ -33,7 +33,7 @@
 import datadog.trace.core.DDTraceCoreInfo;
 import datadog.trace.core.monitor.HealthMetrics;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.queue.BaseQueue;
+import datadog.trace.util.queue.NonBlockingQueue;
 import datadog.trace.util.queue.Queues;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -94,7 +94,7 @@ public final class ConflatingMetricsAggregator implements MetricsAggregator, Eve
   private final ConcurrentHashMap<MetricKey, Batch> pending;
   private final ConcurrentHashMap<MetricKey, MetricKey> keys;
   private final Thread thread;
-  private final BaseQueue<InboxItem> inbox;
+  private final NonBlockingQueue<InboxItem> inbox;
   private final Sink sink;
   private final Aggregator aggregator;
   private final long reportingInterval;