added SpanContext.data ser/deser

Author: stefanosiano

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java

@@ -39,6 +39,11 @@ public boolean isMainThread() {
     return isMainThread(Thread.currentThread());
   }
 
+  @Override
+  public @NotNull String getCurrentThreadName() {
+    return isMainThread() ? "main" : Thread.currentThread().getName();
+  }
+
   @Override
   public boolean isMainThread(final @NotNull SentryThread sentryThread) {
     final Long threadId = sentryThread.getId();

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/AndroidThreadCheckerTest.kt

@@ -4,6 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.protocol.SentryThread
 import org.junit.runner.RunWith
 import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -44,4 +45,23 @@ class AndroidThreadCheckerTest {
         }
         assertFalse(AndroidThreadChecker.getInstance().isMainThread(sentryThread))
     }
+
+    @Test
+    fun `currentThreadName returns main when called on the main thread`() {
+        val thread = Thread.currentThread()
+        thread.name = "test"
+        assertEquals("main", AndroidThreadChecker.getInstance().currentThreadName)
+    }
+
+    @Test
+    fun `currentThreadName returns the name of the current thread`() {
+        var threadName = ""
+        val thread = Thread {
+            threadName = AndroidThreadChecker.getInstance().currentThreadName
+        }
+        thread.name = "test"
+        thread.start()
+        thread.join()
+        assertEquals("test", threadName)
+    }
 }

sentry-android-ndk/build.gradle.kts

@@ -71,8 +71,7 @@ dependencies {
     api(projects.sentry)
     api(projects.sentryAndroidCore)
 
-    //noinspection GradleDependency
-    implementation("io.sentry:sentry-native-ndk:0.7.5")
+    implementation("io.sentry:sentry-native-ndk:0.7.8")
 
     compileOnly(Config.CompileOnly.jetbrainsAnnotations)
 

sentry-android-sqlite/src/test/java/io/sentry/android/sqlite/SQLiteSpanManagerTest.kt

@@ -100,6 +100,7 @@ class SQLiteSpanManagerTest {
 
         fixture.options.threadChecker = mock<IThreadChecker>()
         whenever(fixture.options.threadChecker.isMainThread).thenReturn(false)
+        whenever(fixture.options.threadChecker.currentThreadName).thenReturn("test")
 
         sut.performSql("sql") {}
         val span = fixture.sentryTracer.children.first()
@@ -114,6 +115,7 @@ class SQLiteSpanManagerTest {
 
         fixture.options.threadChecker = mock<IThreadChecker>()
         whenever(fixture.options.threadChecker.isMainThread).thenReturn(true)
+        whenever(fixture.options.threadChecker.currentThreadName).thenReturn("test")
 
         sut.performSql("sql") {}
         val span = fixture.sentryTracer.children.first()

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/webflux/SentryWebFluxTracingFilterTest.kt

@@ -248,7 +248,7 @@ class SentryWebFluxTracingFilterTest {
             verify(fixture.chain).filter(fixture.exchange)
 
             verify(fixture.scopes, times(2)).isEnabled
-            verify(fixture.scopes, times(2)).options
+            verify(fixture.scopes, times(3)).options
             verify(fixture.scopes).continueTrace(anyOrNull(), anyOrNull())
             verify(fixture.scopes).addBreadcrumb(any<Breadcrumb>(), any<Hint>())
             verify(fixture.scopes).configureScope(any<ScopeCallback>())

sentry-spring/src/test/kotlin/io/sentry/spring/webflux/SentryWebFluxTracingFilterTest.kt

@@ -249,7 +249,7 @@ class SentryWebFluxTracingFilterTest {
             verify(fixture.chain).filter(fixture.exchange)
 
             verify(fixture.scopes).isEnabled
-            verify(fixture.scopes, times(2)).options
+            verify(fixture.scopes, times(3)).options
             verify(fixture.scopes).continueTrace(anyOrNull(), anyOrNull())
             verify(fixture.scopes).addBreadcrumb(any<Breadcrumb>(), any<Hint>())
             verify(fixture.scopes).configureScope(any<ScopeCallback>())

sentry/api/sentry.api

@@ -3581,6 +3581,7 @@ public class io/sentry/SpanContext : io/sentry/JsonSerializable, io/sentry/JsonU
 	public fun copyForChild (Ljava/lang/String;Lio/sentry/SpanId;Lio/sentry/SpanId;)Lio/sentry/SpanContext;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getBaggage ()Lio/sentry/Baggage;
+	public fun getData ()Ljava/util/Map;
 	public fun getDescription ()Ljava/lang/String;
 	public fun getInstrumenter ()Lio/sentry/Instrumenter;
 	public fun getOperation ()Ljava/lang/String;
@@ -3615,6 +3616,7 @@ public final class io/sentry/SpanContext$Deserializer : io/sentry/JsonDeserializ
 }
 
 public final class io/sentry/SpanContext$JsonKeys {
+	public static final field DATA Ljava/lang/String;
 	public static final field DESCRIPTION Ljava/lang/String;
 	public static final field OP Ljava/lang/String;
 	public static final field ORIGIN Ljava/lang/String;
@@ -6542,6 +6544,7 @@ public final class io/sentry/util/UrlUtils$UrlDetails {
 
 public abstract interface class io/sentry/util/thread/IThreadChecker {
 	public abstract fun currentThreadSystemId ()J
+	public abstract fun getCurrentThreadName ()Ljava/lang/String;
 	public abstract fun isMainThread ()Z
 	public abstract fun isMainThread (J)Z
 	public abstract fun isMainThread (Lio/sentry/protocol/SentryThread;)Z
@@ -6551,6 +6554,7 @@ public abstract interface class io/sentry/util/thread/IThreadChecker {
 public final class io/sentry/util/thread/NoOpThreadChecker : io/sentry/util/thread/IThreadChecker {
 	public fun <init> ()V
 	public fun currentThreadSystemId ()J
+	public fun getCurrentThreadName ()Ljava/lang/String;
 	public static fun getInstance ()Lio/sentry/util/thread/NoOpThreadChecker;
 	public fun isMainThread ()Z
 	public fun isMainThread (J)Z
@@ -6560,6 +6564,7 @@ public final class io/sentry/util/thread/NoOpThreadChecker : io/sentry/util/thre
 
 public final class io/sentry/util/thread/ThreadChecker : io/sentry/util/thread/IThreadChecker {
 	public fun currentThreadSystemId ()J
+	public fun getCurrentThreadName ()Ljava/lang/String;
 	public static fun getInstance ()Lio/sentry/util/thread/ThreadChecker;
 	public fun isMainThread ()Z
 	public fun isMainThread (J)Z

sentry/src/main/java/io/sentry/SentryTracer.java

@@ -7,6 +7,7 @@
 import io.sentry.protocol.TransactionNameSource;
 import io.sentry.util.Objects;
 import io.sentry.util.SpanUtils;
+import io.sentry.util.thread.IThreadChecker;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
@@ -518,17 +519,14 @@ private ISpan createChild(
       //                }
       //              });
       //      span.setDescription(description);
-      final long threadId = scopes.getOptions().getThreadChecker().currentThreadSystemId();
+      final @NotNull IThreadChecker threadChecker = scopes.getOptions().getThreadChecker();
       final SentryId profilerId = scopes.getOptions().getContinuousProfiler().getProfilerId();
       if (!profilerId.equals(SentryId.EMPTY_ID)) {
         span.setData(SpanDataConvention.PROFILER_ID, profilerId.toString());
       }
-      span.setData(SpanDataConvention.THREAD_ID, String.valueOf(threadId));
       span.setData(
-          SpanDataConvention.THREAD_NAME,
-          scopes.getOptions().getThreadChecker().isMainThread()
-              ? "main"
-              : Thread.currentThread().getName());
+          SpanDataConvention.THREAD_ID, String.valueOf(threadChecker.currentThreadSystemId()));
+      span.setData(SpanDataConvention.THREAD_NAME, threadChecker.getCurrentThreadName());
       this.children.add(span);
       if (compositePerformanceCollector != null) {
         compositePerformanceCollector.onSpanStarted(span);

sentry/src/main/java/io/sentry/SpanContext.java

@@ -1,9 +1,11 @@
 package io.sentry;
 
 import com.jakewharton.nopen.annotation.Open;
+import io.sentry.protocol.Request;
 import io.sentry.protocol.SentryId;
 import io.sentry.util.CollectionUtils;
 import io.sentry.util.Objects;
+import io.sentry.util.thread.IThreadChecker;
 import io.sentry.vendor.gson.stream.JsonToken;
 import java.io.IOException;
 import java.util.Map;
@@ -96,11 +98,12 @@ public SpanContext(
     this.description = description;
     this.status = status;
     this.origin = origin;
-    final long threadId =
-        ScopesAdapter.getInstance().getOptions().getThreadChecker().currentThreadSystemId();
+    final IThreadChecker threadChecker =
+        ScopesAdapter.getInstance().getOptions().getThreadChecker();
     this.data = new ConcurrentHashMap<>();
-    this.data.put(SpanDataConvention.THREAD_ID, String.valueOf(threadId));
-    this.data.put(SpanDataConvention.THREAD_NAME, Thread.currentThread().getName());
+    this.data.put(
+        SpanDataConvention.THREAD_ID, String.valueOf(threadChecker.currentThreadSystemId()));
+    this.data.put(SpanDataConvention.THREAD_NAME, threadChecker.getCurrentThreadName());
   }
 
   /**
@@ -235,6 +238,10 @@ public void setSamplingDecision(final @Nullable TracesSamplingDecision samplingD
     return origin;
   }
 
+  public @NotNull Map<String, Object> getData() {
+    return data;
+  }
+
   public void setOrigin(final @Nullable String origin) {
     this.origin = origin;
   }
@@ -296,6 +303,7 @@ public static final class JsonKeys {
     public static final String STATUS = "status";
     public static final String TAGS = "tags";
     public static final String ORIGIN = "origin";
+    public static final String DATA = "data";
   }
 
   @Override
@@ -320,6 +328,7 @@ public void serialize(final @NotNull ObjectWriter writer, final @NotNull ILogger
     if (origin != null) {
       writer.name(JsonKeys.ORIGIN).value(logger, origin);
     }
+    writer.name(JsonKeys.DATA).value(logger, data);
     if (!tags.isEmpty()) {
       writer.name(JsonKeys.TAGS).value(logger, tags);
     }
@@ -356,6 +365,7 @@ public static final class Deserializer implements JsonDeserializer<SpanContext>
       String description = null;
       SpanStatus status = null;
       String origin = null;
+      Map<String, Object> data = null;
       Map<String, String> tags = null;
 
       Map<String, Object> unknown = null;
@@ -383,6 +393,9 @@ public static final class Deserializer implements JsonDeserializer<SpanContext>
           case JsonKeys.ORIGIN:
             origin = reader.nextString();
             break;
+          case Request.JsonKeys.DATA:
+            data = (Map<String, Object>) reader.nextObjectOrNull();
+            break;
           case JsonKeys.TAGS:
             tags =
                 CollectionUtils.newConcurrentHashMap(
@@ -425,6 +438,9 @@ public static final class Deserializer implements JsonDeserializer<SpanContext>
       spanContext.setDescription(description);
       spanContext.setStatus(status);
       spanContext.setOrigin(origin);
+      if (data != null) {
+        spanContext.data.putAll(data);
+      }
       if (tags != null) {
         spanContext.tags = tags;
       }

sentry/src/main/java/io/sentry/protocol/SentryTransaction.java

@@ -81,7 +81,7 @@ public SentryTransaction(final @NotNull SentryTracer sentryTracer) {
 
     final SpanContext tracerContext = sentryTracer.getSpanContext();
     // tags must be placed on the root of the transaction instead of contexts.trace.tags
-    contexts.setTrace(
+    final @NotNull SpanContext traceContext =
         new SpanContext(
             tracerContext.getTraceId(),
             tracerContext.getSpanId(),
@@ -90,7 +90,9 @@ public SentryTransaction(final @NotNull SentryTracer sentryTracer) {
             tracerContext.getDescription(),
             tracerContext.getSamplingDecision(),
             tracerContext.getStatus(),
-            tracerContext.getOrigin()));
+            tracerContext.getOrigin());
+    traceContext.getData().putAll(tracerContext.getData());
+    contexts.setTrace(traceContext);
     for (final Map.Entry<String, String> tag : tracerContext.getTags().entrySet()) {
       this.setTag(tag.getKey(), tag.getValue());
     }