Skip to content

Commit 12600f5

Browse files
committed
add comment; use released version
1 parent 011bb9b commit 12600f5

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

buildSrc/src/main/java/Config.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ object Config {
151151
val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
152152

153153
object OpenTelemetry {
154-
val otelVersion = "1.36.0-SNAPSHOT"
154+
val otelVersion = "1.35.0"
155155
val otelAlphaVersion = "$otelVersion-alpha"
156-
val otelJavaagentVersion = "2.2.0-SNAPSHOT"
157-
val otelJavaagentAlphaVersion = "2.2.0-alpha-SNAPSHOT"
156+
val otelJavaagentVersion = "2.1.0"
157+
val otelJavaagentAlphaVersion = "2.1.0-alpha"
158158
val otelSemanticConvetionsVersion = "1.23.1-alpha"
159159

160160
val otelSdk = "io.opentelemetry:opentelemetry-sdk:$otelVersion"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public Scope attach(Context toAttach) {
2929
// or maybe shouldn't even to better align with OTEL
3030
// but since OTEL Context is immutable it doesn't have the same consequence for OTEL as for us
3131

32+
// TODO sometimes context has already gone through forking but is still an ArrayBaseContext
33+
// most likely due to OTEL bridging between agent and app
34+
3235
// incoming non sentry wrapped context that already has scopes in it
3336
if (toAttach instanceof SentryContextWrapper) {
3437
return contextStorage.attach(toAttach);

0 commit comments

Comments
 (0)