Skip to content

ref(node): Remove two Node <20 leftovers (hrtime.bigint, undici channel refs) #24183

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
chargome merged 1 commit into from
Sep 7, 2026
+7 −10
Merged

ref(node): Remove two Node <20 leftovers (hrtime.bigint, undici channel refs) #24183

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
8 changes: 3 additions & 5 deletions packages/node/src/integrations/anr/worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,14 @@ if (options.captureStackTrace) {
}

function createHrTimer(): { getTimeMs: () => number; reset: VoidFunction } {
// TODO (v8): We can use process.hrtime.bigint() after we drop node v8
let lastPoll = process.hrtime();
let lastPoll = process.hrtime.bigint();

return {
getTimeMs: (): number => {
const [seconds, nanoSeconds] = process.hrtime(lastPoll);
return Math.floor(seconds * 1e3 + nanoSeconds / 1e6);
return Number((process.hrtime.bigint() - lastPoll) / 1_000_000n);
},
reset: (): void => {
lastPoll = process.hrtime();
lastPoll = process.hrtime.bigint();
},
};
}
Expand Down
9 changes: 4 additions & 5 deletions packages/node/src/integrations/node-fetch/undici-instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ import type {
// `http.request.method_original` is not part of `@sentry/conventions`, so we keep it inline.
const ATTR_HTTP_REQUEST_METHOD_ORIGINAL = 'http.request.method_original';

// Keep ref to avoid https://github.com/nodejs/node/issues/42170 bug
// We can replace this with _isInstrumented once we drop support for Node.js 18.18.0
const _channelSubs: Array<unknown> = [];
let _isInstrumented = false;
const spanFromReq = new WeakMap<UndiciRequest, Span>();
// Whether breadcrumbs (and span-less trace propagation) should be skipped for a given request.
// We evaluate this at request-creation time because the active context is no longer correct by the
Expand All @@ -101,9 +99,10 @@ const propagationDecisionMap = new LRUMap<string, boolean>(100);
*/
export function instrumentUndici(config: NodeFetchOptions = {}): void {
// Avoid duplicate subscriptions
if (_channelSubs.length) {
if (_isInstrumented) {
return;
}
_isInstrumented = true;

subscribeToChannel('undici:request:create', message => onRequestCreated(config, message as RequestMessage));
subscribeToChannel('undici:client:sendHeaders', message =>
Expand All @@ -118,7 +117,7 @@ function subscribeToChannel(
diagnosticChannel: string,
onMessage: (message: unknown, name: string | symbol) => void,
): void {
_channelSubs.push(diagch.subscribe?.(diagnosticChannel, onMessage));
diagch.subscribe?.(diagnosticChannel, onMessage);
}

function parseRequestHeaders(request: UndiciRequest): Map<string, string | string[]> {
Expand Down
Loading