Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ async function captureErrorAndGetEnvelopeTraceHeader(page: Page): Promise<Partia

const [, errorEnvelopeTraceHeader] = (await errorEventPromise)[0];

// @ts-expect-error - EventEnvelopeHeaders type in (types/envelope.ts) suggests that trace_id is optional,
// which the DynamicSamplingContext type does not permit.
// TODO(v9): We should adjust the EventEnvelopeHeaders type because the trace header always needs to have a trace_id
return errorEnvelopeTraceHeader;
}
27 changes: 14 additions & 13 deletions packages/browser/src/transports/fetch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { clearCachedImplementation, getNativeImplementation } from '@sentry-internal/browser-utils';
import type { Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
import { createTransport, rejectedSyncPromise } from '@sentry/core';
import { createTransport, rejectedSyncPromise, suppressTracing } from '@sentry/core';
import type { WINDOW } from '../helpers';
import type { BrowserTransportOptions } from './types';

Expand Down Expand Up @@ -45,18 +45,19 @@ export function makeFetchTransport(
}

try {
// TODO: This may need a `suppressTracing` call in the future when we switch the browser SDK to OTEL
return nativeFetch(options.url, requestOptions).then(response => {
pendingBodySize -= requestSize;
pendingCount--;
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
});
return suppressTracing(() =>
nativeFetch(options.url, requestOptions).then(response => {
pendingBodySize -= requestSize;
pendingCount--;
return {
statusCode: response.status,
headers: {
'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),
'retry-after': response.headers.get('Retry-After'),
},
};
}),
);
} catch (e) {
clearCachedImplementation('fetch');
pendingBodySize -= requestSize;
Expand Down
Loading