Skip to content

ref(tracing): Improve bundle size in request.ts #4306

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

Closed
wants to merge 2 commits into from
Closed

ref(tracing): Improve bundle size in request.ts #4306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be3d81
ref(tracing): Improve bundle size in request.ts
AbhiPrasad Dec 15, 2021
e1f20f7
Merge branch 'master' into abhi-request-cleanup
AbhiPrasad Dec 15, 2021
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
50 changes: 26 additions & 24 deletions packages/tracing/src/browser/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,9 @@ export function fetchCallback(
return;
}

if (handlerData.endTimestamp && handlerData.fetchData.__span) {
const span = spans[handlerData.fetchData.__span];
const fetchData = handlerData.fetchData;
if (handlerData.endTimestamp && fetchData.__span) {
const span = spans[fetchData.__span];
if (span) {
if (handlerData.response) {
// TODO (kmclb) remove this once types PR goes through
Expand All @@ -161,7 +162,7 @@ export function fetchCallback(
span.finish();

// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete spans[handlerData.fetchData.__span];
delete spans[fetchData.__span];
}
return;
}
Expand All @@ -170,38 +171,39 @@ export function fetchCallback(
if (activeTransaction) {
const span = activeTransaction.startChild({
data: {
...handlerData.fetchData,
...fetchData,
type: 'fetch',
},
description: `${handlerData.fetchData.method} ${handlerData.fetchData.url}`,
description: `${fetchData.method} ${fetchData.url}`,
op: 'http.client',
});

handlerData.fetchData.__span = span.spanId;
fetchData.__span = span.spanId;
spans[span.spanId] = span;

const request = (handlerData.args[0] = handlerData.args[0] as string | Request);
const args = handlerData.args;
const request = args[0] as string | Request;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const options = (handlerData.args[1] = (handlerData.args[1] as { [key: string]: any }) || {});
let headers = options.headers;
if (isInstanceOf(request, Request)) {
headers = (request as Request).headers;
}
if (headers) {
const options = (args[1] as { [key: string]: any }) || {};
const traceparent = span.toTraceparent();
options.headers = getFetchHeaders(options.headers, request, traceparent);
}
}

// eslint-disable-next-line no-inner-declarations
function getFetchHeaders(optionHeaders: any, request: string | Request, traceparent: string): any {
Copy link
Member Author

@AbhiPrasad AbhiPrasad Dec 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The typing here generally sucks - but that is another problem

const headers = isInstanceOf(request, Request) ? (request as Request).headers : optionHeaders;
if (headers) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (typeof headers.append === 'function') {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (typeof headers.append === 'function') {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
headers.append('sentry-trace', span.toTraceparent());
} else if (Array.isArray(headers)) {
headers = [...headers, ['sentry-trace', span.toTraceparent()]];
} else {
headers = { ...headers, 'sentry-trace': span.toTraceparent() };
}
} else {
headers = { 'sentry-trace': span.toTraceparent() };
headers.append('sentry-trace', traceparent);
} else if (Array.isArray(headers)) {
return [...headers, ['sentry-trace', traceparent]];
}
options.headers = headers;
return { ...headers, 'sentry-trace': traceparent };
}
return { 'sentry-trace': traceparent };
}

/**
Expand Down