adjust after rebase

Author: amarziali

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

@@ -4,7 +4,6 @@
 
 import datadog.trace.common.metrics.SignalItem.StopSignal;
 import datadog.trace.core.util.LRUCache;
-import datadog.trace.util.queue.NonBlockingQueue;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Iterator;
 import java.util.Map;

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

@@ -46,8 +46,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import org.jctools.queues.MessagePassingQueue;
 import javax.annotation.Nonnull;
+import org.jctools.queues.MessagePassingQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

utils/queue-utils/build.gradle.kts

@@ -1,9 +1,9 @@
+import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 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
 }
@@ -17,8 +17,12 @@ java {
     languageVersion = JavaLanguageVersion.of(11)
   }
 }
-
-tasks.withType<Javadoc>().configureEach() {
+/*
+tasks.named<CheckForbiddenApis>("forbiddenApisMain_java11") {
+  failOnMissingClasses = false
+}
+*/
+tasks.withType<Javadoc>().configureEach {
   javadocTool = javaToolchains.javadocToolFor(java.toolchain)
 }
 
@@ -40,10 +44,6 @@ dependencies {
   testImplementation(libs.slf4j)
 }
 
-tasks.forbiddenApisMain {
-  failOnMissingClasses = false
-}
-
 idea {
   module {
     jdkName = "11"

utils/queue-utils/src/main/java/datadog/common/queue/BaseQueue.java

@@ -35,7 +35,9 @@ abstract class BaseQueue<E> extends AbstractQueue<E> implements MessagePassingQu
   protected final PaddedLong tail = new PaddedLong(); // producer index
   protected final PaddedLong head = new PaddedLong(); // consumer index
 
-  /** @param requestedCapacity queue capacity (rounded up to power of two) */
+  /**
+   * @param requestedCapacity queue capacity (rounded up to power of two)
+   */
   public BaseQueue(int requestedCapacity) {
     this.capacity = roundToPowerOfTwo(requestedCapacity);
     this.mask = this.capacity - 1;
@@ -95,7 +97,9 @@ public final int fill(Supplier<E> s) {
     return MessagePassingQueueUtil.fillBounded(this, s);
   }
 
-  /** @return queue capacity */
+  /**
+   * @return queue capacity
+   */
   @Override
   public final int capacity() {
     return capacity;

utils/queue-utils/src/main/java/datadog/common/queue/MpscArrayQueueVarHandle.java

@@ -15,7 +15,9 @@ public class MpscArrayQueueVarHandle<E> extends BaseQueue<E> {
    */
   protected final PaddedLong producerLimit;
 
-  /** @param requestedCapacity queue capacity (rounded up to power of two) */
+  /**
+   * @param requestedCapacity queue capacity (rounded up to power of two)
+   */
   public MpscArrayQueueVarHandle(int requestedCapacity) {
     super(requestedCapacity);
     this.producerLimit = new PaddedLong(capacity);

utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueueDelegate.java

@@ -14,7 +14,9 @@
 final class MpscBlockingConsumerArrayQueueDelegate<E> implements MessagePassingBlockingQueue<E> {
   private final MpscBlockingConsumerArrayQueue<E> delegate;
 
-  /** @param capacity queue capacity */
+  /**
+   * @param capacity queue capacity
+   */
   MpscBlockingConsumerArrayQueueDelegate(int capacity) {
     this.delegate = new MpscBlockingConsumerArrayQueue<>(capacity);
   }

utils/queue-utils/src/main/java/datadog/common/queue/MpscBlockingConsumerArrayQueueVarHandle.java

@@ -17,7 +17,9 @@ public final class MpscBlockingConsumerArrayQueueVarHandle<E> extends MpscArrayQ
 
   private final PaddedThread consumerThread = new PaddedThread();
 
-  /** @param requestedCapacity queue capacity (rounded up to power of two) */
+  /**
+   * @param requestedCapacity queue capacity (rounded up to power of two)
+   */
   public MpscBlockingConsumerArrayQueueVarHandle(int requestedCapacity) {
     super(requestedCapacity);
   }

utils/queue-utils/src/main/java/datadog/common/queue/SpmcArrayQueueVarHandle.java

@@ -16,7 +16,9 @@ public final class SpmcArrayQueueVarHandle<E> extends BaseQueue<E>
   /** Cached producer limit to reduce volatile tail reads. */
   private final PaddedLong consumerLimit = new PaddedLong();
 
-  /** @param requestedCapacity queue capacity (rounded up to power of two) */
+  /**
+   * @param requestedCapacity queue capacity (rounded up to power of two)
+   */
   public SpmcArrayQueueVarHandle(int requestedCapacity) {
     super(requestedCapacity);
   }

utils/queue-utils/src/main/java/datadog/common/queue/SpscArrayQueueVarHandle.java

@@ -13,7 +13,9 @@ public final class SpscArrayQueueVarHandle<E> extends BaseQueue<E> {
   private long cachedTail = 0L; // visible only to consumer
   private final int lookAheadStep;
 
-  /** @param requestedCapacity queue capacity (rounded up to power of two) */
+  /**
+   * @param requestedCapacity queue capacity (rounded up to power of two)
+   */
   public SpscArrayQueueVarHandle(int requestedCapacity) {
     super(requestedCapacity);
     // This should go in a common place because today is defined under jctools-channel
@@ -45,7 +47,9 @@ public boolean offer(E e) {
     return true;
   }
 
-  /** @return head element or null if empty */
+  /**
+   * @return head element or null if empty
+   */
   @Override
   @SuppressWarnings("unchecked")
   public E poll() {
@@ -68,7 +72,9 @@ public E poll() {
     return value;
   }
 
-  /** @return head element or null if empty */
+  /**
+   * @return head element or null if empty
+   */
   @Override
   @SuppressWarnings("unchecked")
   public E peek() {
@@ -197,13 +203,17 @@ public boolean relaxedOffer(E e) {
     return offer(e);
   }
 
-  /** @return head element or null if empty */
+  /**
+   * @return head element or null if empty
+   */
   @Override
   public E relaxedPoll() {
     return poll();
   }
 
-  /** @return head element or null if empty */
+  /**
+   * @return head element or null if empty
+   */
   @Override
   public E relaxedPeek() {
     return peek();

utils/queue-utils/src/main/java/datadog/common/queue/padding/PaddedLong.java

@@ -20,47 +20,65 @@ public PaddedLong() {
     this(0L);
   }
 
-  /** @param initialValue the initial value */
+  /**
+   * @param initialValue the initial value
+   */
   public PaddedLong(long initialValue) {
     setPlain(initialValue);
   }
 
-  /** @return value with volatile semantics (full visibility) */
+  /**
+   * @return value with volatile semantics (full visibility)
+   */
   public long getVolatile() {
     return (long) VALUE_HANDLE.getVolatile(this);
   }
 
-  /** @return value with acquire semantics (pairs with setRelease) */
+  /**
+   * @return value with acquire semantics (pairs with setRelease)
+   */
   public long getAcquire() {
     return (long) VALUE_HANDLE.getAcquire(this);
   }
 
-  /** @return value with plain semantics (no ordering) */
+  /**
+   * @return value with plain semantics (no ordering)
+   */
   public long getPlain() {
     return (long) VALUE_HANDLE.get(this);
   }
 
-  /** @return value with opaque semantics (bitwise atomicity only) */
+  /**
+   * @return value with opaque semantics (bitwise atomicity only)
+   */
   public long getOpaque() {
     return (long) VALUE_HANDLE.getOpaque(this);
   }
 
-  /** @param newValue value to store with volatile semantics (full visibility) */
+  /**
+   * @param newValue value to store with volatile semantics (full visibility)
+   */
   public void setVolatile(long newValue) {
     VALUE_HANDLE.setVolatile(this, newValue);
   }
 
-  /** @param newValue value to store with release semantics (pairs with getAcquire) */
+  /**
+   * @param newValue value to store with release semantics (pairs with getAcquire)
+   */
   public void setRelease(long newValue) {
     VALUE_HANDLE.setRelease(this, newValue);
   }
 
-  /** @param newValue value to store with plain semantics (no ordering) */
+  /**
+   * @param newValue value to store with plain semantics (no ordering)
+   */
   public void setPlain(long newValue) {
     VALUE_HANDLE.set(this, newValue);
   }
 
-  /** @param newValue value to store with opaque semantics (bitwise atomicity only) */
+  /**
+   * @param newValue value to store with opaque semantics (bitwise atomicity only)
+   */
   public void setOpaque(long newValue) {
     VALUE_HANDLE.setOpaque(this, newValue);
   }