Merge branch 'master' into bdu/simplify-task-partition

Author: bric3

.gitlab-ci.yml

@@ -725,7 +725,7 @@ test_smoke:
     GRADLE_PARAMS: "-PskipFlakyTests"
     CACHE_TYPE: "smoke"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_ssi_smoke:
   extends: .test_job
@@ -736,7 +736,7 @@ test_ssi_smoke:
     DD_INJECT_FORCE: "true"
     DD_INJECTION_ENABLED: "tracer"
   parallel:
-    matrix: *test_matrix_4
+    matrix: *test_matrix_6
 
 test_smoke_graalvm:
   extends: .test_job

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

@@ -504,7 +504,7 @@ public void evaluate(
     LogStatus logStatus = (LogStatus) status;
     if (!hasCondition()) {
       if (singleProbe) {
-        // sampling was already done in isReadToCapture so we assume that if we are executing the
+        // sampling was already done in isReadyToCapture so we assume that if we are executing the
         // current method it means the status should be sampled
         if (!logStatus.getDebugSessionStatus().isDisabled()) {
           logStatus.setSampled(true);

dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle

@@ -4,6 +4,9 @@ muzzle {
     module = "connect-runtime"
     versions = "[0.11.0.0,)"
     javaVersion = "17"
+    excludeDependency "io.confluent.cloud:*"
+    excludeDependency "io.confluent.observability:*"
+    excludeDependency "io.confluent.secure.compute:*"
     assertInverse = true
   }
 }

dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java

@@ -2,6 +2,7 @@
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.getRootContext;
 import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
 import static datadog.trace.instrumentation.synapse3.SynapseServerDecorator.DECORATE;
 import static datadog.trace.instrumentation.synapse3.SynapseServerDecorator.SYNAPSE_CONTEXT_KEY;
@@ -125,7 +126,7 @@ public static void errorResponse(
         @Advice.Argument(value = 1, optional = true) final Object error) {
       // check and remove context so it won't be finished twice
       Context context = (Context) connection.getContext().removeAttribute(SYNAPSE_CONTEXT_KEY);
-      if (null != context && context != Context.root()) {
+      if (null != context && context != getRootContext()) {
         AgentSpan span = spanFromContext(context);
         if (null != span) {
           if (error instanceof Throwable) {