Skip to content

fix(node): support undici headers as strings or arrays #10938

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
merged 1 commit into from
Mar 7, 2024
Merged

fix(node): support undici headers as strings or arrays #10938

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/node/src/integrations/undici/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,13 @@ function setHeadersOnRequest(
sentryTrace: string,
sentryBaggageHeader: string | undefined,
): void {
const headerLines = request.headers.split('\r\n');
const hasSentryHeaders = headerLines.some(headerLine => headerLine.startsWith('sentry-trace:'));
let hasSentryHeaders: boolean;
if (Array.isArray(request.headers)) {
hasSentryHeaders = request.headers.some(headerLine => headerLine === 'sentry-trace');
} else {
const headerLines = request.headers.split('\r\n');
hasSentryHeaders = headerLines.some(headerLine => headerLine.startsWith('sentry-trace:'));
}

if (hasSentryHeaders) {
return;
Expand Down
4 changes: 3 additions & 1 deletion packages/node/src/integrations/undici/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ export interface UndiciRequest {
// Originally was Dispatcher.HttpMethod, but did not want to vendor that in.
method?: string;
path: string;
headers: string;
// string for undici@<=6.6.2 and string[] for undici@>=6.7.0.
// see for more information: https://github.com/getsentry/sentry-javascript/issues/10936
headers: string | string[];
addHeader(key: string, value: string): RequestWithSentry;
}

Expand Down