feat(core): Data Collection by adinauer · Pull Request #5759 · getsentry/sentry-java

adinauer · 2026-07-14T11:59:26Z

PR Stack (Data Collection)

📜 Description

Collection PR for the Data Collection stack. The individual PRs add the configuration model, resolution and compatibility bridge, external configuration, filtering, and integration enforcement.

Squash-merge this PR into main only after every stack PR has been merged into this branch using merge commits.

💡 Motivation and Context

Introduce the specification-defined dataCollection configuration while preserving existing sendDefaultPii behavior for users who do not opt into the new namespace.

Refs #5666

💚 How did you test it?

This collection branch contains only an empty commit. Each stack PR carries its own tests.

📝 Checklist

I added GH Issue ID & Linear ID
I added tests to verify the changes.
No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
I updated the docs if needed.
I updated the wizard if needed.
Review from the native team if needed.
No breaking change or entry added to the changelog.
No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

Merge the Data Collection stack into this branch in order, then squash-merge this PR into main.

#skip-changelog

github-actions · 2026-07-14T11:59:59Z

	Messages
📖	Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against cffc94b

sentry · 2026-07-14T12:00:57Z

📲 Install Builds

Android

🔗 App Name	App ID	Version	Configuration
SDK Size	io.sentry.tests.size	8.57.0 (1)	release

⚙️ sentry-android Build Distribution Settings

…ion-options

…-resolver

Keep the internal resolver and its tests aligned with the canonical public Data Collection option name. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

…n-graphql

…-database-query-data

…a-collection-incoming-request-body

…ata-collection-incoming-response-body

…data-collection-outgoing-request-body

…ata-collection-outgoing-response-body

…data-collection-http-request-headers

…fo-options fix(android): [Data Collection 15] Scope device info cache to SDK options

github-actions · 2026-09-08T09:22:55Z

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

…replay-network-options test(replay): [Data Collection 16] Keep Replay independent

github-actions · 2026-09-08T09:23:10Z

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

github-actions · 2026-09-08T09:23:27Z

🚨 Detected changes in high risk code 🚨

High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:

sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java

…nding fix(spring): [Data Collection 18] Bind key-value policies

…installation-id fix(android): [Data Collection 19] Preserve installation ID

…-description fix(ktor): [Data Collection 20] Exclude query parameters from span descriptions

…-options feat(core): [Data Collection 21] Add external configuration

…manifest feat(android): [Data Collection 22] Add manifest configuration

…-urls fix(core): [Data Collection 23] Support WebSocket URL parsing

…tches fix(core): [Data Collection 24] Narrow utility exception handling

Describe Data Collection defaults, migration from sendDefaultPii, and the supported configuration mechanisms. Include examples for key-value filtering and HTTP body selection so users can adopt the new controls safely. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

Add the specification-defined filePaths option across programmatic, external, Spring Boot, and Android manifest configuration. Gate automatically captured File I/O paths through the resolved policy while preserving sendDefaultPii when Data Collection is absent.\n\nRefs #5666

Allow encoder-equipped Logback appenders to include original message templates and parameters without relying on sendDefaultPii. Keep sendDefaultPii as a temporary compatibility exception while Data Collection replaces its other behavior. Co-Authored-By: Claude <noreply@anthropic.com>

feat(core): [Data Collection 25] Apply file path policy

Describe how encoder use, the integration opt-in, and the legacy PII option control original message data. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

Align the includeUnencodedMessage getter and setter names so Kotlin exposes the option as a mutable synthetic property. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

…unencoded-message feat(logback): [Data Collection 26] Add unencoded message opt-in

Align nullable Boolean getters and setters so Kotlin exposes mutable synthetic properties. Allow callers to clear an explicit override by assigning null. Co-Authored-By: Claude <noreply@anthropic.com>

Stop treating DataCollection construction as an implicit opt-in. Add an explicit forceDataCollection method so callers can select the new defaults without replacing manifest or external configuration. Co-Authored-By: Claude <noreply@anthropic.com>

# Conflicts: # CHANGELOG.md # sentry/api/sentry.api

…opt-in fix(core): [Data Collection 27] Make opt-in explicit

sentry-warden · 2026-09-18T13:23:58Z

+  public static @NotNull Map<String, String> filterHeaders(
+      final @NotNull Map<String, String> headers,
+      final @NotNull KeyValueCollectionBehavior behavior) {
+    final @NotNull Map<String, String> filteredHeaders = new LinkedHashMap<>();
+    if (behavior.getMode() == KeyValueCollectionBehavior.Mode.OFF) {
+      return filteredHeaders;
    }

-    final @NotNull ArrayList<String> filteredHeaders = new ArrayList<>();
-
-    for (final String header : headers) {
-      filteredHeaders.add(
-          HttpUtils.filterOutSecurityCookies(header, additionalCookieNamesToFilter));
+    for (final Map.Entry<String, String> header : headers.entrySet()) {
+      final @NotNull String name = header.getKey();
+      final boolean sensitive =
+          containsTerm(name, SENSITIVE_DATA_KEYS)
+              || "Cookie".equalsIgnoreCase(name)
+              || "Set-Cookie".equalsIgnoreCase(name);
+      if (sensitive) {
+        filteredHeaders.put(name, SENSITIVE_DATA_SUBSTITUTE);
+      } else {
+        final boolean matchesTerm = containsTerm(name, behavior.getTerms());
+        final boolean shouldFilter =
+            behavior.getMode() == KeyValueCollectionBehavior.Mode.DENY_LIST
+                ? matchesTerm
+                : !matchesTerm;
+        filteredHeaders.put(name, shouldFilter ? SENSITIVE_DATA_SUBSTITUTE : header.getValue());
+      }
    }
-
    return filteredHeaders;


filterHeaders drops IP/proxy sensitive-header denylist

When Data Collection is enabled, filterHeaders no longer treats X-Forwarded-For, X-Real-IP, Remote-Addr, and Forwarded as always-sensitive, so client IP/proxy chain values can be sent to Sentry under the default deny-list. Reuse containsSensitiveHeader (or equivalent) in the always-sensitive check.

Evidence

filterHeaders() only hard-redacts names matching SENSITIVE_DATA_KEYS or exact Cookie/Set-Cookie; it never consults SENSITIVE_HEADERS/containsSensitiveHeader().

SENSITIVE_HEADERS still includes X-FORWARDED-FOR, X-REAL-IP, REMOTE-ADDR, and FORWARDED, and none of those names contain a SENSITIVE_DATA_KEYS term such as auth, token, or session.

Call sites switch to this path whenever Data Collection is configured (for example SentryRequestResolver.resolveHeadersMap() and SentryOkHttpUtils.getRequestHeaders()), using the default empty deny-list from DataCollectionResolver.getHttpRequestHeaders().

Result: those IP/proxy headers are collected with plaintext values instead of being omitted or replaced with [Filtered].

_{Identified by Warden · security-review · GSK-27Q}

This was referenced Jul 14, 2026

feat(core): [Data Collection 1] Add configuration types #5760

Merged

feat(core): [Data Collection 2] Expose SentryOptions API #5761

Merged

adinauer and others added 10 commits August 10, 2026 14:38

Merge branch 'feat/data-collection-foundation' into feat/data-collect…

b64b91b

…ion-options

Merge branch 'feat/data-collection-options' into feat/data-collection…

9b6ddb7

…-resolver

ref(core): Rename URL query parameter resolver

6a66949

Keep the internal resolver and its tests aligned with the canonical public Data Collection option name. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

Merge branch 'feat/data-collection-resolver' into feat/data-collectio…

a904161

…n-graphql

Merge branch 'feat/data-collection-graphql' into feat/data-collection…

2f66a94

…-database-query-data

Merge branch 'feat/data-collection-database-query-data' into feat/dat…

78ec5e5

…a-collection-incoming-request-body

Merge branch 'feat/data-collection-incoming-request-body' into feat/d…

ddd436d

…ata-collection-incoming-response-body

Merge branch 'feat/data-collection-incoming-response-body' into feat/…

32bb973

…data-collection-outgoing-request-body

Merge branch 'feat/data-collection-outgoing-request-body' into feat/d…

3352d09

…ata-collection-outgoing-response-body

Merge branch 'feat/data-collection-outgoing-response-body' into feat/…

29fc629

…data-collection-http-request-headers

Merge pull request #5831 from getsentry/fix/data-collection-device-in…

48f9273

…fo-options fix(android): [Data Collection 15] Scope device info cache to SDK options

Merge pull request #5832 from getsentry/feat/data-collection-session-…

764db2e

…replay-network-options test(replay): [Data Collection 16] Keep Replay independent

adinauer and others added 9 commits September 8, 2026 11:23

Merge pull request #5834 from getsentry/fix/data-collection-spring-bi…

93cca38

…nding fix(spring): [Data Collection 18] Bind key-value policies

Merge pull request #5937 from getsentry/fix/data-collection-preserve-…

81a532a

…installation-id fix(android): [Data Collection 19] Preserve installation ID

Merge pull request #5983 from getsentry/fix/data-collection-ktor-span…

14c363d

…-description fix(ktor): [Data Collection 20] Exclude query parameters from span descriptions

Merge pull request #6036 from getsentry/feat/data-collection-external…

5e3fa6c

…-options feat(core): [Data Collection 21] Add external configuration

Merge pull request #6038 from getsentry/feat/data-collection-android-…

4b95c7e

…manifest feat(android): [Data Collection 22] Add manifest configuration

Merge pull request #6064 from getsentry/fix/data-collection-websocket…

48709b5

…-urls fix(core): [Data Collection 23] Support WebSocket URL parsing

Merge pull request #6065 from getsentry/ref/data-collection-narrow-ca…

6fab6c4

…tches fix(core): [Data Collection 24] Narrow utility exception handling

adinauer mentioned this pull request Sep 9, 2026

feat(core): [Data Collection 25] Apply file path policy #6075

Merged

9 tasks

adinauer mentioned this pull request Sep 9, 2026

feat(logback): [Data Collection 26] Add unencoded message opt-in #6076

Merged

9 tasks

runningcode reviewed Sep 9, 2026

View reviewed changes

Comment thread sentry/api/sentry.api

adinauer and others added 5 commits September 10, 2026 06:19

Merge pull request #6075 from getsentry/feat/data-collection-file-paths

2243aff

feat(core): [Data Collection 25] Apply file path policy

docs(logback): Clarify unencoded message behavior

ccdb7e6

Describe how encoder use, the integration opt-in, and the legacy PII option control original message data. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

fix(logback): Expose mutable Kotlin appender option

8975006

Align the includeUnencodedMessage getter and setter names so Kotlin exposes the option as a mutable synthetic property. Refs #5666 Co-Authored-By: Claude <noreply@anthropic.com>

Merge pull request #6076 from getsentry/feat/data-collection-logback-…

85b919f

…unencoded-message feat(logback): [Data Collection 26] Add unencoded message opt-in

fix(core): Expose mutable Kotlin Data Collection options

6375c65

Align nullable Boolean getters and setters so Kotlin exposes mutable synthetic properties. Allow callers to clear an explicit override by assigning null. Co-Authored-By: Claude <noreply@anthropic.com>

adinauer mentioned this pull request Sep 14, 2026

docs(java): Document Data Collection controls getsentry/sentry-docs#19401

Draft

adinauer mentioned this pull request Sep 16, 2026

fix(core): [Data Collection 27] Make opt-in explicit #6122

Merged

9 tasks

adinauer added 3 commits September 16, 2026 15:51

merge: Update Data Collection stack

670c4a7

# Conflicts: # CHANGELOG.md # sentry/api/sentry.api

merge: Update Data Collection stack

5a3ce33

Merge pull request #6122 from getsentry/fix/data-collection-explicit-…

cffc94b

…opt-in fix(core): [Data Collection 27] Make opt-in explicit

sentry-warden Bot reviewed Sep 18, 2026

View reviewed changes

Navigation Menu

Uh oh!

feat(core): Data Collection - #5759

feat(core): Data Collection#5759
adinauer wants to merge 288 commits into
mainfrom
feat/data-collection

adinauer commented Jul 14, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 14, 2026 •

edited

Loading

Uh oh!

sentry Bot commented Jul 14, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 8, 2026

Uh oh!

github-actions Bot commented Sep 8, 2026

Uh oh!

github-actions Bot commented Sep 8, 2026

Uh oh!

Uh oh!

sentry-warden Bot Sep 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

adinauer commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Stack (Data Collection)

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

🔮 Next steps

Uh oh!

github-actions Bot commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sentry Bot commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📲 Install Builds

Android

Uh oh!

github-actions Bot commented Sep 8, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 8, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

github-actions Bot commented Sep 8, 2026

🚨 Detected changes in high risk code 🚨

Uh oh!

Uh oh!

sentry-warden Bot Sep 18, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adinauer commented Jul 14, 2026 •

edited

Loading

github-actions Bot commented Jul 14, 2026 •

edited

Loading

sentry Bot commented Jul 14, 2026 •

edited

Loading