Skip to content
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

Jump to bottom

fix: Make it also work if someone passes request obj #2713

Merged
merged 1 commit into from Jul 1, 2020
Merged

fix: Make it also work if someone passes request obj #2713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 14 additions & 7 deletions packages/apm/src/integrations/tracing.ts
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import { Event, EventProcessor, Integration, Severity, Span, SpanContext, Transa
import {
addInstrumentationHandler,
getGlobalObject,
isInstanceOf,
isMatchingPattern,
logger,
safeJoin,
Expand Down Expand Up @@ -1019,18 +1020,24 @@ function fetchCallback(handlerData: { [key: string]: any }): void {
if (activity) {
const span = activity.span;
if (span) {
const request = (handlerData.args[0] = handlerData.args[0] as string | Request);
const options = (handlerData.args[1] = (handlerData.args[1] as { [key: string]: any }) || {});
if (options.headers) {
if (typeof options.headers.append === 'function') {
options.headers.append('sentry-trace', span.toTraceparent());
} else if (Array.isArray(options.headers)) {
options.headers = [...options.headers, ['sentry-trace', span.toTraceparent()]];
let headers = options.headers;
if (isInstanceOf(request, Request)) {
headers = (request as Request).headers;
}
if (headers) {
if (typeof headers.append === 'function') {
headers.append('sentry-trace', span.toTraceparent());
} else if (Array.isArray(headers)) {
headers = [...headers, ['sentry-trace', span.toTraceparent()]];
} else {
options.headers = { ...options.headers, 'sentry-trace': span.toTraceparent() };
headers = { ...headers, 'sentry-trace': span.toTraceparent() };
}
} else {
options.headers = { 'sentry-trace': span.toTraceparent() };
headers = { 'sentry-trace': span.toTraceparent() };
}
options.headers = headers;
}
}
}
Expand Down