Merge branch 'master' into bdu/custom-auto-version

Author: bric3

.gitlab-ci.yml

@@ -255,7 +255,7 @@ build:
     CACHE_TYPE: lib
     DEPENDENCY_CACHE_POLICY: pull
   script:
-    - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks; fi
+    - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi
     - ./gradlew clean :dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar -PskipTests $GRADLE_ARGS
     - echo UPSTREAM_TRACER_VERSION=$(java -jar workspace/dd-java-agent/build/libs/*.jar) >> upstream.env
     - echo "BUILD_JOB_NAME=$CI_JOB_NAME" >> build.env

buildSrc/build.gradle.kts

@@ -64,7 +64,7 @@ testing {
     val test by getting(JvmTestSuite::class) {
       dependencies {
         implementation(libs.spock.core)
-        implementation("org.codehaus.groovy:groovy-all:3.0.24")
+        implementation(libs.groovy)
       }
       targets.configureEach {
         testTask.configure {

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

@@ -39,7 +39,7 @@ dependencies {
   testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
   testImplementation(libs.spock.core)
   testImplementation("org.objenesis", "objenesis", "3.0.1")
-  testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
+  testImplementation(libs.groovy)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

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

@@ -56,7 +56,7 @@ dependencies {
   testFixturesApi project(':utils:test-utils')
   testImplementation libs.bytebuddy
   testImplementation('org.skyscreamer:jsonassert:1.5.1')
-  testImplementation('org.codehaus.groovy:groovy-yaml:3.0.17')
+  testImplementation libs.groovy.yaml
   testImplementation libs.guava
 
   testImplementation group: 'io.grpc', name: 'grpc-core', version: grpcVersion

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java

@@ -11,6 +11,11 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
 
   @Override
   public void set(final Metadata carrier, final String key, final String value) {
-    carrier.put(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER), value);
+    Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    if (carrier.containsKey(metadataKey)) {
+      carrier.removeAll(
+          metadataKey); // Remove existing to ensure identical behavior with other carriers
+    }
+    carrier.put(metadataKey, value);
   }
 }

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/GrpcInjectAdapterTest.groovy

@@ -0,0 +1,47 @@
+import datadog.trace.agent.test.naming.VersionedNamingTestBase
+import io.grpc.Metadata
+import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER
+
+class GrpcInjectAdapterTest extends VersionedNamingTestBase {
+  def "carrier overrides values for duplicate keys"() {
+    setup:
+    def carrier = new Metadata()
+
+    def baggage = [
+      ["ot-baggage-foo", "v1"],
+      ["ot-baggage-foo", "v2"],
+      ["ot-baggage-bar", "v3"]
+    ]
+
+    when:
+    baggage.each { pair ->
+      def (key, value) = pair
+      SETTER.set(carrier, key, value)
+    }
+
+    then:
+    carrier.headerCount() == 2
+    carrier.get(getKey("ot-baggage-foo")) == "v2" // overridden value wins
+    carrier.get(getKey("ot-baggage-bar")) == "v3"
+  }
+
+  Metadata.Key<String> getKey(String key){
+    Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
+  }
+
+
+  @Override
+  int version() {
+    return 0
+  }
+
+  @Override
+  String service() {
+    return null
+  }
+
+  @Override
+  String operation() {
+    return null
+  }
+}

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcInjectAdapter.java

@@ -10,6 +10,11 @@ public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
 
   @Override
   public void set(final Metadata carrier, final String key, final String value) {
-    carrier.put(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER), value);
+    Metadata.Key<String> metadataKey = Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER);
+    if (carrier.containsKey(metadataKey)) {
+      carrier.removeAll(
+          metadataKey); // Remove existing to ensure identical behavior with other carriers
+    }
+    carrier.put(metadataKey, value);
   }
 }

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcInjectAdapterTest.groovy

@@ -0,0 +1,47 @@
+import datadog.trace.agent.test.naming.VersionedNamingTestBase
+import io.grpc.Metadata
+import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER
+
+class GrpcInjectAdapterTest extends VersionedNamingTestBase {
+  def "carrier overrides values for duplicate keys"() {
+    setup:
+    def carrier = new Metadata()
+
+    def baggage = [
+      ["ot-baggage-foo", "v1"],
+      ["ot-baggage-foo", "v2"],
+      ["ot-baggage-bar", "v3"]
+    ]
+
+    when:
+    baggage.each { pair ->
+      def (key, value) = pair
+      SETTER.set(carrier, key, value)
+    }
+
+    then:
+    carrier.headerCount() == 2
+    carrier.get(getKey("ot-baggage-foo")) == "v2" // overridden value wins
+    carrier.get(getKey("ot-baggage-bar")) == "v3"
+  }
+
+  Metadata.Key<String> getKey(String key){
+    Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER)
+  }
+
+
+  @Override
+  int version() {
+    return 0
+  }
+
+  @Override
+  String service() {
+    return null
+  }
+
+  @Override
+  String operation() {
+    return null
+  }
+}

gradle/libs.versions.toml

@@ -72,6 +72,7 @@ spock24-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "sp
 spock24-spring = { module = "org.spockframework:spock-spring", version = "spock24" }
 
 groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
+groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }