Merge branch 'master' into mtoff/span-events

buildSrc/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
 
-  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.14.16")
+  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.14.18")
 
   implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -38,7 +38,7 @@ dependencies {
   implementation("org.ow2.asm", "asm-tree", "9.0")
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
-  testImplementation("net.bytebuddy", "byte-buddy", "1.14.16")
+  testImplementation("net.bytebuddy", "byte-buddy", "1.14.18")
   testImplementation("org.spockframework", "spock-core", "2.0-groovy-3.0")
   testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")

buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy

@@ -27,7 +27,7 @@ class CallSiteInstrumentationPluginTest extends Specification {
     }
     
     dependencies {
-      implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.16'
+      implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.18'
       implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.0-rc7'
     }
   '''

buildSrc/src/test/groovy/InstrumentPluginTest.groovy

@@ -23,7 +23,7 @@ class InstrumentPluginTest extends Specification {
     }
 
     dependencies {
-      compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.16' // just to build TestPlugin
+      compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.18' // just to build TestPlugin
     }
 
     apply plugin: 'instrument'

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

@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,te
 com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.2=jmhRuntimeClasspath,testRuntimeClasspath
+com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=jmhRuntimeClasspath,testRuntimeClasspath
@@ -39,14 +39,14 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa
 commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath
 info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
-io.sqreen:libsqreen:10.0.0=jmhRuntimeClasspath,testRuntimeClasspath
+io.sqreen:libsqreen:10.1.0=jmhRuntimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
 junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -67,7 +67,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:2.5.14=codenarc
 org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AdviceUtils.java

@@ -4,7 +4,6 @@
 
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 
 /** Helper utils for Runnable/Callable instrumentation */
 public class AdviceUtils {
@@ -19,10 +18,10 @@ public class AdviceUtils {
    */
   public static <T> AgentScope startTaskScope(
       final ContextStore<T, State> contextStore, final T task) {
-    return startTaskScope(contextStore.get(task), false);
+    return startTaskScope(contextStore.get(task));
   }
 
-  public static AgentScope startTaskScope(State state, boolean migrated) {
+  public static AgentScope startTaskScope(State state) {
     if (state != null) {
       final AgentScope.Continuation continuation = state.getAndResetContinuation();
       if (continuation != null) {
@@ -50,16 +49,7 @@ public static <T> void cancelTask(ContextStore<T, State> contextStore, final T t
     }
   }
 
-  public static <T> AgentSpan getCapturedSpan(ContextStore<T, State> contextStore, final T task) {
-    State state = contextStore.get(task);
-    if (null != state) {
-      return state.getSpan();
-    }
-    return null;
-  }
-
-  public static <T> void capture(
-      ContextStore<T, State> contextStore, T task, boolean startThreadMigration) {
+  public static <T> void capture(ContextStore<T, State> contextStore, T task) {
     AgentScope activeScope = activeScope();
     if (null != activeScope && activeScope.isAsyncPropagating()) {
       State state = contextStore.get(task);

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java

@@ -74,7 +74,7 @@ public static boolean shouldPropagate(
 
   public static void capture(ContextStore<Runnable, State> contextStore, Runnable task) {
     if (task != null && !exclude(RUNNABLE, task)) {
-      AdviceUtils.capture(contextStore, task, true);
+      AdviceUtils.capture(contextStore, task);
     }
   }
 

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

@@ -11,7 +11,7 @@ com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspat
 com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.2=runtimeClasspath,testRuntimeClasspath
+com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=runtimeClasspath,testRuntimeClasspath
@@ -39,14 +39,14 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp
 commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
 de.thetaphi:forbiddenapis:3.1=compileClasspath
 info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:10.0.0=testRuntimeClasspath
+io.sqreen:libsqreen:10.1.0=testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=testRuntimeClasspath
 junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.13=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.16=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.16=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath
 net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -65,7 +65,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-ant:2.5.14=codenarc
 org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath