Merge branch 'master' into mtoff/otlp-traces-exporter-config

Author: mcculls

dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle

@@ -8,7 +8,7 @@ muzzle {
     versions = "[4.1.0,)"
     // broken POMs: depend on non-existent org.eclipse.jetty:jetty-bom:9.4.59
     // can be fixed after https://github.com/confluentinc/kafka-connect-storage-common/issues/468 is resolved
-    skipVersions += ['7.4.14', '7.5.13', '7.6.10', '7.7.8', '7.8.7']
+    skipVersions += ['7.4.14', '7.5.13', '7.6.10', '7.7.8', '7.8.7', '7.9.6']
     excludeDependency "org.codehaus.jackson:jackson-mapper-asl" // missing on some releases
     assertInverse = true
   }
@@ -30,4 +30,3 @@ dependencies {
 
   latestDepTestImplementation group: 'io.confluent', name: 'kafka-avro-serializer', version: '+'
 }
-

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

@@ -16,7 +16,9 @@ muzzle {
       '7.7.8-ce',
       '7.7.8-ccs',
       '7.8.7-ce',
-      '7.8.7-ccs'
+      '7.8.7-ccs',
+      '7.9.6-ce',
+      '7.9.6-ccs'
     ]
     excludeDependency "io.confluent.cloud:*"
     excludeDependency "io.confluent.observability:*"

dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/latestDepTest/groovy/SpringSchedulingTest.groovy

@@ -25,8 +25,14 @@ class SpringSchedulingTest extends InstrumentationSpecification {
     setup:
     def context = new AnnotationConfigApplicationContext(TriggerTaskConfig, SchedulingConfig)
     def task = context.getBean(TriggerTask)
+    def scheduledTaskEndpoint = context.getBean(ScheduledTasksEndpoint)
 
     task.blockUntilExecute()
+    // Capture cron tasks before closing the context (endpoint is unavailable after close).
+    def cronTasks = scheduledTaskEndpoint.scheduledTasks().getCron()
+    // Close the context immediately after the first execution to prevent a second cron
+    // firing before assertions complete, which would produce extra traces and cause flakiness.
+    context.close()
 
     expect:
     assert task != null
@@ -54,13 +60,10 @@ class SpringSchedulingTest extends InstrumentationSpecification {
       }
     }
     and:
-    def scheduledTaskEndpoint = context.getBean(ScheduledTasksEndpoint)
     assert scheduledTaskEndpoint != null
-    scheduledTaskEndpoint.scheduledTasks().getCron().each {
+    cronTasks.each {
       it.getRunnable().getTarget() == TriggerTask.getName()
     }
-    cleanup:
-    context.close()
   }
 
   def "schedule interval test"() {

dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/test/groovy/SpringSchedulingTest.groovy

@@ -25,8 +25,14 @@ class SpringSchedulingTest extends InstrumentationSpecification {
     setup:
     def context = new AnnotationConfigApplicationContext(TriggerTaskConfig, SchedulingConfig)
     def task = context.getBean(TriggerTask)
+    def scheduledTaskEndpoint = context.getBean(ScheduledTasksEndpoint)
 
     task.blockUntilExecute()
+    // Capture cron tasks before closing the context (endpoint is unavailable after close).
+    def cronTasks = scheduledTaskEndpoint.scheduledTasks().getCron()
+    // Close the context immediately after the first execution to prevent a second cron
+    // firing before assertions complete, which would produce extra traces and cause flakiness.
+    context.close()
 
     expect:
     assert task != null
@@ -54,13 +60,10 @@ class SpringSchedulingTest extends InstrumentationSpecification {
       }
     }
     and:
-    def scheduledTaskEndpoint = context.getBean(ScheduledTasksEndpoint)
     assert scheduledTaskEndpoint != null
-    scheduledTaskEndpoint.scheduledTasks().getCron().each {
+    cronTasks.each {
       it.getRunnable().getTarget() == TriggerTask.getName()
     }
-    cleanup:
-    context.close()
   }
 
   def "schedule interval test"() {