fix(tracing): Attach request instrumentation span to active span inst…

…ead of current transaction (#6778)
getsentry · Jan 16, 2023 · ed136de · ed136de
1 parent 8ffc57f
commit ed136de
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/packages/tracing/src/browser/request.ts b/packages/tracing/src/browser/request.ts
@@ -1,4 +1,5 @@
 /* eslint-disable max-lines */
+import { getCurrentHub } from '@sentry/core';
 import type { DynamicSamplingContext, Span } from '@sentry/types';
 import {
   addInstrumentationHandler,
@@ -8,7 +9,7 @@ import {
   stringMatchesSomePattern,
 } from '@sentry/utils';
 
-import { getActiveTransaction, hasTracingEnabled } from '../utils';
+import { hasTracingEnabled } from '../utils';
 
 export const DEFAULT_TRACE_PROPAGATION_TARGETS = ['localhost', /^\//];
 
@@ -186,9 +187,12 @@ export function fetchCallback(
     return;
   }
 
-  const activeTransaction = getActiveTransaction();
-  if (activeTransaction) {
-    const span = activeTransaction.startChild({
+  const currentScope = getCurrentHub().getScope();
+  const currentSpan = currentScope && currentScope.getSpan();
+  const activeTransaction = currentSpan && currentSpan.transaction;
+
+  if (currentSpan && activeTransaction) {
+    const span = currentSpan.startChild({
       data: {
         ...handlerData.fetchData,
         type: 'fetch',
@@ -320,10 +324,12 @@ export function xhrCallback(
     return;
   }
 
-  // if not, create a new span to track it
-  const activeTransaction = getActiveTransaction();
-  if (activeTransaction) {
-    const span = activeTransaction.startChild({
+  const currentScope = getCurrentHub().getScope();
+  const currentSpan = currentScope && currentScope.getSpan();
+  const activeTransaction = currentSpan && currentSpan.transaction;
+
+  if (currentSpan && activeTransaction) {
+    const span = currentSpan.startChild({
       data: {
         ...xhr.data,
         type: 'xhr',