Remove redundant manual proto srcDir from protobuf-3.0 instrumentation#11343
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intoMay 11, 2026
Merged
Conversation
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 <noreply@anthropic.com>
bric3
added
tag: no release notes
sarahchen6
approved these changes
May 11, 2026
AlexeyKuznetsov-DD
approved these changes
May 11, 2026
bric3
changed the title
srcDir from protobuf-3.0 instrumentation
Contributor
Author
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
|
gh-worker-dd-mergequeue-cf854d
Bot
merged commit cd95f53
into
master
757 of 759 checks passed
gh-worker-dd-mergequeue-cf854d
Bot
deleted the
bdu/gradle9-protobuf-30-drop-manual-srcdir
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Does This Do
Removes the manual
sourceSetsblock that explicitly added the generated proto sources directory indd-java-agent/instrumentation/protobuf-3.0/build.gradle. Thecom.google.protobufplugin 0.10.0 (upgraded in #11310) automatically registers generated sources into the corresponding source sets, making the manual declaration redundant.Follow-up to https://github.com/DataDog/dd-trace-java/pull/11310/files#r3204919936
Motivation
The manual
srcDiraddition was necessary with plugin 0.8.18, which did not auto-wire generated sources. Keeping it alongside the plugin's own auto-registration was actively breaking source set wiring (flagged in a review comment on #11310). Removing it restores correct behaviour and simplifies the build script. Verified with a clean build (no cache) and a second pass using the build cache — bothgenerateTestProtoandcompileTestJavasucceed in all cases.Additional Notes
Sub-PR of #10402, #11272.