Skip to content

fix(tracing): Attach request instrumentation span to active span instead of current transaction #6778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lforst merged 3 commits into from
Jan 16, 2023
Merged

fix(tracing): Attach request instrumentation span to active span instead of current transaction #6778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76bd029
fix(tracing): Attach request instrumentation span to active span inst…
Jan 14, 2023
e56c6b8
Short circuit
Jan 16, 2023
ad0eba3
Merge remote-tracking branch 'origin/master' into lforst-attach-reque…
Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions packages/tracing/src/browser/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable max-lines */
import { getCurrentHub } from '@sentry/core';
import type { DynamicSamplingContext, Span } from '@sentry/types';
import {
addInstrumentationHandler,
Expand All @@ -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', /^\//];

Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down