add comment; use released version

getsentry · Mar 8, 2024 · 12600f5 · 12600f5
1 parent 011bb9b
commit 12600f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -151,10 +151,10 @@ object Config {
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
 
         object OpenTelemetry {
-            val otelVersion = "1.36.0-SNAPSHOT"
+            val otelVersion = "1.35.0"
             val otelAlphaVersion = "$otelVersion-alpha"
-            val otelJavaagentVersion = "2.2.0-SNAPSHOT"
-            val otelJavaagentAlphaVersion = "2.2.0-alpha-SNAPSHOT"
+            val otelJavaagentVersion = "2.1.0"
+            val otelJavaagentAlphaVersion = "2.1.0-alpha"
             val otelSemanticConvetionsVersion = "1.23.1-alpha"
 
             val otelSdk = "io.opentelemetry:opentelemetry-sdk:$otelVersion"

diff --git a/sentry/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java b/sentry/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java
@@ -29,6 +29,9 @@ public Scope attach(Context toAttach) {
     // or maybe shouldn't even to better align with OTEL
     // but since OTEL Context is immutable it doesn't have the same consequence for OTEL as for us
 
+    // TODO sometimes context has already gone through forking but is still an ArrayBaseContext
+    // most likely due to OTEL bridging between agent and app
+
     // incoming non sentry wrapped context that already has scopes in it
     if (toAttach instanceof SentryContextWrapper) {
       return contextStorage.attach(toAttach);