Merge branch 'master' into inferred-span-tags

zarirhamza · web-flow · commit ce06b40d2502 · 2025-05-07T12:18:54.000-04:00
diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 121787cbd6b3e5bc2840a0d5df17ecfb45566837
+default_system_tests_commit: &default_system_tests_commit b0b2e1f212f8c483b52aa3adc6ffd4132b1ba9b8
 
 parameters:
   nightly:
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -137,6 +137,13 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
 
 _Recovery:_ Manually trigger the action on the desired branch.
 
+### all-green [🔗](all-green.yaml)
+
+_Trigger:_ Any pull request.
+
+_Action:_ This action will check all other jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails. This action got an `ignored` paraemters to exclude some jobs if they are temprorary failing. The purpose of this job is to be required for merges, achieving Green CI Policy.
+
+_Recovery:_ Manually trigger the action on the desired branch.
 
 ## Maintenance
 
diff --git a/.github/workflows/all-green.yml b/.github/workflows/all-green.yml
@@ -0,0 +1,36 @@
+name: Check Pull Request CI Status
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  checks: read
+  statuses: read
+
+jobs:
+  all-jobs-are-green:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Ensure CI Success
+        uses: DataDog/ensure-ci-success@f40e6ffd8e60280d478b9b92209aaa30d3d56895
+        with:
+          initial-delay-seconds: "1000"
+          max-retries: "60"
+          ignored-name-patterns: |
+            dd-gitlab/default-pipeline
+            dd-gitlab/check_inst 4/4
+            dd-gitlab/muzzle .*
+
+# ignored jobs : 
+#
+# * dd-gitlab/default-pipeline => success rate of 70% (needs an owner)
+# * dd-gitlab/check_inst 4/4   => success rate of 78% (needs an owner)
+# * dd-gitlab/muzzle .*        => success rate of ~85% (needs an owner)
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ plugins {
   id 'pl.allegro.tech.build.axion-release' version '1.14.4'
   id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 
-  id "com.github.johnrengelman.shadow" version "7.1.2" apply false
+  id "com.github.johnrengelman.shadow" version "8.1.1" apply false
   id "me.champeau.jmh" version "0.7.0" apply false
   id 'org.gradle.playframework' version '0.13' apply false
   id 'info.solidsoft.pitest' version '1.9.11'  apply false
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
 
-  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.15.11")
+  implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.17.5")
 
   implementation("org.eclipse.aether", "aether-connector-basic", "1.1.0")
   implementation("org.eclipse.aether", "aether-transport-http", "1.1.0")
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
   implementation("org.ow2.asm", "asm-tree", "9.8")
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
-  testImplementation("net.bytebuddy", "byte-buddy", "1.15.11")
+  testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
   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")
diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy
@@ -55,11 +55,15 @@ class MuzzlePlugin implements Plugin<Project> {
 
   static {
     RemoteRepository central = new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build()
-    // Only needed for restlet
-    RemoteRepository restlet = new RemoteRepository.Builder("restlet", "default", "https://maven.restlet.talend.com/").build()
-    // Only needed  for play-2.3
-    RemoteRepository typesafe = new RemoteRepository.Builder("typesafe", "default", "https://repo.typesafe.com/typesafe/maven-releases/").build()
-    MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(central, restlet, typesafe))
+
+    String mavenProxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY")
+
+    if (mavenProxyUrl == null) {
+      MUZZLE_REPOS = Collections.singletonList(central)
+    } else {
+      RemoteRepository proxy = new RemoteRepository.Builder("central-proxy", "default", mavenProxyUrl).build()
+      MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(proxy, central))
+    }
   }
 
   static class TestedArtifact {
diff --git a/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy b/buildSrc/src/test/groovy/CallSiteInstrumentationPluginTest.groovy
@@ -27,7 +27,7 @@ class CallSiteInstrumentationPluginTest extends Specification {
     }
     
     dependencies {
-      implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11'
+      implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5'
       implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.0-rc7'
     }
   '''
diff --git a/buildSrc/src/test/groovy/InstrumentPluginTest.groovy b/buildSrc/src/test/groovy/InstrumentPluginTest.groovy
@@ -23,7 +23,7 @@ class InstrumentPluginTest extends Specification {
     }
 
     dependencies {
-      compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11' // just to build TestPlugin
+      compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5' // just to build TestPlugin
     }
 
     apply plugin: 'instrument'
diff --git a/dd-java-agent/agent-jmxfetch/src/main/resources/datadog/trace/agent/jmxfetch/README b/dd-java-agent/agent-jmxfetch/src/main/resources/datadog/trace/agent/jmxfetch/README
diff --git a/dd-java-agent/agent-jmxfetch/src/main/resources/datadog/trace/agent/jmxfetch/README.md b/dd-java-agent/agent-jmxfetch/src/main/resources/datadog/trace/agent/jmxfetch/README.md
@@ -0,0 +1,9 @@
+# Metric Configs
+
+Files from [integrations-core](https://github.com/search?q=repo%3ADataDog%2Fintegrations-core+%22jmx_metrics%3A%22+language%3AYAML&type=code)
+are copied here at build time by the `copyMetricConfigs` gradle task after initializing the submodule.
+
+These are then bundled in `dd-java-agent.jar`. Due to limitations in Java jar walking, it is non-trivial
+to get all these files from within the jar without knowing their names.
+Consequently, we list out each integration in `datadog/trace/agent/jmxfetch/metricconfigs.txt` 
+so the agent can reference them.
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java
@@ -21,6 +21,7 @@
 import datadog.trace.api.iast.telemetry.IastMetricCollector;
 import datadog.trace.api.iast.telemetry.Verbosity;
 import java.util.Collections;
+import java.util.List;
 import javax.annotation.Nonnull;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.annotation.AnnotationDescription;
@@ -64,8 +65,8 @@ public IastPostProcessorFactory(final Verbosity verbosity) {
 
   @Override
   public @Nonnull Advice.PostProcessor make(
-      @Nonnull final MethodDescription.InDefinedShape advice, final boolean exit) {
-    for (final AnnotationDescription annotation : advice.getDeclaredAnnotations()) {
+      List<? extends AnnotationDescription> annotations, TypeDescription returnType, boolean exit) {
+    for (final AnnotationDescription annotation : annotations) {
       final TypeDescription typeDescr = annotation.getAnnotationType();
       final PackageDescription pkgDescr = typeDescr.getPackage();
       if (pkgDescr != null && IAST_ANNOTATIONS_PKG.equals(pkgDescr.getName())) {
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/IastPostProcessorFactoryTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/iast/IastPostProcessorFactoryTest.groovy
@@ -40,7 +40,8 @@ class IastPostProcessorFactoryTest extends DDSpecification {
     final method = new MethodDescription.ForLoadedMethod(NonAnnotatedAdvice.getDeclaredMethod('exit'))
 
     when:
-    final result = IastPostProcessorFactory.INSTANCE.make(method, true)
+    final result = IastPostProcessorFactory.INSTANCE.make(
+      method.getDeclaredAnnotations(), method.getReturnType().asErasure(), true)
 
     then:
     result == Advice.PostProcessor.NoOp.INSTANCE
@@ -60,7 +61,8 @@ class IastPostProcessorFactoryTest extends DDSpecification {
     final context = Mock(Implementation.Context)
 
     when:
-    final postProcessor = IastPostProcessorFactory.INSTANCE.make(method, true)
+    final postProcessor = IastPostProcessorFactory.INSTANCE.make(
+      method.getDeclaredAnnotations(), method.getReturnType().asErasure(), true)
 
     then:
     postProcessor != Advice.PostProcessor.NoOp.INSTANCE
diff --git a/dd-java-agent/instrumentation/mule-4/build.gradle b/dd-java-agent/instrumentation/mule-4/build.gradle
@@ -79,7 +79,8 @@ configurations.all {
     force libs.logback.classic
     force libs.logback.core
 
-    // force specific version of byte-buddy for all configurations
+    // mule depends specifically on byte-buddy 1.14
+    // https://docs.mulesoft.com/release-notes/mule-runtime/mule-4.5.0-release-notes
     force 'net.bytebuddy:byte-buddy:1.14.18'
   }
 }
diff --git a/dd-java-agent/instrumentation/opensearch/rest/build.gradle b/dd-java-agent/instrumentation/opensearch/rest/build.gradle
@@ -3,9 +3,8 @@ muzzle {
   pass {
     group = "org.opensearch.client"
     module = "opensearch-rest-client"
-    versions = "[1,)"
+    versions = "[1,2)"
     javaVersion = '11'
-    assertInverse = true
   }
 }
 
diff --git a/dd-java-agent/instrumentation/play-2.3/build.gradle b/dd-java-agent/instrumentation/play-2.3/build.gradle
@@ -4,6 +4,8 @@ ext {
 }
 
 muzzle {
+  extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
+
   pass {
     group = 'com.typesafe.play'
     module = 'play_2.11'
diff --git a/dd-java-agent/instrumentation/play-2.4/build.gradle b/dd-java-agent/instrumentation/play-2.4/build.gradle
@@ -4,6 +4,8 @@ ext {
 }
 
 muzzle {
+  extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
+
   pass {
     name = "play24and25"
     group = 'com.typesafe.play'
diff --git a/dd-java-agent/instrumentation/play-2.6/build.gradle b/dd-java-agent/instrumentation/play-2.6/build.gradle
@@ -7,6 +7,8 @@ def scalaVersion = '2.11'
 def playVersion = '2.6.0'
 
 muzzle {
+  extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")
+
   pass {
     name = 'play26Plus'
     group = 'com.typesafe.play'
diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle
@@ -1,4 +1,6 @@
 muzzle {
+  extraRepository("restlet", "https://maven.restlet.talend.com/")
+
   pass {
     group = "org.restlet.jse"
     module = "org.restlet"
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java
@@ -24,42 +24,41 @@ public class BaggagePropagator implements Propagator {
   private static final Logger LOG = LoggerFactory.getLogger(BaggagePropagator.class);
   private static final PercentEscaper UTF_ESCAPER = PercentEscaper.create();
   static final String BAGGAGE_KEY = "baggage";
-  private final Config config;
   private final boolean injectBaggage;
   private final boolean extractBaggage;
+  private final int maxItems;
+  private final int maxBytes;
 
   public BaggagePropagator(Config config) {
-    this.injectBaggage = config.isBaggageInject();
-    this.extractBaggage = config.isBaggageExtract();
-    this.config = config;
+    this(
+        config.isBaggageInject(),
+        config.isBaggageInject(),
+        config.getTraceBaggageMaxItems(),
+        config.getTraceBaggageMaxBytes());
   }
 
   // use primarily for testing purposes
-  public BaggagePropagator(boolean injectBaggage, boolean extractBaggage) {
+  BaggagePropagator(boolean injectBaggage, boolean extractBaggage, int maxItems, int maxBytes) {
     this.injectBaggage = injectBaggage;
     this.extractBaggage = extractBaggage;
-    this.config = Config.get();
+    this.maxItems = maxItems;
+    this.maxBytes = maxBytes;
   }
 
   @Override
   public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
-    int maxItems = this.config.getTraceBaggageMaxItems();
-    int maxBytes = this.config.getTraceBaggageMaxBytes();
-    //noinspection ConstantValue
+    Baggage baggage;
     if (!this.injectBaggage
-        || maxItems == 0
-        || maxBytes == 0
+        || this.maxItems == 0
+        || this.maxBytes == 0
         || context == null
         || carrier == null
-        || setter == null) {
-      return;
-    }
-
-    Baggage baggage = Baggage.fromContext(context);
-    if (baggage == null) {
+        || setter == null
+        || (baggage = Baggage.fromContext(context)) == null) {
       return;
     }
 
+    // Inject cached header if any as optimized path
     String headerValue = baggage.getW3cHeader();
     if (headerValue != null) {
       setter.set(carrier, BAGGAGE_KEY, headerValue);
@@ -86,25 +85,25 @@ public <C> void inject(Context context, C carrier, CarrierSetter<C> setter) {
 
       processedItems++;
       // reached the max number of baggage items allowed
-      if (processedItems == maxItems) {
+      if (processedItems == this.maxItems) {
         break;
       }
       // Drop newest k/v pair if adding it leads to exceeding the limit
-      if (currentBytes + escapedKey.size + escapedVal.size + extraBytes > maxBytes) {
+      if (currentBytes + escapedKey.size + escapedVal.size + extraBytes > this.maxBytes) {
         baggageText.setLength(currentBytes);
         break;
       }
       currentBytes += escapedKey.size + escapedVal.size + extraBytes;
     }
 
     headerValue = baggageText.toString();
+    // Save header as cache to re-inject it later if baggage did not change
     baggage.setW3cHeader(headerValue);
     setter.set(carrier, BAGGAGE_KEY, headerValue);
   }
 
   @Override
   public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor) {
-    //noinspection ConstantValue
     if (!this.extractBaggage || context == null || carrier == null || visitor == null) {
       return context;
     }
@@ -113,12 +112,11 @@ public <C> Context extract(Context context, C carrier, CarrierVisitor<C> visitor
     return baggageExtractor.extracted == null ? context : context.with(baggageExtractor.extracted);
   }
 
-  private static class BaggageExtractor implements BiConsumer<String, String> {
+  private class BaggageExtractor implements BiConsumer<String, String> {
     private static final char KEY_VALUE_SEPARATOR = '=';
     private static final char PAIR_SEPARATOR = ',';
     private Baggage extracted;
-
-    private BaggageExtractor() {}
+    private String w3cHeader;
 
     /** URL decode value */
     private String decode(final String value) {
@@ -134,6 +132,7 @@ private String decode(final String value) {
     private Map<String, String> parseBaggageHeaders(String input) {
       Map<String, String> baggage = new HashMap<>();
       int start = 0;
+      boolean truncatedCache = false;
       int pairSeparatorInd = input.indexOf(PAIR_SEPARATOR);
       pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
       int kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR);
@@ -152,11 +151,29 @@ private Map<String, String> parseBaggageHeaders(String input) {
         }
         baggage.put(key, value);
 
+        // need to percent-encode non-ascii headers we pass down
+        if (UTF_ESCAPER.keyNeedsEncoding(key) || UTF_ESCAPER.valNeedsEncoding(value)) {
+          truncatedCache = true;
+          this.w3cHeader = null;
+        } else if (!truncatedCache && (end > maxBytes || baggage.size() > maxItems)) {
+          if (start == 0) { // if we go out of range after first k/v pair, there is no cache
+            this.w3cHeader = null;
+          } else {
+            this.w3cHeader = input.substring(0, start - 1); // -1 to ignore the k/v separator
+          }
+          truncatedCache = true;
+        }
+
         kvSeparatorInd = input.indexOf(KEY_VALUE_SEPARATOR, pairSeparatorInd + 1);
         pairSeparatorInd = input.indexOf(PAIR_SEPARATOR, pairSeparatorInd + 1);
         pairSeparatorInd = pairSeparatorInd == -1 ? input.length() : pairSeparatorInd;
         start = end + 1;
       }
+
+      if (!truncatedCache) {
+        this.w3cHeader = input;
+      }
+
       return baggage;
     }
 
@@ -166,7 +183,7 @@ public void accept(String key, String value) {
       if (BAGGAGE_KEY.equalsIgnoreCase(key)) {
         Map<String, String> baggage = parseBaggageHeaders(value);
         if (!baggage.isEmpty()) {
-          this.extracted = Baggage.create(baggage, value);
+          this.extracted = Baggage.create(baggage, this.w3cHeader);
         }
       }
     }
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java b/dd-trace-core/src/main/java/datadog/trace/core/util/PercentEscaper.java
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/baggage/BaggagePropagatorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/baggage/BaggagePropagatorTest.groovy
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class CallSiteInstrumentationPluginTest extends Specification {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`dependencies {`
`30`		`- implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11'`
	`30`	`+ implementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5'`
`31`	`31`	`implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.0-rc7'`
`32`	`32`	`}`
`33`	`33`	`'''`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class InstrumentPluginTest extends Specification {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`dependencies {`
`26`		`- compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.11' // just to build TestPlugin`
	`26`	`+ compileOnly group: 'net.bytebuddy', name: 'byte-buddy', version: '1.17.5' // just to build TestPlugin`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`apply plugin: 'instrument'`