From 85eebb9687a9072b43a86b734fe0fdc69be12607 Mon Sep 17 00:00:00 2001 From: Lukas Bloder Date: Tue, 9 Jul 2024 17:07:40 +0200 Subject: [PATCH 1/4] use otel span name if sentrySpan exists but description is null --- .../java/io/sentry/opentelemetry/SpanDescriptionExtractor.java | 2 ++ 1 file changed, 2 insertions(+) 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 5e2c07bbdc..a44ae0c11c 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 @@ -68,6 +68,8 @@ private OtelSpanInfo extractSpanDescription( final @NotNull String name = otelSpan.getName(); final @Nullable String description = sentrySpan != null ? sentrySpan.getDescription() : name; return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM); + final @Nullable String maybeDescription = sentrySpan != null ? sentrySpan.getDescription() : name; + final @NotNull String description = maybeDescription != null ? maybeDescription : name; } @SuppressWarnings("deprecation") From 760f78644255a94af3765a4544f4b8a2c986df3d Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Tue, 9 Jul 2024 15:17:21 +0000 Subject: [PATCH 2/4] Format code --- .../java/io/sentry/opentelemetry/SpanDescriptionExtractor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a44ae0c11c..73d3dcd251 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 @@ -68,7 +68,8 @@ private OtelSpanInfo extractSpanDescription( final @NotNull String name = otelSpan.getName(); final @Nullable String description = sentrySpan != null ? sentrySpan.getDescription() : name; return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM); - final @Nullable String maybeDescription = sentrySpan != null ? sentrySpan.getDescription() : name; + final @Nullable String maybeDescription = + sentrySpan != null ? sentrySpan.getDescription() : name; final @NotNull String description = maybeDescription != null ? maybeDescription : name; } From 3862eb056aa6ba8a239a0713e417906c1762d7c2 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 11 Jul 2024 09:44:04 +0200 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 891db9e314..f0dc7b60a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Unreleased + +### Fixes + +- Use OpenTelemetry span name as fallback for transaction name ([#3557](https://github.com/getsentry/sentry-java/pull/3557)) + - In certain cases we were sending transactions as "" when using OpenTelemetry + ## 8.0.0-alpha.4 ### Fixes From 29d199337576225db8086d632da066c74daf7d14 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 11 Jul 2024 09:56:16 +0200 Subject: [PATCH 4/4] fix build --- .../java/io/sentry/opentelemetry/SpanDescriptionExtractor.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 73d3dcd251..4f7e1a5e23 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 @@ -66,11 +66,10 @@ private OtelSpanInfo extractSpanDescription( } final @NotNull String name = otelSpan.getName(); - final @Nullable String description = sentrySpan != null ? sentrySpan.getDescription() : name; - return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM); final @Nullable String maybeDescription = sentrySpan != null ? sentrySpan.getDescription() : name; final @NotNull String description = maybeDescription != null ? maybeDescription : name; + return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM); } @SuppressWarnings("deprecation")