Skip to content

fix(opentelemetry): [Data Collection 21] Exclude queries from span descriptions #5985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adinauer wants to merge 1 commit into
base: fix/data-collection-ktor-span-description
Choose a base branch
from
+4 −5
Draft

fix(opentelemetry): [Data Collection 21] Exclude queries from span descriptions #5985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...ry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
import io.sentry.SentryOptions;
import io.sentry.protocol.TransactionNameSource;
import io.sentry.util.UrlUtils;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -77,10 +78,8 @@ private OtelSpanInfo descriptionForHttpMethod(
final @NotNull String op = opBuilder.toString();

final @Nullable String urlFull = attributes.get(UrlAttributes.URL_FULL);
if (urlFull != null) {
if (httpPath == null) {
httpPath = urlFull;
}
if (urlFull != null && httpPath == null) {
httpPath = UrlUtils.parse(urlFull).getUrl();
}

final @Nullable String urlPath = attributes.get(UrlAttributes.URL_PATH);
Expand Down
2 changes: 1 addition & 1 deletion ...y-opentelemetry/sentry-opentelemetry-core/src/test/kotlin/SpanDescriptionExtractorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class SpanDescriptionExtractorTest {
val info = whenExtractingSpanInfo()

assertEquals("http.server", info.op)
assertEquals("GET https://sentry.io/some/path?q=1#top", info.description)
assertEquals("GET https://sentry.io/some/path", info.description)
assertEquals(TransactionNameSource.URL, info.transactionNameSource)
}

Expand Down
Loading