From 675419e8beba6b27d4cdba134cefb738d360a2c6 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Mon, 11 May 2026 16:37:54 +0200 Subject: [PATCH 1/2] build(gradle): remove redundant sourceSets block in protobuf-3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plugin 0.10.0 automatically registers generated proto sources into the corresponding source sets. The manual srcDir addition was required for plugin 0.8.18 but is now redundant — keeping it on top of the plugin's own wiring actively breaks source set registration (review comment on #11310). Co-Authored-By: Claude Sonnet 4.6 --- .../instrumentation/protobuf-3.0/build.gradle | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle index c20b9434017..ff05b799708 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle +++ b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle @@ -32,12 +32,4 @@ protobuf { dependencies { compileOnly group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' -} - -sourceSets { - test { - java { - srcDir layout.buildDirectory.dir("generated/sources/proto/test/java") - } - } -} +} \ No newline at end of file From d5cfed876a97bddcc665b02689740e11eb03ba62 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Mon, 11 May 2026 17:20:49 +0200 Subject: [PATCH 2/2] type: EOF --- dd-java-agent/instrumentation/protobuf-3.0/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle index ff05b799708..d411c3b12d3 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle +++ b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle @@ -32,4 +32,4 @@ protobuf { dependencies { compileOnly group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' -} \ No newline at end of file +}