Realign implementation with candidate upstream

Author: amarziali

utils/queue-utils/build.gradle.kts

@@ -1,30 +1,20 @@
-import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 import groovy.lang.Closure
 import org.gradle.kotlin.dsl.extra
 
 plugins {
   `java-library`
   id("me.champeau.jmh")
+  id("dd-trace-java.test-jvm-contraints")
   idea
 }
 
-val minJavaVersionForTests by extra(JavaVersion.VERSION_11)
-
 apply(from = "$rootDir/gradle/java.gradle")
 
 java {
   toolchain {
     languageVersion = JavaLanguageVersion.of(11)
   }
 }
-/*
-tasks.named<CheckForbiddenApis>("forbiddenApisMain_java11") {
-  failOnMissingClasses = false
-}
-*/
-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)
@@ -40,10 +30,14 @@ dependencies {
   api(project(":internal-api"))
   api(libs.jctools)
 
-  testImplementation(project(":dd-java-agent:testing"))
+  testImplementation(libs.junit)
   testImplementation(libs.slf4j)
 }
 
+testJvmConstraints {
+  minJavaVersion = JavaVersion.VERSION_11
+}
+
 idea {
   module {
     jdkName = "11"

utils/queue-utils/src/jmh/java/datadog/common/queue/JctoolsMPSCBlockingConsumerQueueBenchmark.java

@@ -1,6 +1,5 @@
 package datadog.common.queue;
 
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.jctools.queues.MpscBlockingConsumerArrayQueue;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -29,8 +28,8 @@
 JctoolsMPSCBlockingConsumerQueueBenchmark.queueTest:produce       65536  thrpt         7,733          ops/us
 */
 @BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 1, time = 30)
-@Measurement(iterations = 1, time = 30)
+@Warmup(iterations = 3, time = 10)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)

utils/queue-utils/src/jmh/java/datadog/common/queue/JctoolsMPSCQueueBenchmark.java

@@ -28,8 +28,8 @@
 JctoolsMPSCQueueBenchmark.queueTest:produce                       65536  thrpt         7,219          ops/us
  */
 @BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 1, time = 30)
-@Measurement(iterations = 1, time = 30)
+@Warmup(iterations = 3, time = 10)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)

utils/queue-utils/src/jmh/java/datadog/common/queue/JctoolsSPSCQueueBenchmark.java

@@ -29,7 +29,7 @@
  */
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 3, time = 10)
-@Measurement(iterations = 1, time = 30)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)

utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCBlockingConsumerQueueBenchmark.java

@@ -1,6 +1,5 @@
 package datadog.common.queue;
 
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -28,8 +27,8 @@
 MPSCBlockingConsumerQueueBenchmark.queueTest:produce              65536  thrpt         7,485          ops/us
 */
 @BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 1, time = 30)
-@Measurement(iterations = 1, time = 30)
+@Warmup(iterations = 3, time = 10)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)

utils/queue-utils/src/jmh/java/datadog/common/queue/MPSCQueueBenchmark.java

@@ -27,8 +27,8 @@
 MPSCQueueBenchmark.queueTest:produce         			      65536  thrpt        12,102          ops/us
  */
 @BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 1, time = 30)
-@Measurement(iterations = 1, time = 30)
+@Warmup(iterations = 3, time = 10)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)

utils/queue-utils/src/jmh/java/datadog/common/queue/SPSCQueueBenchmark.java

@@ -28,7 +28,7 @@
  */
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 3, time = 10)
-@Measurement(iterations = 1, time = 30)
+@Measurement(iterations = 3, time = 10)
 @Fork(1)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 @State(Scope.Benchmark)