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 4 commits into
base: fix/data-collection-ktor-span-description
Choose a base branch
from
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
4 commits
Select commit Hold shift + click to select a range
3b884f7
fix(opentelemetry): Exclude queries from span descriptions
adinauer Aug 25, 2026
3c596eb
Merge branch 'fix/data-collection-ktor-span-description' into fix/dat…
adinauer Aug 27, 2026
fa2f138
Merge branch 'fix/data-collection-ktor-span-description' into fix/dat…
adinauer Aug 27, 2026
dc6cd57
fix(opentelemetry): Normalize legacy HTTP target descriptions
adinauer Aug 27, 2026
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
11 changes: 5 additions & 6 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 @@ -71,16 +72,14 @@ private OtelSpanInfo descriptionForHttpMethod(
final @Nullable String httpTarget = attributes.get(HttpIncubatingAttributes.HTTP_TARGET);
final @Nullable String httpRoute = attributes.get(HttpAttributes.HTTP_ROUTE);
@Nullable String httpPath = httpRoute;
if (httpPath == null) {
httpPath = httpTarget;
if (httpPath == null && httpTarget != null) {
httpPath = UrlUtils.parse(httpTarget).getUrl();
}
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
21 changes: 19 additions & 2 deletions ...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 All @@ -132,7 +132,7 @@ class SpanDescriptionExtractorTest {
}

@Test
fun `uses HTTP_TARGET for description`() {
fun `uses HTTP_ROUTE over HTTP_TARGET for description`() {
givenSpanKind(SpanKind.SERVER)
givenAttributes(
mapOf(
Expand All @@ -150,6 +150,23 @@ class SpanDescriptionExtractorTest {
assertEquals(TransactionNameSource.ROUTE, info.transactionNameSource)
}

@Test
fun `removes query and fragment from HTTP_TARGET description`() {
givenSpanKind(SpanKind.SERVER)
givenAttributes(
mapOf(
HttpAttributes.HTTP_REQUEST_METHOD to "GET",
HttpIncubatingAttributes.HTTP_TARGET to "/checkout?page=1&token=secret#details",
)
)

val info = whenExtractingSpanInfo()

assertEquals("http.server", info.op)
assertEquals("GET /checkout", info.description)
assertEquals(TransactionNameSource.URL, info.transactionNameSource)
}

@Test
fun `uses span name as description fallback`() {
givenSpanKind(SpanKind.SERVER)
Expand Down
Loading