Merge branch 'master' into mhlidd/config_consistency

Author: mhlidd

components/context/src/main/java/datadog/context/Context.java

@@ -36,22 +36,13 @@
  * @see ContextKey
  */
 public interface Context {
-  /**
-   * Returns the empty context.
-   *
-   * @return the context containing no values at all.
-   */
-  static Context empty() {
-    return EmptyContext.INSTANCE;
-  }
-
   /**
    * Returns the root context.
    *
    * @return the initial local context that all contexts extend.
    */
   static Context root() {
-    return manager().root();
+    return EmptyContext.INSTANCE;
   }
 
   /**

components/context/src/main/java/datadog/context/ContextManager.java

@@ -2,17 +2,10 @@
 
 /** Manages context across execution units. */
 public interface ContextManager {
-  /**
-   * Returns the root context.
-   *
-   * @return the initial local context that all contexts extend.
-   */
-  Context root();
-
   /**
    * Returns the context attached to the current execution unit.
    *
-   * @return the attached context; {@link #root()} if there is none.
+   * @return the attached context; {@link Context#root()} if there is none.
    */
   Context current();
 
@@ -28,7 +21,7 @@ public interface ContextManager {
    * Swaps the given context with the one attached to current execution unit.
    *
    * @param context the context to swap.
-   * @return the previously attached context; {@link #root()} if there was none.
+   * @return the previously attached context; {@link Context#root()} if there was none.
    */
   Context swap(Context context);
 

components/context/src/main/java/datadog/context/ThreadLocalContextManager.java

@@ -5,11 +5,6 @@ final class ThreadLocalContextManager implements ContextManager {
   private static final ThreadLocal<Context[]> CURRENT_HOLDER =
       ThreadLocal.withInitial(() -> new Context[] {EmptyContext.INSTANCE});
 
-  @Override
-  public Context root() {
-    return EmptyContext.INSTANCE;
-  }
-
   @Override
   public Context current() {
     return CURRENT_HOLDER.get()[0];

components/context/src/test/java/datadog/context/ContextProviderForkedTest.java

@@ -42,11 +42,6 @@ void testCustomManager() {
     // register a NOOP context manager
     ContextManager.register(
         new ContextManager() {
-          @Override
-          public Context root() {
-            return EmptyContext.INSTANCE;
-          }
-
           @Override
           public Context current() {
             return root();

components/context/src/test/java/datadog/context/ContextTest.java

@@ -1,6 +1,5 @@
 package datadog.context;
 
-import static datadog.context.Context.empty;
 import static datadog.context.Context.root;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,17 +21,6 @@ class ContextTest {
   static final ContextKey<Float> FLOAT_KEY = ContextKey.named("float-key");
   static final ContextKey<Long> LONG_KEY = ContextKey.named("long-key");
 
-  @Test
-  void testEmpty() {
-    // Test empty is always the same
-    Context empty = empty();
-    assertEquals(empty, empty(), "Empty context should be consistent");
-    // Test empty is not mutated
-    String stringValue = "value";
-    empty.with(STRING_KEY, stringValue);
-    assertEquals(empty, empty(), "Empty context should be immutable");
-  }
-
   @Test
   void testRoot() {
     // Test root is always the same

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java

@@ -138,7 +138,7 @@ private AgentSpan onFrameStart(
         if (useDedicatedTraces) {
           wsSpan = startSpan(WEBSOCKET.toString(), operationName, null);
           if (inheritSampling) {
-            wsSpan.setTag(DECISION_MAKER_INHERITED, 1);
+            wsSpan.setTag(DECISION_MAKER_INHERITED, "1");
             wsSpan.setTag(DECISION_MAKER_SERVICE, handshakeSpan.getServiceName());
             wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName());
           }

dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala

@@ -6,7 +6,7 @@ import akka.util.Timeout
 import datadog.trace.api.Trace
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.{
   activateSpan,
-  activeScope,
+  setAsyncPropagationEnabled,
   activeSpan,
   startSpan
 }
@@ -57,7 +57,7 @@ class AkkaActors extends AutoCloseable {
   @Trace
   def send(name: String, who: String): Unit = {
     val actor = actors(name)
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName(name)
     actor ! WhoToGreet(who)
     if (name == "ask") {
@@ -69,7 +69,7 @@ class AkkaActors extends AutoCloseable {
 
   @Trace
   def leak(who: String, leak: String): Unit = {
-    activeScope().setAsyncPropagation(true)
+    setAsyncPropagationEnabled(true)
     activeSpan().setSpanName("leak all the things")
     tellGreeter ! WhoToGreet(who)
     tellGreeter ! Leak(leak)

dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle

@@ -7,12 +7,14 @@ muzzle {
     module = "kafka-clients"
     versions = "[3.8.0,)"
     assertInverse = true
+    javaVersion = "17"
   }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
 
-addTestSuite('latestDepTest')
+addTestSuiteForDir('latestDepTest', 'test')
+addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 
 [compileMain_java17Java, compileTestJava, compileLatestDepTestJava].each {
   it.configure {
@@ -53,9 +55,9 @@ dependencies {
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
-  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+'
-  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+'
-  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.+'
+  latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
+  latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
   latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'
   latestDepTestImplementation libs.guava