feat(core): [Data Collection 21] Add external configuration - #6036
Merged
adinauer merged 24 commits intoSep 8, 2026
Merged
adinauer merged 24 commits into
adinauer merged 24 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Parse the url.full fallback through the shared URL utility before using it as an HTTP span description. This removes query parameters and fragments while preserving route and target handling. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>
…a-collection-opentelemetry-span-description
…a-collection-opentelemetry-span-description
Exclude query parameters and fragments when deriving Sentry span descriptions from the legacy http.target attribute. Leave the completed OpenTelemetry attribute unchanged. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>
…a-collection-opentelemetry-span-description
…a-collection-opentelemetry-span-description
…a-collection-opentelemetry-span-description
Parse flattened Data Collection settings from properties, system properties, and environment variables. Merge only configured values so omitted settings retain their documented or legacy behavior. Refs #5666
Copy link
Copy Markdown
Contributor
Semver Impact of This PR🟡 Minor (new features) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Sorry, something went wrong.
Copy link
Copy Markdown
📲 Install BuildsAndroid
|
Sorry, something went wrong.
This was referenced Sep 1, 2026
…a-collection-opentelemetry-span-description
…o feat/data-collection-external-options
Merge the conflict-resolved cookie policy through the remaining stacked branches. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the conflict-resolved cookie policy through the remaining stacked branches. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the fallback behavior isolation fix from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the fallback behavior isolation fix from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
9 tasks
Propagate the corrected OkHttp Set-Cookie fixture through the Data Collection PR stack. Co-Authored-By: Claude <noreply@anthropic.com>
Propagate the corrected OkHttp Set-Cookie fixture through the Data Collection PR stack. Co-Authored-By: Claude <noreply@anthropic.com>
Revert the OpenTelemetry span-description normalization from this stack PR. Preserve completed OpenTelemetry URL and target values when deriving descriptions. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>
Propagate the OpenTelemetry span-description revert from the preceding stack branch. Co-Authored-By: Claude <noreply@anthropic.com>
adinauer
changed the base branch from
fix/data-collection-opentelemetry-span-description
to
fix/data-collection-ktor-span-description
September 7, 2026 09:57
9 tasks
Bring the latest base branch fixes into this stacked branch. Co-Authored-By: Claude <noreply@anthropic.com>
Base automatically changed from
fix/data-collection-ktor-span-description
to
feat/data-collection
September 8, 2026 09:24
adinauer
marked this pull request as ready for review
September 8, 2026 09:24
adinauer
requested review from
0xadam-brown,
markushi,
romtsn and
runningcode
as code owners
September 8, 2026 09:24
This was referenced Sep 9, 2026
9 tasks
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
Reviewers
2 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.
PR Stack (Data Collection)
📜 Description
Parse flattened Data Collection settings through ExternalOptions, making them available from sentry.properties, Java system properties, and environment variables.
Support user information, HTTP body directions, cookies, request and response headers, URL query parameters, GraphQL document and variables, and database query data. Merge only configured fields into SentryOptions; omitted fields retain their documented defaults or legacy behavior. An empty data-collection.http-bodies value disables all body directions.
💡 Motivation and Context
Data Collection was previously configurable only through the programmatic SentryOptions API and framework-specific binding. JVM applications that rely on the SDK's external configuration need equivalent access without custom initialization code.
Explicit external Data Collection configuration takes precedence over sendDefaultPii, matching the programmatic resolver behavior.
Refs #5666
💚 How did you test it?
📝 Checklist
🔮 Next steps
Add Spring Boot binding coverage, Android manifest metadata support, and Data Collection configuration documentation in follow-up PRs.
#skip-changelog