Use contexts instead of map on SentryTracer

Author: adinauer

sentry-android-core/last_crash

@@ -0,0 +1 @@
+2022-11-11T10:33:27.818Z

sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts

@@ -145,8 +145,8 @@ tasks {
             attributes.put("Premain-Class", "io.opentelemetry.javaagent.OpenTelemetryAgent")
             attributes.put("Can-Redefine-Classes", "true")
             attributes.put("Can-Retransform-Classes", "true")
-            attributes.put("Implementation-Vendor", "Demo")
-            attributes.put("Implementation-Version", "demo-${project.version}-otel-${Config.Libs.otelJavaagentVersion}")
+            attributes.put("Implementation-Vendor", "Sentry")
+            attributes.put("Implementation-Version", "sentry-${project.version}-otel-${Config.Libs.otelJavaagentVersion}")
         }
     }
 

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

@@ -1,5 +1,6 @@
 package io.sentry.opentelemetry;
 
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
@@ -183,8 +184,8 @@ private void updateTransactionWithOtelData(
     final @NotNull SpanData spanData = otelSpan.toSpanData();
     final @NotNull Map<String, Object> context = new HashMap<>();
 
-    context.put("attributes", spanData.getAttributes().asMap());
-    context.put("resource", spanData.getResource().getAttributes().asMap());
+    context.put("attributes", toMapWithStringKeys(spanData.getAttributes()));
+    context.put("resource", toMapWithStringKeys(spanData.getResource().getAttributes()));
 
     return context;
   }
@@ -233,4 +234,19 @@ private SpanStatus mapOtelStatus(final @NotNull ReadableSpan otelSpan) {
   private boolean hasSentryBeenInitialized() {
     return Sentry.isEnabled();
   }
+
+  private @NotNull Map<String, Object> toMapWithStringKeys(@Nullable Attributes attributes) {
+    @NotNull Map<String, Object> mapWithStringKeys = new HashMap<>();
+
+    if (attributes != null) {
+      attributes.forEach(
+          (key, value) -> {
+            if (key != null) {
+              mapWithStringKeys.put(key.getKey(), value);
+            }
+          });
+    }
+
+    return mapWithStringKeys;
+  }
 }

sentry/api/sentry.api

@@ -516,7 +516,7 @@ public abstract interface class io/sentry/ISpan {
 }
 
 public abstract interface class io/sentry/ITransaction : io/sentry/ISpan {
-	public abstract fun getContexts ()Ljava/util/Map;
+	public abstract fun getContexts ()Lio/sentry/protocol/Contexts;
 	public abstract fun getEventId ()Lio/sentry/protocol/SentryId;
 	public abstract fun getLatestActiveSpan ()Lio/sentry/Span;
 	public abstract fun getName ()Ljava/lang/String;
@@ -767,7 +767,7 @@ public final class io/sentry/NoOpTransaction : io/sentry/ITransaction {
 	public fun finish ()V
 	public fun finish (Lio/sentry/SpanStatus;)V
 	public fun finish (Lio/sentry/SpanStatus;Ljava/util/Date;)V
-	public fun getContexts ()Ljava/util/Map;
+	public fun getContexts ()Lio/sentry/protocol/Contexts;
 	public fun getData (Ljava/lang/String;)Ljava/lang/Object;
 	public fun getDescription ()Ljava/lang/String;
 	public fun getEventId ()Lio/sentry/protocol/SentryId;
@@ -1568,7 +1568,7 @@ public final class io/sentry/SentryTracer : io/sentry/ITransaction {
 	public fun finish (Lio/sentry/SpanStatus;)V
 	public fun finish (Lio/sentry/SpanStatus;Ljava/util/Date;)V
 	public fun getChildren ()Ljava/util/List;
-	public fun getContexts ()Ljava/util/Map;
+	public fun getContexts ()Lio/sentry/protocol/Contexts;
 	public fun getData ()Ljava/util/Map;
 	public fun getData (Ljava/lang/String;)Ljava/lang/Object;
 	public fun getDescription ()Ljava/lang/String;

sentry/src/main/java/io/sentry/ITransaction.java

@@ -1,9 +1,9 @@
 package io.sentry;
 
+import io.sentry.protocol.Contexts;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
 import java.util.List;
-import java.util.Map;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,5 +84,5 @@ public interface ITransaction extends ISpan {
 
   @ApiStatus.Internal
   @NotNull
-  Map<String, Object> getContexts();
+  Contexts getContexts();
 }

sentry/src/main/java/io/sentry/NoOpTransaction.java

@@ -1,12 +1,11 @@
 package io.sentry;
 
+import io.sentry.protocol.Contexts;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -186,7 +185,7 @@ public void setContext(@NotNull String key, @NotNull Object context) {}
 
   @ApiStatus.Internal
   @Override
-  public @NotNull Map<String, Object> getContexts() {
-    return new ConcurrentHashMap<>();
+  public @NotNull Contexts getContexts() {
+    return new Contexts();
   }
 }

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

@@ -1,5 +1,6 @@
 package io.sentry;
 
+import io.sentry.protocol.Contexts;
 import io.sentry.protocol.MeasurementValue;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.SentryTransaction;
@@ -78,7 +79,7 @@ public final class SentryTracer implements ITransaction {
   private @NotNull TransactionNameSource transactionNameSource;
   private final @NotNull Map<String, MeasurementValue> measurements;
   private final @NotNull Instrumenter instrumenter;
-  private final @NotNull Map<String, Object> contexts = new ConcurrentHashMap<>();
+  private final @NotNull Contexts contexts = new Contexts();
 
   public SentryTracer(final @NotNull TransactionContext context, final @NotNull IHub hub) {
     this(context, hub, null);
@@ -670,7 +671,7 @@ public void setContext(@NotNull String key, @NotNull Object context) {
 
   @ApiStatus.Internal
   @Override
-  public @NotNull Map<String, Object> getContexts() {
+  public @NotNull Contexts getContexts() {
     return contexts;
   }