Move to queue-utils

amarziali · amarziali · commit 374d13da048f · 2025-11-07T15:59:19.000+01:00
diff --git a/dd-java-agent/agent-llmobs/build.gradle b/dd-java-agent/agent-llmobs/build.gradle
@@ -29,7 +29,7 @@ dependencies {
   implementation project(':communication')
   implementation project(':components:json')
   implementation project(':internal-api')
-  implementation project(':internal-api:internal-api-9')
+  implementation project(':utils:queue-utils')
 
 
   testImplementation project(':dd-java-agent:testing')
diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/EvalProcessingWorker.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/EvalProcessingWorker.java
@@ -6,14 +6,14 @@
 
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
+import datadog.common.queue.BlockingConsumerNonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.communication.http.HttpRetryPolicy;
 import datadog.communication.http.OkHttpUtils;
 import datadog.trace.api.Config;
 import datadog.trace.llmobs.domain.LLMObsEval;
-import datadog.trace.util.queue.BlockingConsumerNonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
@@ -347,6 +347,9 @@ dependencies {
   sharedShadowInclude project(':utils:socket-utils'), {
     transitive = false
   }
+  sharedShadowInclude project(':utils:queue-utils'), {
+    transitive = false
+  }
   sharedShadowInclude project(':utils:version-utils'), {
     transitive = false
   }
diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle
@@ -66,10 +66,10 @@ dependencies {
   api project(':dd-trace-api')
   api project(':communication')
   api project(':internal-api')
-  api project(':internal-api:internal-api-9')
   implementation project(':components:json')
   implementation project(':utils:container-utils')
   implementation project(':utils:socket-utils')
+  implementation project(':utils:queue-utils')
   // for span exception debugging
   compileOnly project(':dd-java-agent:agent-debugger:debugger-bootstrap')
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/Aggregator.java
@@ -2,9 +2,9 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import datadog.common.queue.NonBlockingQueue;
 import datadog.trace.common.metrics.SignalItem.StopSignal;
 import datadog.trace.core.util.LRUCache;
-import datadog.trace.util.queue.NonBlockingQueue;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java
@@ -19,6 +19,8 @@
 import static java.util.Collections.unmodifiableSet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import datadog.common.queue.NonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.trace.api.Config;
@@ -33,8 +35,6 @@
 import datadog.trace.core.DDTraceCoreInfo;
 import datadog.trace.core.monitor.HealthMetrics;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.queue.NonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/OkHttpSink.java
@@ -9,9 +9,9 @@
 import static datadog.trace.common.metrics.EventListener.EventType.OK;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import datadog.common.queue.NonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.queue.NonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Collections;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/SpanSamplingWorker.java
@@ -5,13 +5,13 @@
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import datadog.common.queue.BlockingConsumerNonBlockingQueue;
+import datadog.common.queue.NonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.DroppingPolicy;
 import datadog.trace.common.sampling.SingleSpanSampler;
 import datadog.trace.core.DDSpan;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.util.queue.BlockingConsumerNonBlockingQueue;
-import datadog.trace.util.queue.NonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java
@@ -5,6 +5,9 @@
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import datadog.common.queue.BlockingConsumerNonBlockingQueue;
+import datadog.common.queue.NonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.DroppingPolicy;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.instrumentation.api.SpanPostProcessor;
@@ -15,9 +18,6 @@
 import datadog.trace.core.CoreSpan;
 import datadog.trace.core.DDSpan;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.util.queue.BlockingConsumerNonBlockingQueue;
-import datadog.trace.util.queue.NonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTraceBuffer.java
@@ -6,14 +6,14 @@
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
 import static java.util.Comparator.comparingLong;
 
+import datadog.common.queue.BlockingConsumerNonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.trace.api.Config;
 import datadog.trace.api.flare.TracerFlare;
 import datadog.trace.api.time.TimeSource;
 import datadog.trace.common.writer.TraceDumpJsonExporter;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.util.queue.BlockingConsumerNonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java
@@ -11,6 +11,8 @@
 import static datadog.trace.util.AgentThreadFactory.THREAD_JOIN_TIMOUT_MS;
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
 
+import datadog.common.queue.NonBlockingQueue;
+import datadog.common.queue.Queues;
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.context.propagation.Propagator;
@@ -28,8 +30,6 @@
 import datadog.trace.core.DDSpan;
 import datadog.trace.core.DDTraceCoreInfo;
 import datadog.trace.util.AgentTaskScheduler;
-import datadog.trace.util.queue.NonBlockingQueue;
-import datadog.trace.util.queue.Queues;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -25,6 +25,7 @@ final class CachedData {
       exclude(project(':telemetry'))
       exclude(project(':utils:config-utils'))
       exclude(project(':utils:container-utils'))
+      exclude(project(':utils:queue-utils'))
       exclude(project(':utils:socket-utils'))
       exclude(project(':utils:time-utils'))
       exclude(project(':utils:version-utils'))
diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
@@ -63,7 +63,7 @@ if (project.hasProperty('minJavaVersionForTests') && project.findProperty('minJa
   // "socket-utils" is only set to compileOnly because the implementation dependency incorrectly adds Java17 classes to all jar prefixes.
   // This causes the AgentJarIndex to search for other non-Java17 classes in the wrong prefix location and fail to resolve class names.
   dependencies {
-    if ("${project.projectDir}".endsWith("socket-utils")) {
+    if ("${project.projectDir}".endsWithAny("socket-utils", "queue-utils")) {
       compileOnly(files(project.sourceSets."main_$name".output))
     } else {
       compileOnly(files(project.sourceSets."main_$name".compileClasspath))
diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts
@@ -37,7 +37,6 @@ val minimumInstructionCoverage by extra(0.8)
 
 dependencies {
   api(project(":internal-api"))
-  implementation(libs.jctools) // probably the Queues factory should be moved away from there
 
   testImplementation(project(":dd-java-agent:testing"))
   testImplementation(libs.slf4j)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -147,6 +147,7 @@ include(
   ":utils:config-utils",
   ":utils:container-utils",
   ":utils:flare-utils",
+  ":utils:queue-utils",
   ":utils:socket-utils",
   ":utils:test-agent-utils:decoder",
   ":utils:test-utils",
diff --git a/utils/queue-utils/build.gradle.kts b/utils/queue-utils/build.gradle.kts
@@ -0,0 +1,51 @@
+import groovy.lang.Closure
+import org.gradle.kotlin.dsl.extra
+
+plugins {
+  `java-library`
+  id("de.thetaphi.forbiddenapis") version "3.8"
+  id("me.champeau.jmh")
+  idea
+}
+
+val minJavaVersionForTests by extra(JavaVersion.VERSION_11)
+
+apply(from = "$rootDir/gradle/java.gradle")
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(11)
+  }
+}
+
+tasks.withType<Javadoc>().configureEach() {
+  javadocTool = javaToolchains.javadocToolFor(java.toolchain)
+}
+
+fun AbstractCompile.configureCompiler(javaVersionInteger: Int, compatibilityVersion: JavaVersion? = null, unsetReleaseFlagReason: String? = null) {
+  (project.extra["configureCompiler"] as Closure<*>).call(this, javaVersionInteger, compatibilityVersion, unsetReleaseFlagReason)
+}
+
+listOf(JavaCompile::class.java, GroovyCompile::class.java).forEach { compileTaskType ->
+  tasks.withType(compileTaskType).configureEach {
+    configureCompiler(11, JavaVersion.VERSION_1_8)
+  }
+}
+
+dependencies {
+  api(project(":internal-api"))
+  api(libs.jctools)
+
+  testImplementation(project(":dd-java-agent:testing"))
+  testImplementation(libs.slf4j)
+}
+
+tasks.forbiddenApisMain {
+  failOnMissingClasses = false
+}
+
+idea {
+  module {
+    jdkName = "11"
+  }
+}
diff --git a/utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCBlockingConsumerQueueBenchmark.java b/utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCBlockingConsumerQueueBenchmark.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCQueueBenchmark.java b/utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCQueueBenchmark.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/utils/queue-utils/src/jmh/java/datadog/common/queue/SPSCQueueBenchmark.java b/utils/queue-utils/src/jmh/java/datadog/common/queue/SPSCQueueBenchmark.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/BaseQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/BaseQueue.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import static datadog.trace.util.BitUtils.nextPowerOfTwo;
 
@@ -8,7 +8,7 @@
 import java.util.function.Supplier;
 import javax.annotation.Nonnull;
 
-public abstract class BaseQueue<E> extends AbstractQueue<E> implements NonBlockingQueue<E> {
+abstract class BaseQueue<E> extends AbstractQueue<E> implements NonBlockingQueue<E> {
   /** The capacity of the queue (must be a power of two) */
   protected final int capacity;
 
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/BlockingConsumerNonBlockingQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/BlockingConsumerNonBlockingQueue.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/JctoolsMpscBlockingConsumerWrappedQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/JctoolsMpscBlockingConsumerWrappedQueue.java
@@ -1,11 +1,11 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import org.jctools.queues.MpscBlockingConsumerArrayQueue;
 
-public class JctoolsMpscBlockingConsumerWrappedQueue<E> extends JctoolsWrappedQueue<E>
+class JctoolsMpscBlockingConsumerWrappedQueue<E> extends JctoolsWrappedQueue<E>
     implements BlockingConsumerNonBlockingQueue<E> {
 
   private final BlockingQueue<E> blockingQueueDelegate;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/JctoolsWrappedQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/JctoolsWrappedQueue.java
@@ -1,6 +1,4 @@
-package datadog.trace.util.queue;
-
-import static java.lang.Math.E;
+package datadog.common.queue;
 
 import java.util.AbstractQueue;
 import java.util.Iterator;
@@ -9,7 +7,7 @@
 import javax.annotation.Nonnull;
 import org.jctools.queues.MessagePassingQueue;
 
-public class JctoolsWrappedQueue<E> extends AbstractQueue<E> implements NonBlockingQueue<E> {
+class JctoolsWrappedQueue<E> extends AbstractQueue<E> implements NonBlockingQueue<E> {
   private final MessagePassingQueue<E> delegate;
 
   public JctoolsWrappedQueue(@Nonnull MessagePassingQueue<E> delegate) {
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/MpscArrayQueueVarHandle.java b/utils/queue-utils/src/main/java/datadog/common/queue/MpscArrayQueueVarHandle.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
@@ -14,7 +14,7 @@
  *
  * @param <E> the type of elements stored
  */
-public class MpscArrayQueueVarHandle<E> extends BaseQueue<E> {
+class MpscArrayQueueVarHandle<E> extends BaseQueue<E> {
   private static final VarHandle ARRAY_HANDLE;
   private static final VarHandle HEAD_HANDLE;
   private static final VarHandle TAIL_HANDLE;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueueVarHandle.java b/utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueueVarHandle.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
@@ -9,7 +9,7 @@
  *
  * <p>The wait is performed by parking/unparking the consumer thread.
  */
-public class MpscBlockingConsumerArrayQueueVarHandle<E> extends MpscArrayQueueVarHandle<E>
+class MpscBlockingConsumerArrayQueueVarHandle<E> extends MpscArrayQueueVarHandle<E>
     implements BlockingConsumerNonBlockingQueue<E> {
   /** Consumer thread reference for wake-up. */
   private volatile Thread consumerThread;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/NonBlockingQueue.java b/utils/queue-utils/src/main/java/datadog/common/queue/NonBlockingQueue.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.util.Queue;
 import java.util.function.Consumer;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java b/utils/queue-utils/src/main/java/datadog/common/queue/Queues.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import datadog.environment.JavaVirtualMachine;
 import org.jctools.queues.MpscArrayQueue;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/SpmcArrayQueueVarHandle.java b/utils/queue-utils/src/main/java/datadog/common/queue/SpmcArrayQueueVarHandle.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -11,7 +11,7 @@
  *
  * @param <E> the element type
  */
-public class SpmcArrayQueueVarHandle<E> extends BaseQueue<E> {
+class SpmcArrayQueueVarHandle<E> extends BaseQueue<E> {
 
   private static final VarHandle HEAD_HANDLE;
   private static final VarHandle TAIL_HANDLE;
diff --git a/utils/queue-utils/src/main/java/datadog/common/queue/SpscArrayQueueVarHandle.java b/utils/queue-utils/src/main/java/datadog/common/queue/SpscArrayQueueVarHandle.java
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue;
+package datadog.common.queue;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -10,7 +10,7 @@
  *
  * @param <E> the type of elements held in this queue
  */
-public class SpscArrayQueueVarHandle<E> extends BaseQueue<E> {
+class SpscArrayQueueVarHandle<E> extends BaseQueue<E> {
   /** Backing array storing elements. */
   private final Object[] buffer;
 
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/AbstractQueueTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/AbstractQueueTest.groovy
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue
+package datadog.common.queue
 
 
 import datadog.trace.test.util.DDSpecification
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/JctoolsWrapppersTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/JctoolsWrapppersTest.groovy
@@ -1,4 +1,4 @@
-package datadog.trace.util.queue
+package datadog.common.queue
 
 import datadog.trace.test.util.DDSpecification
 import java.util.concurrent.TimeUnit
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/MpscArrayQueueVarHandleTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/MpscArrayQueueVarHandleTest.groovy
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/MpscBlockingConsumerArrayQueueVarHandleTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/MpscBlockingConsumerArrayQueueVarHandleTest.groovy
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/SpmcArrayQueueVarHandleTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/SpmcArrayQueueVarHandleTest.groovy
diff --git a/utils/queue-utils/src/test/java/datadog/common/queue/SpscArrayQueueVarHandleTest.groovy b/utils/queue-utils/src/test/java/datadog/common/queue/SpscArrayQueueVarHandleTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,9 @@ dependencies {`
`347`	`347`	`sharedShadowInclude project(':utils:socket-utils'), {`
`348`	`348`	`transitive = false`
`349`	`349`	`}`
	`350`	`+ sharedShadowInclude project(':utils:queue-utils'), {`
	`351`	`+ transitive = false`
	`352`	`+ }`
`350`	`353`	`sharedShadowInclude project(':utils:version-utils'), {`
`351`	`354`	`transitive = false`
`352`	`355`	`}`