Merge bde13a9 into 9cef931

getsentry · Nov 15, 2022 · 8baf861 · 8baf861
2 parents 9cef931 + bde13a9
commit 8baf861
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 6 deletions.
diff --git a/sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts b/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}")
         }
     }
 

diff --git a/.../sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java b/.../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;
@@ -176,16 +177,15 @@ private void updateTransactionWithOtelData(
         spanDescription.getDescription(), spanDescription.getTransactionNameSource());
 
     final @NotNull Map<String, Object> otelContext = toOtelContext(otelSpan);
-    System.out.println(otelContext);
-    // TODO set otel context on transaction
+    sentryTransaction.setContext("otel", otelContext);
   }
 
   private @NotNull Map<String, Object> toOtelContext(final @NotNull ReadableSpan otelSpan) {
     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;
   }
@@ -234,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;
+  }
 }
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -516,6 +516,7 @@ public abstract interface class io/sentry/ISpan {
 }
 
 public abstract interface class io/sentry/ITransaction : io/sentry/ISpan {
+	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;
@@ -525,6 +526,7 @@ public abstract interface class io/sentry/ITransaction : io/sentry/ISpan {
 	public abstract fun isProfileSampled ()Ljava/lang/Boolean;
 	public abstract fun isSampled ()Ljava/lang/Boolean;
 	public abstract fun scheduleFinish ()V
+	public abstract fun setContext (Ljava/lang/String;Ljava/lang/Object;)V
 	public abstract fun setName (Ljava/lang/String;)V
 	public abstract fun setName (Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
 }
@@ -765,6 +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 ()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;
@@ -783,6 +786,7 @@ public final class io/sentry/NoOpTransaction : io/sentry/ITransaction {
 	public fun isProfileSampled ()Ljava/lang/Boolean;
 	public fun isSampled ()Ljava/lang/Boolean;
 	public fun scheduleFinish ()V
+	public fun setContext (Ljava/lang/String;Ljava/lang/Object;)V
 	public fun setData (Ljava/lang/String;Ljava/lang/Object;)V
 	public fun setDescription (Ljava/lang/String;)V
 	public fun setMeasurement (Ljava/lang/String;Ljava/lang/Number;)V
@@ -1564,6 +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 ()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;
@@ -1585,6 +1590,7 @@ public final class io/sentry/SentryTracer : io/sentry/ITransaction {
 	public fun isProfileSampled ()Ljava/lang/Boolean;
 	public fun isSampled ()Ljava/lang/Boolean;
 	public fun scheduleFinish ()V
+	public fun setContext (Ljava/lang/String;Ljava/lang/Object;)V
 	public fun setData (Ljava/lang/String;Ljava/lang/Object;)V
 	public fun setDescription (Ljava/lang/String;)V
 	public fun setMeasurement (Ljava/lang/String;Ljava/lang/Number;)V

diff --git a/sentry/src/main/java/io/sentry/ITransaction.java b/sentry/src/main/java/io/sentry/ITransaction.java
@@ -1,5 +1,6 @@
 package io.sentry;
 
+import io.sentry.protocol.Contexts;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
 import java.util.List;
@@ -77,4 +78,11 @@ public interface ITransaction extends ISpan {
 
   /** Schedules when transaction should be automatically finished. */
   void scheduleFinish();
+
+  @ApiStatus.Internal
+  void setContext(@NotNull String key, @NotNull Object context);
+
+  @ApiStatus.Internal
+  @NotNull
+  Contexts getContexts();
 }
diff --git a/sentry/src/main/java/io/sentry/NoOpTransaction.java b/sentry/src/main/java/io/sentry/NoOpTransaction.java
@@ -1,5 +1,6 @@
 package io.sentry;
 
+import io.sentry.protocol.Contexts;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
 import java.util.Collections;
@@ -177,4 +178,14 @@ public void setMeasurement(@NotNull String name, @NotNull Number value) {}
   @Override
   public void setMeasurement(
       @NotNull String name, @NotNull Number value, @NotNull MeasurementUnit unit) {}
+
+  @ApiStatus.Internal
+  @Override
+  public void setContext(@NotNull String key, @NotNull Object context) {}
+
+  @ApiStatus.Internal
+  @Override
+  public @NotNull Contexts getContexts() {
+    return new Contexts();
+  }
 }
diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/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,6 +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 Contexts contexts = new Contexts();
 
   public SentryTracer(final @NotNull TransactionContext context, final @NotNull IHub hub) {
     this(context, hub, null);
@@ -661,6 +663,18 @@ Map<String, MeasurementValue> getMeasurements() {
     return measurements;
   }
 
+  @ApiStatus.Internal
+  @Override
+  public void setContext(@NotNull String key, @NotNull Object context) {
+    contexts.put(key, context);
+  }
+
+  @ApiStatus.Internal
+  @Override
+  public @NotNull Contexts getContexts() {
+    return contexts;
+  }
+
   private static final class FinishStatus {
     static final FinishStatus NOT_FINISHED = FinishStatus.notFinished();
 

diff --git a/sentry/src/main/java/io/sentry/protocol/SentryTransaction.java b/sentry/src/main/java/io/sentry/protocol/SentryTransaction.java
@@ -67,6 +67,9 @@ public SentryTransaction(final @NotNull SentryTracer sentryTracer) {
       }
     }
     final Contexts contexts = this.getContexts();
+
+    contexts.putAll(sentryTracer.getContexts());
+
     final SpanContext tracerContext = sentryTracer.getSpanContext();
     // tags must be placed on the root of the transaction instead of contexts.trace.tags
     contexts.setTrace(

diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
@@ -207,6 +207,31 @@ class SentryTracerTest {
         )
     }
 
+    @Test
+    fun `when transaction is finished, context is set`() {
+        val tracer = fixture.getSut()
+        val otelContext = mapOf(
+            "attributes" to mapOf(
+                "db.connection_string" to "hsqldb:mem:",
+                "db.statement" to "CREATE TABLE person ( id INTEGER IDENTITY PRIMARY KEY, firstName VARCHAR(?) NOT NULL, lastName VARCHAR(?) NOT NULL )"
+            ),
+            "resource" to mapOf(
+                "process.runtime.version" to "17.0.4.1+1",
+                "telemetry.auto.version" to "sentry-6.7.0-otel-1.19.2"
+            )
+        )
+        tracer.setContext("otel", otelContext)
+        tracer.finish()
+
+        verify(fixture.hub).captureTransaction(
+            check {
+                assertEquals(otelContext, it.contexts["otel"])
+            },
+            anyOrNull<TraceContext>(),
+            anyOrNull()
+        )
+    }
+
     @Test
     fun `returns sentry-trace header`() {
         val tracer = fixture.getSut()