Skip to content

Commit 069d598

Browse files
adinauerclaude
andcommitted
chore: Merge Data Collection stack updates
Bring the latest base branch fixes into the cookie policy branch. Co-Authored-By: Claude <noreply@anthropic.com>
2 parents 33078e4 + 1f2aba4 commit 069d598

2 files changed

Lines changed: 2 additions & 12 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ public SentrySpanClientWebRequestFilter(final @NotNull IScopes scopes) {
4949
final @NotNull UrlUtils.UrlDetails urlDetails =
5050
UrlUtils.parse(request.url().toString(), scopes.getOptions().getDataCollectionResolver());
5151
final @NotNull String method = request.method().name();
52-
span.setDescription(
53-
method
54-
+ " "
55-
+ (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()
56-
? urlDetails.getUrlOrFallback()
57-
: request.url()));
52+
span.setDescription(method + " " + urlDetails.getUrlOrFallback());
5853
span.setData(SpanDataConvention.HTTP_METHOD_KEY, method.toUpperCase(Locale.ROOT));
5954
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
6055
urlDetails.applyToSpan(span);

‎sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientWebRequestFilter.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ public SentrySpanClientWebRequestFilter(final @NotNull IScopes scopes) {
4949
final @NotNull UrlUtils.UrlDetails urlDetails =
5050
UrlUtils.parse(request.url().toString(), scopes.getOptions().getDataCollectionResolver());
5151
final @NotNull String method = request.method().name();
52-
span.setDescription(
53-
method
54-
+ " "
55-
+ (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()
56-
? urlDetails.getUrlOrFallback()
57-
: request.url()));
52+
span.setDescription(method + " " + urlDetails.getUrlOrFallback());
5853
span.setData(SpanDataConvention.HTTP_METHOD_KEY, method.toUpperCase(Locale.ROOT));
5954
if (scopes.getOptions().getDataCollectionResolver().isDataCollectionConfigured()) {
6055
urlDetails.applyToSpan(span);

0 commit comments

Comments
 (0)