Merge branch '8.x.x' into feat/okhttp-removal

Author: stefanosiano

CHANGELOG.md

@@ -7,6 +7,11 @@
 - Change OkHttp sub-spans to span attributes ([#3556](https://github.com/getsentry/sentry-java/pull/3556))
  - This will reduce the number of spans created by the SDK
 
+### 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 "<unlabeled transaction>" when using OpenTelemetry 
+
 ## 8.0.0-alpha.4
 
 ### Fixes

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java

@@ -66,7 +66,9 @@ private OtelSpanInfo extractSpanDescription(
  }
 
  final @NotNull String name = otelSpan.getName();
- final @Nullable String description = sentrySpan != null ? sentrySpan.getDescription() : name;
+ final @Nullable String maybeDescription =
+ sentrySpan != null ? sentrySpan.getDescription() : name;
+ final @NotNull String description = maybeDescription != null ? maybeDescription : name;
  return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM);
  }