fix wrong context propagated to callback of traceContext and traceCon…

…textSync
Workiva · Oct 15, 2024 · 87ed449 · 87ed449
1 parent 9d7a386
commit 87ed449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/api.dart b/lib/api.dart
@@ -10,6 +10,7 @@ export 'src/api/context/context.dart'
         attach,
         Context,
         ContextKey,
+        contextFromZone,
         contextWithSpan,
         contextWithSpanContext,
         detach,

diff --git a/lib/src/api/open_telemetry.dart b/lib/src/api/open_telemetry.dart
@@ -48,7 +48,7 @@ Future<T> traceContext<T>(String name, Future<T> Function(api.Context) fn,
     bool newRoot = false,
     api.SpanKind spanKind = api.SpanKind.internal,
     List<api.SpanLink> spanLinks = const []}) async {
-  return trace(name, () => fn(context ?? api.active),
+  return trace(name, () => fn(api.contextFromZone()),
       context: context,
       tracer: tracer,
       newRoot: newRoot,
@@ -65,7 +65,7 @@ T traceContextSync<T>(String name, T Function(api.Context) fn,
     bool newRoot = false,
     api.SpanKind spanKind = api.SpanKind.internal,
     List<api.SpanLink> spanLinks = const []}) {
-  return traceSync(name, () => fn(context ?? api.active),
+  return traceSync(name, () => fn(api.contextFromZone()),
       context: context,
       tracer: tracer,
       newRoot: newRoot,