Merge branch 'master' into inferred-span-tags

Author: zarirhamza

.circleci/config.continue.yml.j2

@@ -167,8 +167,7 @@ commands:
               if [[ "$BRANCH" != "master" ]] && [[ "$BRANCH" != "release/*" ]]; then
                 # We know that we have checked out the PR merge branch, so the HEAD commit is a merge
                 # As a backup, if anything goes wrong with the diff, the build will fail
-                # Get list of changed files directly using git diff-tree to avoid issues with large binary files
-                CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r HEAD)
+                CHANGED_FILES=$(git show HEAD | grep -e "^Merge:" | cut -d ' ' -f 2- | sed 's/ /.../' | xargs git diff --name-only)
                 # Count the number of matches, and ignore if the grep doesn't match anything
                 MATCH_COUNT=$(echo "$CHANGED_FILES" | grep -c -E "<< pipeline.parameters.global_pattern >>|<< parameters.pattern >>") || true
                 if [[ "$MATCH_COUNT" -eq "0" ]]; then

dd-java-agent/agent-tooling/build.gradle

@@ -89,3 +89,9 @@ project.tasks.compileTest_java11Java.configure {
 final jmh = project.tasks.jmh
 jmh.outputs.upToDateWhen { false }
 jmh.dependsOn(compileTestJava)
+
+tasks.withType(Test).configureEach {
+  // same setting as AgentInstaller to avoid spurious agent-tooling test failures
+  // caused by ConfigTransformSpockExtension installing byte-buddy during testing
+  jvmArgs += ["-Dnet.bytebuddy.raw=true"]
+}

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactoryForkedTest.groovy

@@ -2,6 +2,7 @@ package datadog.trace.agent.tooling.bytebuddy.outline
 
 import datadog.trace.agent.tooling.bytebuddy.ClassFileLocators
 import datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers
+import net.bytebuddy.description.type.TypeDescription
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -28,6 +29,9 @@ class TypeFactoryForkedTest extends Specification {
   def hasContextField = declaresContextField('java.lang.Runnable', 'java.lang.String')
 
   def "can mix full types with outlines"() {
+    expect:
+    TypeDescription.AbstractBase.RAW_TYPES // this test relies on raw-types
+
     when:
     def systemLoader = ClassLoader.systemClassLoader
     def systemLocator = ClassFileLocators.classFileLocator(systemLoader)

dd-java-agent/build.gradle

@@ -99,6 +99,16 @@ def includeShadowJar(TaskProvider<ShadowJar> shadowJarTask, String jarname) {
       rename '(^.*)\\.class$', '$1.classdata'
       // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac)
       rename '^LICENSE$', 'LICENSE.renamed'
+      if (jarname == 'inst') {
+        // byte-buddy now ships classes optimized for Java8+ under META-INF/versions/9
+        // since we target Java8+ we can promote these classes over the pre-Java8 ones
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        eachFile {
+          if (it.path.contains('META-INF/versions/9/net/bytebuddy')) {
+            it.path = it.path.replace('META-INF/versions/9/', '')
+          }
+        }
+      }
     }
   }
 

dd-java-agent/instrumentation/mule-4/build.gradle

@@ -78,6 +78,9 @@ configurations.all {
     // avoid bringing in logback based on java 11
     force libs.logback.classic
     force libs.logback.core
+
+    // force specific version of byte-buddy for all configurations
+    force 'net.bytebuddy:byte-buddy:1.14.18'
   }
 }
 
@@ -146,7 +149,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:caffeine')
   testImplementation project(':dd-java-agent:instrumentation:quartz-2')
 
-
   testImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: muleVersion
   testImplementation group: 'org.mule.runtime', name: 'mule-core', version: muleVersion
   //testImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: muleVersion
@@ -175,7 +177,6 @@ dependencies {
   latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: '4.8.+'
   latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: '4.8.+'
 
-
   //TODO: 4.9.0 is not yet out but it looks like using 4.+ instead of above 4.8.+ brings in 4.9.0-SNAPSHOT artifacts.
   /*
    When testing with them, the mule container does not bootstrap because of:

dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy

@@ -475,9 +475,20 @@ abstract class AbstractSparkListenerTest extends AgentTestRunner {
     conf.set("spark.openlineage.rootParentJobName", "dag-push-to-s3-spark")
     def listener = getTestDatadogSparkListener(conf)
 
-    expect:
+    when:
     listener.onApplicationStart(applicationStartEvent(1000L))
-    assert listener.openLineageSparkConf.get("spark.openlineage.run.tags").contains("13959090542865903119")
+    listener.onApplicationEnd(new SparkListenerApplicationEnd(2000L))
+
+    then:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          operationName "spark.application"
+          spanType "spark"
+          assert span.context.traceId.toString() == "13959090542865903119"
+        }
+      }
+    }
   }
 
   def "test lastJobFailed is not set when job is cancelled"() {