Handle scenario where span exists outside the context of a trace.

firebase · Jun 3, 2024 · d1feee3 · d1feee3
1 parent ab3bf0c
commit d1feee3
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/js/core/src/tracing/instrumentation.ts b/js/core/src/tracing/instrumentation.ts
@@ -99,13 +99,13 @@ export async function runInNewSpan<T>(
 
         opts.metadata.path = decoratePathWithSubtype(opts.metadata);
         if (pathCount == getCurrentPathCount()) {
-          getCurrentTrace().paths?.add(opts.metadata.path);
+          traceMetadataAls.getStore()?.paths?.add(opts.metadata.path);
         }
 
         return output;
       } catch (e) {
         opts.metadata.path = decoratePathWithSubtype(opts.metadata);
-        getCurrentTrace().paths?.add(opts.metadata.path);
+        traceMetadataAls.getStore()?.paths?.add(opts.metadata.path);
         opts.metadata.state = 'error';
         otSpan.setStatus({
           code: SpanStatusCode.ERROR,
@@ -188,16 +188,8 @@ function getCurrentSpan(): SpanMetadata {
   return step;
 }
 
-function getCurrentTrace(): TraceMetadata {
-  const trace = traceMetadataAls.getStore();
-  if (!trace) {
-    throw new Error('running outside trace context');
-  }
-  return trace;
-}
-
 function getCurrentPathCount(): number {
-  return getCurrentTrace().paths?.size || 0;
+  return traceMetadataAls.getStore()?.paths?.size || 0;
 }
 
 function decoratePathWithSubtype(metadata: SpanMetadata): string {