From e68cd64ac5788e33cce4d8d512b542056562a635 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 26 Nov 2024 14:36:18 +0100 Subject: [PATCH 1/3] Support HTTP_METHOD and HTTP_REQUEST_METHOD for Otel Spans --- .../opentelemetry/SpanDescriptionExtractor.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java index 7b6a387433c..41ebc0c574e 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java @@ -21,16 +21,15 @@ public final class SpanDescriptionExtractor { if (!isInternalSpanKind(otelSpan)) { final @NotNull Attributes attributes = otelSpan.getAttributes(); - final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD); + final @Nullable String httpMethod = + attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) != null + ? attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) + : attributes.get(io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD); + if (httpMethod != null) { return descriptionForHttpMethod(otelSpan, httpMethod); } - final @Nullable String httpRequestMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD); - if (httpRequestMethod != null) { - return descriptionForHttpMethod(otelSpan, httpRequestMethod); - } - final @Nullable String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM); if (dbSystem != null) { return descriptionForDbSystem(otelSpan); From 523afad093173ecf802c843e132bebafcf09855a Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 26 Nov 2024 14:37:03 +0100 Subject: [PATCH 2/3] format --- .../io/sentry/opentelemetry/SpanDescriptionExtractor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java index 41ebc0c574e..09627afb50b 100644 --- a/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java +++ b/sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java @@ -22,9 +22,9 @@ public final class SpanDescriptionExtractor { final @NotNull Attributes attributes = otelSpan.getAttributes(); final @Nullable String httpMethod = - attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) != null - ? attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) - : attributes.get(io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD); + attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) != null + ? attributes.get(HttpAttributes.HTTP_REQUEST_METHOD) + : attributes.get(io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD); if (httpMethod != null) { return descriptionForHttpMethod(otelSpan, httpMethod); From 8a1a505a354d1c66bb41dda427a7b4e92bea1bb8 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 26 Nov 2024 14:48:44 +0100 Subject: [PATCH 3/3] add changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdbdbc0d7e2..465b31eca26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Features + +- Support HTTP_METHOD and HTTP_REQUEST_METHOD for Otel Spans ([#3930](https://github.com/getsentry/sentry-java/pull/3930)) + ## 8.0.0-beta.3 ### Features