Skip to content

Commit a4fd775

Browse files
adinauerclaude
andauthored
feat(core): Deprecate sendDefaultPii (#6158)
* feat(core): Deprecate sendDefaultPii Mark the SentryOptions accessors as deprecated and scheduled for removal in 9.0. Direct users to dataCollection while retaining legacy fallback behavior throughout 8.x. Co-Authored-By: Claude <noreply@anthropic.com> * changelog --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent ceb45dc commit a4fd775

16 files changed

Lines changed: 34 additions & 1 deletion

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Features
6+
7+
- Deprecate `sendDefaultPii` in favor of `dataCollection` ahead of its removal in 9.0 ([#6158](https://github.com/getsentry/sentry-java/pull/6158))
8+
39
## 8.58.0
410

511
### Features

‎sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ constructor(
301301
return getHeaders(headers)
302302
}
303303

304+
@Suppress("DEPRECATION")
304305
private fun getHeaders(headers: List<HttpHeader>): MutableMap<String, String>? {
305306
// Headers are only sent if isSendDefaultPii is enabled due to PII
306307
if (!scopes.options.isSendDefaultPii) {

‎sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ constructor(
300300
return getHeaders(headers)
301301
}
302302

303+
@Suppress("DEPRECATION")
303304
private fun getHeaders(headers: List<HttpHeader>): MutableMap<String, String>? {
304305
// Headers are only sent if isSendDefaultPii is enabled due to PII
305306
if (!scopes.options.isSendDefaultPii) {

‎sentry-ktor-client/src/main/java/io/sentry/ktorClient/SentryKtorClientUtils.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ internal object SentryKtorClientUtils {
9292
return getHeaders(scopes, headers)
9393
}
9494

95+
@Suppress("DEPRECATION")
9596
private fun getHeaders(scopes: IScopes, headers: Headers): MutableMap<String, String>? {
9697
// Headers are only sent if isSendDefaultPii is enabled due to PII
9798
if (!scopes.options.isSendDefaultPii) {

‎sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ protected void captureLog(@NotNull ILoggingEvent loggingEvent) {
200200
Sentry.logger().log(sentryLevel, params, formattedMessage, arguments);
201201
}
202202

203+
@SuppressWarnings("deprecation")
203204
private boolean shouldIncludeUnencodedMessage() {
204205
return encoder == null
205206
|| includeUnencodedMessage

‎sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpUtils.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ internal object SentryOkHttpUtils {
102102
return getHeaders(scopes, responseHeaders)
103103
}
104104

105+
@Suppress("DEPRECATION")
105106
private fun getHeaders(scopes: IScopes, requestHeaders: Headers): MutableMap<String, String>? {
106107
// Headers are only sent if isSendDefaultPii is enabled due to PII
107108
if (!scopes.options.isSendDefaultPii) {

‎sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OpenTelemetryAttributesExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void addRequestAttributesToScope(
7474
}
7575
}
7676

77-
@SuppressWarnings("unchecked")
77+
@SuppressWarnings({"deprecation", "unchecked"})
7878
private static Map<String, String> collectHeaders(
7979
final @NotNull Attributes attributes, final @NotNull SentryOptions options) {
8080
Map<String, String> headers = new HashMap<>();

‎sentry-spring-7/src/main/java/io/sentry/spring7/SentryRequestResolver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.jetbrains.annotations.Nullable;
2323

2424
@Open
25+
@SuppressWarnings("deprecation")
2526
public class SentryRequestResolver {
2627
protected static final @NotNull AutoClosableReentrantLock staticLock =
2728
new AutoClosableReentrantLock();

‎sentry-spring-7/src/main/java/io/sentry/spring7/webflux/SentryRequestResolver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.http.server.reactive.ServerHttpRequest;
2020

2121
@Open
22+
@SuppressWarnings("deprecation")
2223
@ApiStatus.Experimental
2324
public class SentryRequestResolver {
2425
private final @NotNull IScopes scopes;

‎sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryRequestResolver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.jetbrains.annotations.Nullable;
2323

2424
@Open
25+
@SuppressWarnings("deprecation")
2526
public class SentryRequestResolver {
2627
protected static final @NotNull AutoClosableReentrantLock staticLock =
2728
new AutoClosableReentrantLock();

0 commit comments

Comments
 (0)