Skip to content

Commit 46ecdf0

Browse files
adinauerclaude
adinauer
and
claude
committed
chore: Merge data collection stack updates
Merge the latest changes from the preceding Data Collection branch. Co-Authored-By: Claude <noreply@anthropic.com>
2 parents 89bcf71 + 5e1dbaa commit 46ecdf0

16 files changed

Lines changed: 717 additions & 642 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import io.sentry.exception.ExceptionMechanismException
2727
import io.sentry.protocol.Mechanism
2828
import io.sentry.protocol.Request
2929
import io.sentry.protocol.Response
30+
import io.sentry.util.CookieUtils
3031
import io.sentry.util.GraphqlUtils
3132
import io.sentry.util.HttpUtils
3233
import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion
@@ -273,7 +274,7 @@ constructor(
273274
private fun getRequestCookies(headers: List<HttpHeader>): String? {
274275
val cookies = getHeader("Cookie", headers)
275276
return if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
276-
HttpUtils.filterCookies(cookies, scopes.options.dataCollectionResolver.cookies, null)
277+
CookieUtils.filterCookies(cookies, scopes.options.dataCollectionResolver.cookies, null)
277278
} else if (scopes.options.isSendDefaultPii) {
278279
cookies
279280
} else {
@@ -284,7 +285,7 @@ constructor(
284285
private fun getResponseCookies(headers: List<HttpHeader>): String? {
285286
val cookies = getHeader("Set-Cookie", headers)
286287
return if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
287-
HttpUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
288+
CookieUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
288289
} else if (scopes.options.isSendDefaultPii) {
289290
cookies
290291
} else {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import io.sentry.exception.ExceptionMechanismException
2525
import io.sentry.protocol.Mechanism
2626
import io.sentry.protocol.Request
2727
import io.sentry.protocol.Response
28+
import io.sentry.util.CookieUtils
2829
import io.sentry.util.GraphqlUtils
2930
import io.sentry.util.HttpUtils
3031
import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion
@@ -272,7 +273,7 @@ constructor(
272273
private fun getRequestCookies(headers: List<HttpHeader>): String? {
273274
val cookies = getHeader("Cookie", headers)
274275
return if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
275-
HttpUtils.filterCookies(cookies, scopes.options.dataCollectionResolver.cookies, null)
276+
CookieUtils.filterCookies(cookies, scopes.options.dataCollectionResolver.cookies, null)
276277
} else if (scopes.options.isSendDefaultPii) {
277278
cookies
278279
} else {
@@ -283,7 +284,7 @@ constructor(
283284
private fun getResponseCookies(headers: List<HttpHeader>): String? {
284285
val cookies = getHeader("Set-Cookie", headers)
285286
return if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
286-
HttpUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
287+
CookieUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
287288
} else if (scopes.options.isSendDefaultPii) {
288289
cookies
289290
} else {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.sentry.TypeCheckHint
1616
import io.sentry.exception.ExceptionMechanismException
1717
import io.sentry.exception.SentryHttpClientException
1818
import io.sentry.protocol.Mechanism
19+
import io.sentry.util.CookieUtils
1920
import io.sentry.util.HttpUtils
2021
import io.sentry.util.UrlUtils
2122

@@ -67,7 +68,7 @@ internal object SentryKtorClientUtils {
6768

6869
private fun getRequestCookies(scopes: IScopes, cookies: String?): String? =
6970
if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
70-
HttpUtils.filterCookies(
71+
CookieUtils.filterCookies(
7172
cookies,
7273
scopes.options.dataCollectionResolver.cookies,
7374
null,
@@ -80,7 +81,7 @@ internal object SentryKtorClientUtils {
8081

8182
private fun getResponseCookies(scopes: IScopes, cookies: String?): String? =
8283
if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
83-
HttpUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
84+
CookieUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
8485
} else if (scopes.options.isSendDefaultPii) {
8586
cookies
8687
} else {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import io.sentry.TypeCheckHint
77
import io.sentry.exception.ExceptionMechanismException
88
import io.sentry.exception.SentryHttpClientException
99
import io.sentry.protocol.Mechanism
10+
import io.sentry.util.CookieUtils
1011
import io.sentry.util.HttpUtils
1112
import io.sentry.util.UrlUtils
1213
import okhttp3.Headers
@@ -67,7 +68,7 @@ internal object SentryOkHttpUtils {
6768

6869
private fun getRequestCookies(scopes: IScopes, cookies: String?): String? =
6970
if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
70-
HttpUtils.filterCookies(
71+
CookieUtils.filterCookies(
7172
cookies,
7273
scopes.options.dataCollectionResolver.cookies,
7374
null,
@@ -80,7 +81,7 @@ internal object SentryOkHttpUtils {
8081

8182
private fun getResponseCookies(scopes: IScopes, cookies: String?): String? =
8283
if (scopes.options.dataCollectionResolver.isDataCollectionConfigured) {
83-
HttpUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
84+
CookieUtils.filterSetCookie(cookies, scopes.options.dataCollectionResolver.cookies)
8485
} else if (scopes.options.isSendDefaultPii) {
8586
cookies
8687
} else {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.sentry.SentryLevel;
1010
import io.sentry.SentryOptions;
1111
import io.sentry.protocol.Request;
12+
import io.sentry.util.CookieUtils;
1213
import io.sentry.util.HttpUtils;
1314
import io.sentry.util.StringUtils;
1415
import io.sentry.util.UrlUtils;
@@ -91,7 +92,7 @@ private static Map<String, String> collectHeaders(
9192
headers.put(
9293
headerName,
9394
toString(
94-
HttpUtils.filterOutSecurityCookiesFromHeader(
95+
CookieUtils.filterOutSecurityCookiesFromHeader(
9596
headerValues, headerName, null)));
9697
} catch (Throwable t) {
9798
options

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.sentry.SentryLevel;
77
import io.sentry.protocol.Request;
88
import io.sentry.util.AutoClosableReentrantLock;
9+
import io.sentry.util.CookieUtils;
910
import io.sentry.util.HttpUtils;
1011
import io.sentry.util.Objects;
1112
import io.sentry.util.UrlUtils;
@@ -48,18 +49,18 @@ public SentryRequestResolver(final @NotNull IScopes scopes) {
4849
extractSecurityCookieNamesOrUseCached(httpRequest);
4950
sentryRequest.setHeaders(resolveHeadersMap(httpRequest, additionalSecurityCookieNames));
5051

51-
final @NotNull String cookieName = HttpUtils.COOKIE_HEADER_NAME;
52+
final @NotNull String cookieName = CookieUtils.COOKIE_HEADER_NAME;
5253
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
5354
sentryRequest.setCookies(
5455
toString(
55-
HttpUtils.filterCookiesFromHeader(
56+
CookieUtils.filterCookiesFromHeader(
5657
httpRequest.getHeaders(cookieName),
5758
scopes.getOptions().getDataCollectionResolver().getCookies(),
5859
additionalSecurityCookieNames)));
5960
} else if (scopes.getOptions().isSendDefaultPii()) {
6061
sentryRequest.setCookies(
6162
toString(
62-
HttpUtils.filterOutSecurityCookiesFromHeader(
63+
CookieUtils.filterOutSecurityCookiesFromHeader(
6364
httpRequest.getHeaders(cookieName), cookieName, additionalSecurityCookieNames)));
6465
}
6566
return sentryRequest;
@@ -75,7 +76,7 @@ Map<String, String> resolveHeadersMap(
7576
|| scopes.getOptions().isSendDefaultPii()
7677
|| !HttpUtils.containsSensitiveHeader(headerName)) {
7778
final @Nullable List<String> filteredHeaders =
78-
HttpUtils.filterOutSecurityCookiesFromHeader(
79+
CookieUtils.filterOutSecurityCookiesFromHeader(
7980
request.getHeaders(headerName), headerName, additionalSecurityCookieNames);
8081
headersMap.put(headerName, toString(filteredHeaders));
8182
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.jakewharton.nopen.annotation.Open;
44
import io.sentry.IScopes;
55
import io.sentry.protocol.Request;
6+
import io.sentry.util.CookieUtils;
67
import io.sentry.util.HttpUtils;
78
import io.sentry.util.Objects;
89
import io.sentry.util.UrlUtils;
@@ -37,18 +38,18 @@ public SentryRequestResolver(final @NotNull IScopes scopes) {
3738
urlDetails.applyToRequest(sentryRequest);
3839
sentryRequest.setHeaders(resolveHeadersMap(httpRequest.getHeaders()));
3940

40-
final @NotNull String headerName = HttpUtils.COOKIE_HEADER_NAME;
41+
final @NotNull String headerName = CookieUtils.COOKIE_HEADER_NAME;
4142
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
4243
sentryRequest.setCookies(
4344
toString(
44-
HttpUtils.filterCookiesFromHeader(
45+
CookieUtils.filterCookiesFromHeader(
4546
httpRequest.getHeaders().get(headerName),
4647
scopes.getOptions().getDataCollectionResolver().getCookies(),
4748
Collections.emptyList())));
4849
} else if (scopes.getOptions().isSendDefaultPii()) {
4950
sentryRequest.setCookies(
5051
toString(
51-
HttpUtils.filterOutSecurityCookiesFromHeader(
52+
CookieUtils.filterOutSecurityCookiesFromHeader(
5253
httpRequest.getHeaders().get(headerName), headerName, Collections.emptyList())));
5354
}
5455
return sentryRequest;
@@ -65,7 +66,7 @@ Map<String, String> resolveHeadersMap(final HttpHeaders request) {
6566
headersMap.put(
6667
headerName,
6768
toString(
68-
HttpUtils.filterOutSecurityCookiesFromHeader(
69+
CookieUtils.filterOutSecurityCookiesFromHeader(
6970
entry.getValue(), headerName, Collections.emptyList())));
7071
}
7172
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.sentry.SentryLevel;
77
import io.sentry.protocol.Request;
88
import io.sentry.util.AutoClosableReentrantLock;
9+
import io.sentry.util.CookieUtils;
910
import io.sentry.util.HttpUtils;
1011
import io.sentry.util.Objects;
1112
import io.sentry.util.UrlUtils;
@@ -48,18 +49,18 @@ public SentryRequestResolver(final @NotNull IScopes scopes) {
4849
extractSecurityCookieNamesOrUseCached(httpRequest);
4950
sentryRequest.setHeaders(resolveHeadersMap(httpRequest, additionalSecurityCookieNames));
5051

51-
final @NotNull String cookieName = HttpUtils.COOKIE_HEADER_NAME;
52+
final @NotNull String cookieName = CookieUtils.COOKIE_HEADER_NAME;
5253
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
5354
sentryRequest.setCookies(
5455
toString(
55-
HttpUtils.filterCookiesFromHeader(
56+
CookieUtils.filterCookiesFromHeader(
5657
httpRequest.getHeaders(cookieName),
5758
scopes.getOptions().getDataCollectionResolver().getCookies(),
5859
additionalSecurityCookieNames)));
5960
} else if (scopes.getOptions().isSendDefaultPii()) {
6061
sentryRequest.setCookies(
6162
toString(
62-
HttpUtils.filterOutSecurityCookiesFromHeader(
63+
CookieUtils.filterOutSecurityCookiesFromHeader(
6364
httpRequest.getHeaders(cookieName), cookieName, additionalSecurityCookieNames)));
6465
}
6566
return sentryRequest;
@@ -75,7 +76,7 @@ Map<String, String> resolveHeadersMap(
7576
|| scopes.getOptions().isSendDefaultPii()
7677
|| !HttpUtils.containsSensitiveHeader(headerName)) {
7778
final @Nullable List<String> filteredHeaders =
78-
HttpUtils.filterOutSecurityCookiesFromHeader(
79+
CookieUtils.filterOutSecurityCookiesFromHeader(
7980
request.getHeaders(headerName), headerName, additionalSecurityCookieNames);
8081
headersMap.put(headerName, toString(filteredHeaders));
8182
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.jakewharton.nopen.annotation.Open;
44
import io.sentry.IScopes;
55
import io.sentry.protocol.Request;
6+
import io.sentry.util.CookieUtils;
67
import io.sentry.util.HttpUtils;
78
import io.sentry.util.Objects;
89
import io.sentry.util.UrlUtils;
@@ -37,18 +38,18 @@ public SentryRequestResolver(final @NotNull IScopes scopes) {
3738
urlDetails.applyToRequest(sentryRequest);
3839
sentryRequest.setHeaders(resolveHeadersMap(httpRequest.getHeaders()));
3940

40-
final @NotNull String headerName = HttpUtils.COOKIE_HEADER_NAME;
41+
final @NotNull String headerName = CookieUtils.COOKIE_HEADER_NAME;
4142
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
4243
sentryRequest.setCookies(
4344
toString(
44-
HttpUtils.filterCookiesFromHeader(
45+
CookieUtils.filterCookiesFromHeader(
4546
httpRequest.getHeaders().get(headerName),
4647
scopes.getOptions().getDataCollectionResolver().getCookies(),
4748
Collections.emptyList())));
4849
} else if (scopes.getOptions().isSendDefaultPii()) {
4950
sentryRequest.setCookies(
5051
toString(
51-
HttpUtils.filterOutSecurityCookiesFromHeader(
52+
CookieUtils.filterOutSecurityCookiesFromHeader(
5253
httpRequest.getHeaders().get(headerName), headerName, Collections.emptyList())));
5354
}
5455
return sentryRequest;
@@ -65,7 +66,7 @@ Map<String, String> resolveHeadersMap(final HttpHeaders request) {
6566
headersMap.put(
6667
headerName,
6768
toString(
68-
HttpUtils.filterOutSecurityCookiesFromHeader(
69+
CookieUtils.filterOutSecurityCookiesFromHeader(
6970
entry.getValue(), headerName, Collections.emptyList())));
7071
}
7172
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.sentry.SentryLevel;
77
import io.sentry.protocol.Request;
88
import io.sentry.util.AutoClosableReentrantLock;
9+
import io.sentry.util.CookieUtils;
910
import io.sentry.util.HttpUtils;
1011
import io.sentry.util.Objects;
1112
import io.sentry.util.UrlUtils;
@@ -48,18 +49,18 @@ public SentryRequestResolver(final @NotNull IScopes scopes) {
4849
extractSecurityCookieNamesOrUseCached(httpRequest);
4950
sentryRequest.setHeaders(resolveHeadersMap(httpRequest, additionalSecurityCookieNames));
5051

51-
final @NotNull String cookieName = HttpUtils.COOKIE_HEADER_NAME;
52+
final @NotNull String cookieName = CookieUtils.COOKIE_HEADER_NAME;
5253
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
5354
sentryRequest.setCookies(
5455
toString(
55-
HttpUtils.filterCookiesFromHeader(
56+
CookieUtils.filterCookiesFromHeader(
5657
httpRequest.getHeaders(cookieName),
5758
scopes.getOptions().getDataCollectionResolver().getCookies(),
5859
additionalSecurityCookieNames)));
5960
} else if (scopes.getOptions().isSendDefaultPii()) {
6061
sentryRequest.setCookies(
6162
toString(
62-
HttpUtils.filterOutSecurityCookiesFromHeader(
63+
CookieUtils.filterOutSecurityCookiesFromHeader(
6364
httpRequest.getHeaders(cookieName), cookieName, additionalSecurityCookieNames)));
6465
}
6566
return sentryRequest;
@@ -75,7 +76,7 @@ Map<String, String> resolveHeadersMap(
7576
|| scopes.getOptions().isSendDefaultPii()
7677
|| !HttpUtils.containsSensitiveHeader(headerName)) {
7778
final @Nullable List<String> filteredHeaders =
78-
HttpUtils.filterOutSecurityCookiesFromHeader(
79+
CookieUtils.filterOutSecurityCookiesFromHeader(
7980
request.getHeaders(headerName), headerName, additionalSecurityCookieNames);
8081
headersMap.put(headerName, toString(filteredHeaders));
8182
}

0 commit comments

Comments
 (0)