Upgrade Shadow plugin to 9.4.2 by bric3 · Pull Request #11730 · DataDog/dd-trace-java

bric3 · 2026-06-24T16:21:00Z

What Does This Do

Upgrades the Gradle Shadow plugin from 8.3.9 to 9.4.2 in the main build.

The build wiring is updated for Shadow 9 APIs and behavior:

use lazy configuration providers for ShadowJar configuration inputs where practical
make shared dependency filtering explicit through a reusable Action
use regex dependency filter patterns where Shadow 9 no longer treats empty module/version fields as broad wildcards
make duplicate handling explicit for service-file transforms, license metadata, and known identical instrumentation classes
preserve the previous agent manifest shape by disabling automatic Multi-Release manifest inheritance
apply the same required Shadow 9 adjustments to smoke-test modules that run in the main Gradle build

Motivation

Shadow 9 brings several build-pipeline fixes that are useful for this project:

lazy configuration support for ShadowJar inputs, which avoids eagerly resolving configurations where providers are available
Migrate ShadowJar to using lazy properties GradleUp/shadow#1044
Resolve Configuration directly in DependencyFilter GradleUp/shadow#1045
consistent duplicate handling for entries coming from dependency jars and for transformer inputs, so duplicate resources/classes are handled by the configured strategy instead of being silently written or skipped later
Refactor file visiting logic in StreamAction GradleUp/shadow#1233
Default duplicatesStrategy back to EXCLUDE GradleUp/shadow#1617
stricter dependency filter matching, which makes broad excludes rely on explicit regex patterns
Merge dependency and project overloads in DependencyFilter GradleUp/shadow#1328
broader relocation support for descriptor-shaped string constants
Support relocating list of types in RelocatorRemapper GradleUp/shadow#1714
Update RelocatorRemapper class pattern to cover more Java method descriptors GradleUp/shadow#1731

Additional Notes

bric3/jardiff was used between a master 11646d3 agent jar and this this branch's agent jar using ASM textifier output.

$ jardiff \
    -c classdata \
    --class-text-producer=asm-textifier \
    --color=never \
    master/dd-java-agent/build/libs/dd-java-agent-1.64.0-SNAPSHOT.jar \
    shadow-9/dd-java-agent/build/libs/dd-java-agent-1.64.0-SNAPSHOT.jar
--- ci-visibility/org/jacoco/core/runtime/LoggerRuntime.classdata
+++ ci-visibility/org/jacoco/core/runtime/LoggerRuntime.classdata
@@ -107,9 +107,9 @@
     ALOAD 5
     SIPUSH 184
     LDC "datadog/trace/bootstrap/PatchLogger"
     LDC "getLogger"
-    LDC "(Ljava/lang/String;)Ljava/util/logging/Logger;"
+    LDC "(Ljava/lang/String;)Ldatadog/trace/bootstrap/PatchLogger;"
     ICONST_0
     INVOKEVIRTUAL datadog/instrument/asm/MethodVisitor.visitMethodInsn (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
    L4
     LINENUMBER 100 L4

The difference is in a string constant inside JaCoCo’s LoggerRuntime, not in PatchLogger.java itself.

Shadow 9.2+ started relocating descriptor-shaped string constants. So this LDC changed:

 LDC "datadog/trace/bootstrap/PatchLogger"
 LDC "getLogger"
-LDC "(Ljava/lang/String;)Ljava/util/logging/Logger;"
+LDC "(Ljava/lang/String;)Ldatadog/trace/bootstrap/PatchLogger;"

That comes from the org.jacoco.core.runtime.LoggerRuntime class included via :dd-java-agent:agent-ci-visibility.

Before Shadow 9, relocation had already changed the method owner to datadog/trace/bootstrap/PatchLogger, but the descriptor string still said the method returned java.util.logging.Logger. That describes a method that does not exist: PatchLogger.getLogger(String):Logger. Shadow 9 rewrites the descriptor too, so generated bytecode calls the real method: PatchLogger.getLogger(String):PatchLogger, which matches datadog.trace.bootstrapPatchLogger in :dd-java-agent:agent-bootstrap.

https://github.com/DataDog/dd-trace-java/blob/987a0eba81a1121ea037005640cd0f407aaf5389/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/PatchLogger.java#L16-L19

In my opinion this looks like a correctness fix for that generated-accessor path, not a behavioral regression. It is also aligned with the agent relocation rule that intentionally redirects java.util.logging.Logger to PatchLogger to avoid JUL initialization during premain:

https://github.com/DataDog/dd-trace-java/blob/987a0eba81a1121ea037005640cd0f407aaf5389/dd-java-agent/build.gradle#L114-L116

Coverage-wise:

The Maven and Gradle smoke tests cover the real CI Visibility JaCoCo integration path: they enable the JaCoCo plugin version and assert received coverages/reports.

dd-trace-java/dd-smoke-tests/maven/src/test/java/datadog/smoketest/MavenSmokeTest.java

Lines 84 to 102 in 11646d3

    
           @TableTest({ 
        
             "scenario                   | projectName                                       | mavenVersion                 | expectedEvents | expectedCoverages | expectSuccess | testsSkipping | flakyRetries | jacocoCoverage | commandLineParams                                                | minSupportedJavaVersion", 
        
             "succeed-base               | test_successful_maven_run                         | {3.5.4, 3.6.3, 3.8.8, 3.9.9} | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ", 
        
             "succeed-surefire-3.0.0-j8  | test_successful_maven_run_surefire_3_0_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ", 
        
             "succeed-surefire-3.0.0-j17 | test_successful_maven_run_surefire_3_0_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ", 
        
             "succeed-surefire-3.5.0-j8  | test_successful_maven_run_surefire_3_5_0          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ", 
        
             "succeed-surefire-3.5.0-j17 | test_successful_maven_run_surefire_3_5_0          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     ", 
        
             "succeed-builtin-coverage   | test_successful_maven_run_builtin_coverage        | 3.9.9                        | 5              | 1                 | true          | true          | false        | false          | []                                                               | 8                      ", 
        
             "succeed-jacoco-argline     | test_successful_maven_run_with_jacoco_and_argline | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ", 
        
             "succeed-cucumber           | test_successful_maven_run_with_cucumber           | 3.9.9                        | 4              | 1                 | true          | false         | false        | true           | []                                                               | 8                      ", 
        
             "failed-flaky-retries       | test_failed_maven_run_flaky_retries               | 3.9.9                        | 8              | 5                 | false         | false         | true         | true           | []                                                               | 8                      ", 
        
             "succeed-junit-platform     | test_successful_maven_run_junit_platform_runner   | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | []                                                               | 8                      ", 
        
             "succeed-arg-line-property  | test_successful_maven_run_with_arg_line_property  | 3.9.9                        | 4              | 0                 | true          | false         | false        | false          | [\"-DargLine='-Dmy-custom-property=provided-via-command-line'\"] | 8                      ", 
        
             "succeed-multi-forks-j8     | test_successful_maven_run_multiple_forks          | 3.9.9                        | 5              | 1                 | true          | true          | false        | true           | []                                                               | 8                      ", 
        
             "succeed-multi-forks-j17    | test_successful_maven_run_multiple_forks          | latest                       | 5              | 1                 | true          | true          | false        | true           | []                                                               | 17                     " 
        
           }) 
        
           @ParameterizedTest 
        
           void testMavenRun( 
        
               String projectName,

dd-trace-java/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java

Lines 96 to 112 in 11646d3

    
           @TableTest({ 
        
             "scenario                   | gradleVersion | projectName                                   | configurationCache | successExpected | flakyRetries | expectedTraces | expectedCoverages", 
        
             "succeed-new-8.3            | 8.3           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ", 
        
             "succeed-new-8.9            | 8.9           | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ", 
        
             "succeed-new-latest         | latest        | test-succeed-new-instrumentation              | {false, true}      | true            | false        | 5              | 1                ", 
        
             "succeed-multi-module-new   | latest        | test-succeed-multi-module-new-instrumentation | false              | true            | false        | 7              | 2                ", 
        
             "succeed-multi-forks-new    | latest        | test-succeed-multi-forks-new-instrumentation  | false              | true            | false        | 6              | 2                ", 
        
             "skip-new                   | latest        | test-skip-new-instrumentation                 | false              | true            | false        | 2              | 0                ", 
        
             "failed-new                 | latest        | test-failed-new-instrumentation               | false              | false           | false        | 4              | 0                ", 
        
             "corrupted-config-new       | latest        | test-corrupted-config-new-instrumentation     | false              | false           | false        | 1              | 0                ", 
        
             "succeed-junit-5            | latest        | test-succeed-junit-5                          | false              | true            | false        | 5              | 1                ", 
        
             "failed-flaky-retries       | latest        | test-failed-flaky-retries                     | false              | false           | true         | 8              | 0                ", 
        
             "succeed-gradle-plugin-test | latest        | test-succeed-gradle-plugin-test               | false              | true            | false        | 5              | 0                " 
        
           }) 
        
           @ParameterizedTest 
        
           void testNew( 
        
               String gradleVersion,

That path uses the external JaCoCo agent runtime, which our instrumentation targets via org.jacoco.agent.rt.internal...:

dd-trace-java/dd-java-agent/instrumentation/jacoco-0.8.9/src/main/java/datadog/trace/instrumentation/jacoco/InstrumenterInstrumentation.java

Lines 28 to 35 in 11646d3

    
           @Override 
        
           public ElementMatcher<TypeDescription> hierarchyMatcher() { 
        
             // The jacoco javaagent jar that is published relocates internal classes to an "obfuscated" 
        
             // package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.instr.Instrumenter 
        
             return nameStartsWith("org.jacoco.agent.rt.internal") 
        
                 .and(nameEndsWith(".core.instr.Instrumenter")); 
        
           }

The shaded org.jacoco.core dependency in agent-ci-visibility appears used for parsing/analyzing coverage data and reports, not for LoggerRuntime:

dd-trace-java/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/report/JacocoCoverageProcessor.java

Lines 233 to 234 in 11646d3

    
           private static ExecutionDataStore parseCoverageData(byte[] rawCoverageData) { 
        
             if (rawCoverageData == null) {

dd-trace-java/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/line/LineCoverageStore.java

Lines 27 to 29 in 11646d3

    
           import org.jacoco.core.analysis.Analyzer; 
        
           import org.jacoco.core.data.ExecutionDataStore; 
        
           import org.slf4j.Logger;

Contributor Checklist

Format the title according to the contribution guidelines
Assign the type: and (comp: or inst:) labels in addition to any other useful labels
Avoid using close, fix, or any linking keywords when referencing an issue
Update the CODEOWNERS file on source file addition, migration, or deletion
Update public documentation with any new configuration flags or behaviors
Add your completed PR to the merge queue by commenting /merge.

Jira ticket: [PROJ-IDENT]

* Adapt custom ShadowJar wiring to the lazy API. Configuration lists now use providers around `configurations.named(...)`, and Shadow resolves `Configuration` values directly. GradleUp/shadow#1044 GradleUp/shadow#1045 * Keep filtering explicit. Shadow 9 changed `DependencyFilter` overloads, so shared filters run in Shadow `dependencies` blocks. Empty module/version fields no longer act as broad wildcards, so group-wide excludes use full group/module/version regex notation. That keeps dependencies meant to stay external out of shaded jars; otherwise downstream jars can get partly relocated API copies, such as SLF4J, and lose their real binding. https://gradleup.com/shadow/configuration/dependencies/#using-regex-patterns-to-filter-dependencies GradleUp/shadow#1328 * Keep `mergeServiceFiles` users on `DuplicatesStrategy.INCLUDE` before transformers run, then drop unrelated duplicate resources with file matching. Shadow 9 honors duplicate strategies during transforms. GradleUp/shadow#1233 GradleUp/shadow#1617 * Disable automatic Multi-Release manifest inheritance for the agent jar to keep the previous manifest shape. GradleUp/shadow#1239 GradleUp/shadow#1675 * Note the relocation output change. Shadow 9.2+ rewrites more descriptor-shaped string constants, which explains the observed `LoggerRuntime` LDC descriptor change. GradleUp/shadow#1714 GradleUp/shadow#1731 * Apply the same API and resource handling changes to smoke-test modules that run in the main Gradle build.

daniel-mohedano

LGTM from CIVis side! AFAIK we don't use JaCoCo's LoggerRuntime at all, we rely on jacoco for parsing/analyzing coverage reports, and our smoke tests already cover the expected behavior for the instrumentation. So agreed it shouldn't be a regression

AlexeyKuznetsov-DD

LGTM, nice improvement!
Left minor comments.

AlexeyKuznetsov-DD · 2026-06-29T15:13:44Z

+  filesNotMatching([
+    'META-INF/services/**',
+    'META-INF/spring.handlers',
+    'META-INF/spring.schemas',
+    'META-INF/spring.tooling',
+    'META-INF/spring.factories',
+  ]) {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  }


Q: this pattern looks like repeating several times, any ideas how to reuse code?

For now I think it's fine, this is happening in smoke tests because these projects are using the main build.

bric3 · 2026-07-03T07:30:17Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-07-03T07:30:21Z

View all feedbacks in Devflow UI.

2026-07-03 07:30:20 UTC ℹ️ Start processing command /merge

2026-07-03 07:30:28 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 2h (p90).

2026-07-03 08:35:27 UTC ℹ️ MergeQueue: This merge request was merged

bric3 added 2 commits June 24, 2026 17:48

refactor: migrate excludeShared from Groovy Closure to Action

d942cbe

bric3 added type: enhancement Enhancements and improvements tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels Jun 24, 2026

bric3 marked this pull request as ready for review June 24, 2026 19:28

bric3 requested review from a team as code owners June 24, 2026 19:28

bric3 requested review from Copilot, daniel-mohedano, daniel-romano-DD, jandro996, leoromanovsky, mcculls, typotter and ygree and removed request for a team and Copilot June 24, 2026 19:28

Copilot started reviewing on behalf of bric3 June 24, 2026 19:28 View session

daniel-mohedano approved these changes Jun 25, 2026

View reviewed changes

bric3 requested a review from amarziali June 25, 2026 14:25

bric3 commented Jun 25, 2026

View reviewed changes

Comment thread dd-java-agent/instrumentation/build.gradle

AlexeyKuznetsov-DD approved these changes Jun 29, 2026

View reviewed changes

bric3 added 2 commits June 30, 2026 10:18

chore: tighten call-site shadow duplicates

1821cc6

chore: tweak duplication strategy on CSI plugin

8972e3e

chore: decalre shadow in the version catalog

8f1ea77

mcculls reviewed Jul 2, 2026

View reviewed changes

Comment thread buildSrc/call-site-instrumentation-plugin/build.gradle.kts Outdated

mcculls reviewed Jul 2, 2026

View reviewed changes

Comment thread dd-java-agent/instrumentation/build.gradle

chore: fix comment on skipping license/notice in csi jar

54078f6

mcculls approved these changes Jul 2, 2026

View reviewed changes

gh-worker-dd-mergequeue-cf854d Bot merged commit 2734057 into master Jul 3, 2026
587 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the bdu/upgrade-shadow-plugin-9-4-2 branch July 3, 2026 08:35

github-actions Bot added this to the 1.64.0 milestone Jul 3, 2026

bric3 mentioned this pull request Jul 3, 2026

Prevent duplicate class inclusion in runtime artifacts #11853

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upgrade Shadow plugin to 9.4.2#11730

Upgrade Shadow plugin to 9.4.2#11730
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
masterfrom
bdu/upgrade-shadow-plugin-9-4-2

bric3 commented Jun 24, 2026 •

edited

Loading

Uh oh!

daniel-mohedano left a comment •

edited

Loading

Uh oh!

Uh oh!

AlexeyKuznetsov-DD left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexeyKuznetsov-DD Jun 29, 2026

Uh oh!

bric3 Jun 29, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bric3 commented Jul 3, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Jul 3, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	@TableTest({
	"scenario \| projectName \| mavenVersion \| expectedEvents \| expectedCoverages \| expectSuccess \| testsSkipping \| flakyRetries \| jacocoCoverage \| commandLineParams \| minSupportedJavaVersion",
	"succeed-base \| test_successful_maven_run \| {3.5.4, 3.6.3, 3.8.8, 3.9.9} \| 5 \| 1 \| true \| true \| false \| true \| [] \| 8 ",
	"succeed-surefire-3.0.0-j8 \| test_successful_maven_run_surefire_3_0_0 \| 3.9.9 \| 5 \| 1 \| true \| true \| false \| true \| [] \| 8 ",
	"succeed-surefire-3.0.0-j17 \| test_successful_maven_run_surefire_3_0_0 \| latest \| 5 \| 1 \| true \| true \| false \| true \| [] \| 17 ",
	"succeed-surefire-3.5.0-j8 \| test_successful_maven_run_surefire_3_5_0 \| 3.9.9 \| 5 \| 1 \| true \| true \| false \| true \| [] \| 8 ",
	"succeed-surefire-3.5.0-j17 \| test_successful_maven_run_surefire_3_5_0 \| latest \| 5 \| 1 \| true \| true \| false \| true \| [] \| 17 ",
	"succeed-builtin-coverage \| test_successful_maven_run_builtin_coverage \| 3.9.9 \| 5 \| 1 \| true \| true \| false \| false \| [] \| 8 ",
	"succeed-jacoco-argline \| test_successful_maven_run_with_jacoco_and_argline \| 3.9.9 \| 5 \| 1 \| true \| true \| false \| true \| [] \| 8 ",
	"succeed-cucumber \| test_successful_maven_run_with_cucumber \| 3.9.9 \| 4 \| 1 \| true \| false \| false \| true \| [] \| 8 ",
	"failed-flaky-retries \| test_failed_maven_run_flaky_retries \| 3.9.9 \| 8 \| 5 \| false \| false \| true \| true \| [] \| 8 ",
	"succeed-junit-platform \| test_successful_maven_run_junit_platform_runner \| 3.9.9 \| 4 \| 0 \| true \| false \| false \| false \| [] \| 8 ",
	"succeed-arg-line-property \| test_successful_maven_run_with_arg_line_property \| 3.9.9 \| 4 \| 0 \| true \| false \| false \| false \| [\"-DargLine='-Dmy-custom-property=provided-via-command-line'\"] \| 8 ",
	"succeed-multi-forks-j8 \| test_successful_maven_run_multiple_forks \| 3.9.9 \| 5 \| 1 \| true \| true \| false \| true \| [] \| 8 ",
	"succeed-multi-forks-j17 \| test_successful_maven_run_multiple_forks \| latest \| 5 \| 1 \| true \| true \| false \| true \| [] \| 17 "
	})
	@ParameterizedTest
	void testMavenRun(
	String projectName,

	@TableTest({
	"scenario \| gradleVersion \| projectName \| configurationCache \| successExpected \| flakyRetries \| expectedTraces \| expectedCoverages",
	"succeed-new-8.3 \| 8.3 \| test-succeed-new-instrumentation \| {false, true} \| true \| false \| 5 \| 1 ",
	"succeed-new-8.9 \| 8.9 \| test-succeed-new-instrumentation \| {false, true} \| true \| false \| 5 \| 1 ",
	"succeed-new-latest \| latest \| test-succeed-new-instrumentation \| {false, true} \| true \| false \| 5 \| 1 ",
	"succeed-multi-module-new \| latest \| test-succeed-multi-module-new-instrumentation \| false \| true \| false \| 7 \| 2 ",
	"succeed-multi-forks-new \| latest \| test-succeed-multi-forks-new-instrumentation \| false \| true \| false \| 6 \| 2 ",
	"skip-new \| latest \| test-skip-new-instrumentation \| false \| true \| false \| 2 \| 0 ",
	"failed-new \| latest \| test-failed-new-instrumentation \| false \| false \| false \| 4 \| 0 ",
	"corrupted-config-new \| latest \| test-corrupted-config-new-instrumentation \| false \| false \| false \| 1 \| 0 ",
	"succeed-junit-5 \| latest \| test-succeed-junit-5 \| false \| true \| false \| 5 \| 1 ",
	"failed-flaky-retries \| latest \| test-failed-flaky-retries \| false \| false \| true \| 8 \| 0 ",
	"succeed-gradle-plugin-test \| latest \| test-succeed-gradle-plugin-test \| false \| true \| false \| 5 \| 0 "
	})
	@ParameterizedTest
	void testNew(
	String gradleVersion,

	@Override
	public ElementMatcher<TypeDescription> hierarchyMatcher() {
	// The jacoco javaagent jar that is published relocates internal classes to an "obfuscated"
	// package name ex. org.jacoco.agent.rt.internal_72ddf3b.core.instr.Instrumenter
	return nameStartsWith("org.jacoco.agent.rt.internal")
	.and(nameEndsWith(".core.instr.Instrumenter"));
	}

	private static ExecutionDataStore parseCoverageData(byte[] rawCoverageData) {
	if (rawCoverageData == null) {

	import org.jacoco.core.analysis.Analyzer;
	import org.jacoco.core.data.ExecutionDataStore;
	import org.slf4j.Logger;

Uh oh!

Conversation

bric3 commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

daniel-mohedano left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AlexeyKuznetsov-DD left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexeyKuznetsov-DD Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

bric3 Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bric3 commented Jul 3, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bric3 commented Jun 24, 2026 •

edited

Loading

daniel-mohedano left a comment •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Jul 3, 2026 •

edited

Loading