Merge e0b8e94 into d5fd3b0

Author: adinauer

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

@@ -38,4 +38,9 @@ public Scope attach(Context toAttach) {
   public Context current() {
     return contextStorage.current();
   }
+
+  @Override
+  public Context root() {
+    return SentryContextWrapper.wrap(ContextStorage.super.root());
+  }
 }

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java

@@ -32,7 +32,7 @@ public <V> Context with(final @NotNull ContextKey<V> contextKey, V v) {
     if (isOpentelemetrySpan(contextKey)) {
       return forkCurrentScope(modifiedContext);
     } else {
-      return modifiedContext;
+      return new SentryContextWrapper(modifiedContext);
     }
   }