improve

Author: lcian

sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api

@@ -50,6 +50,11 @@ public final class io/sentry/opentelemetry/OtelSpanInfo {
 	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
 }
 
+public final class io/sentry/opentelemetry/OtelSpanUtils {
+	public fun <init> ()V
+	public static fun maybeTransferOtelAttribute (Lio/opentelemetry/sdk/trace/data/SpanData;Lio/sentry/ISpan;Lio/opentelemetry/api/common/AttributeKey;)V
+}
+
 public final class io/sentry/opentelemetry/OtelSpanWrapper : io/sentry/opentelemetry/IOtelSpanWrapper {
 	public fun <init> (Lio/opentelemetry/sdk/trace/ReadWriteSpan;Lio/sentry/IScopes;Lio/sentry/SentryDate;Lio/sentry/TracesSamplingDecision;Lio/sentry/opentelemetry/IOtelSpanWrapper;Lio/sentry/SpanId;Lio/sentry/Baggage;)V
 	public fun finish ()V

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

@@ -0,0 +1,19 @@
+package io.sentry.opentelemetry;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.sentry.ISpan;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class OtelSpanUtils {
+  public static <T> void maybeTransferOtelAttribute(
+    final @NotNull SpanData otelSpan, final @NotNull ISpan sentrySpan, final @NotNull AttributeKey<T> key) {
+    final @NotNull Attributes attributes = otelSpan.getAttributes();
+    final @Nullable T value = attributes.get(key);
+    if (value != null) {
+      sentrySpan.setData(key.getKey(), value);
+    }
+  }
+}

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

@@ -3,6 +3,7 @@
 import static io.sentry.TransactionContext.DEFAULT_TRANSACTION_NAME;
 import static io.sentry.opentelemetry.InternalSemanticAttributes.IS_REMOTE_PARENT;
 import static io.sentry.opentelemetry.OtelInternalSpanDetectionUtil.isSentryRequest;
+import static io.sentry.opentelemetry.OtelSpanUtils.maybeTransferOtelAttribute;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.StatusCode;
@@ -340,7 +341,9 @@ private void transferSpanDetails(
     setOtelInstrumentationInfo(span, sentryTransaction);
     setOtelSpanKind(span, sentryTransaction);
     transferSpanDetails(sentrySpanMaybe, sentryTransaction);
-    maybeTransferOtelThreadAttributes(span, sentryTransaction);
+
+    maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_ID);
+    maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_NAME);
 
     scopesToUse.configureScope(
         ScopeType.CURRENT,
@@ -349,19 +352,6 @@ private void transferSpanDetails(
     return sentryTransaction;
   }
 
-  private void maybeTransferOtelThreadAttributes(
-      final @NotNull SpanData span, final @NotNull ITransaction sentryTransaction) {
-    final @NotNull Attributes attributes = span.getAttributes();
-    final @Nullable Long threadId = attributes.get(ThreadIncubatingAttributes.THREAD_ID);
-    if (threadId != null) {
-      sentryTransaction.setData(ThreadIncubatingAttributes.THREAD_ID.getKey(), threadId);
-    }
-    final @Nullable String threadName = attributes.get(ThreadIncubatingAttributes.THREAD_NAME);
-    if (threadName != null) {
-      sentryTransaction.setData(ThreadIncubatingAttributes.THREAD_NAME.getKey(), threadName);
-    }
-  }
-
   private List<SpanNode> findCompletedRootNodes(final @NotNull List<SpanNode> grouped) {
     final @NotNull Predicate<SpanNode> isRootPredicate =
         (node) -> {

sentry/src/main/java/io/sentry/opentelemetry/OpenTelemetryUtil.java

@@ -1,16 +1,14 @@
 package io.sentry.opentelemetry;
 
-import io.sentry.NoOpLogger;
-import io.sentry.SentryLevel;
-import io.sentry.SentryOpenTelemetryMode;
-import io.sentry.SentryOptions;
+import io.sentry.*;
 import io.sentry.util.LoadClass;
 import io.sentry.util.Platform;
 import io.sentry.util.SpanUtils;
 import java.util.Collections;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 @ApiStatus.Internal
 public final class OpenTelemetryUtil {