Portable http.Server integration#20779
Open
isaacs wants to merge 5 commits into
Open
Conversation
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit f1ac205. Configure here.
Contributor
size-limit report 📦
|
Platform-portable Connect tracing integration in `@sentry/core` (`patchConnectModule`, `setupConnectErrorHandler`), similar to portable Express integration, and rewire the Node SDK's Connect integration to call into it through the otel InstrumentationBase class. Remove OTel-specific span attribute fix-up. Spans created with correct origin (`auto.http.connect`) and op directly in the middleware.
Add platform-portable building blocks that server SDKs use to instrument incoming HTTP requests without depending on OTel HTTP instrumentation: - `getHttpServerSubscriptions`: diagnostics_channel listener for `http.server.request.start`, set up isolation scope, request data, trace continuation, optional body capture and request-session tracking - `getHttpServerSpanSubscriptions`: wrapper that creates the root server span around the request lifecycle, applying static-asset/status-code filtering, `ignoreIncomingRequests` and `onSpanCreated` hooks - `recordRequestSession`: release-health session aggregation per request - `patchRequestToCaptureBody`: opt-in incoming request body capture Add `kind` field on `StartSpanOptions` so OTel-based SDKs can set SpanKind on the underlying span, and update `headersToDict` to allow `number`-valued headers to support Node.js types.
Replace inline `instrumentServer` Proxy/emit-wrapping implementation in node-light's HTTP integration with core's `getHttpServerSubscriptions`, which does the same work (isolation scope, request data, body capture, trace continuation, best-effort transaction name). Centralized implementation lets Bun, Deno, Workers, and the OTel-based Node SDK share server-side primitives. Also drop `wrappedEmitFns` and the import of several core utilities that are now consumed via the subscriptions.
…erIntegration Replace inline `instrumentServer` Proxy/emit-wrapping in `httpServerIntegration.ts` with core's `getHttpServerSubscriptions`. OTel-specific concerns (header propagation, double-wrap context guard, `_startSpanCallback` dispatch) move into a `wrapServerEmitRequest` callback that `instrumentServer` invokes inside the per-request lifecycle. Re-export `recordRequestSession` from core so existing test continues to pass. Duplicated request-isolation/session/body-capture plumbing removed, logic now lives in `@sentry/core`'s subscription factory.
`patchRequestToCaptureBody` lives in `@sentry/core` now and both the light SDK and the OTel-based `httpServerIntegration` consume it from there.
isaacs
force-pushed
the
isaacschlueter/portable-http-integration-server
branch
from
f1ac205 to
2954cdc
Compare
JPeer264
reviewed
May 11, 2026
|
|
||
| // Ensure we also remove callbacks correctly | ||
| // eslint-disable-next-line @typescript-eslint/unbound-method | ||
| req.off = new Proxy(req.off, { |
Member
There was a problem hiding this comment.
I think I've never ever used double assignment in JavaScript. That's pretty clever
JPeer264
reviewed
May 11, 2026
Member
JPeer264
left a comment
JPeer264
left a comment
There was a problem hiding this comment.
Got couple of comments. Nice splitting.
| try { | ||
| const chunk = args[0] as Buffer | string; | ||
| const bufferifiedChunk = Buffer.from(chunk); | ||
| const bufferifiedChunk = Buffer.from(chunk as string); |
Member
There was a problem hiding this comment.
q: Is this type assertion needed?
| const callbackMap = new WeakMap(); | ||
|
|
||
| const maxBodySize = getMaxBodyByteLength(maxIncomingRequestBodySize); | ||
| const maxBodySize = |
Member
There was a problem hiding this comment.
m: Is there any reason why the function got moved to the previous behavior? Maybe it wasn't rebased yet when it got implemented.
| req: HttpIncomingMessage, | ||
| isolationScope: Scope, | ||
| maxIncomingRequestBodySize: Exclude<MaxRequestBodySize, 'none'>, | ||
| maxIncomingRequestBodySize: 'small' | 'medium' | 'always', |
Member
There was a problem hiding this comment.
m: Here the reusable type got removed any specific reason? Also here, maybe it wasn't rebased yet when it got implemented.
| await runner.completed(); | ||
| }); | ||
| }, | ||
| { failsOnEsm: true }, |
Member
There was a problem hiding this comment.
Absolutely amazing that this works now 🥇
| const name = `${method} ${httpTargetWithoutQueryFragment}`; | ||
| const headers = request.headers; | ||
| const userAgent = headers['user-agent']; | ||
| const ips = headers['x-forwarded-for']; |
Member
There was a problem hiding this comment.
l/m: I know this code has been here in some form already, but is it guaranteed that the headers are always lower case? Given that with HTTP1 you could still send X-Forwarded-For
|
|
||
| const INTEGRATION_NAME = 'Http.SentryServerSpans'; | ||
|
|
||
| export function getHttpServerSpanSubscriptions(options: HttpInstrumentationOptions): HttpServerSubscriptions { |
Member
There was a problem hiding this comment.
q: How is this supposed to be used? It is exported but not used - so I wonder how this fits into the bigger picture. It also has no e2e/integration/unit tests, but would it would be nice to have some for this.
I also wonder if it would be added as one of our integrations, as it has Http.SentryServerSpans as integration name, but then it wouldn't match the other exported integration names. I'm slightly confused on this.
| const timeout = setTimeout(() => { | ||
| DEBUG_BUILD && debug.log('Sending request session aggregate due to flushing schedule'); | ||
| flushPendingClientAggregates(); | ||
| }, sessionFlushingDelayMS).unref?.(); |
Member
There was a problem hiding this comment.
l: Since this line has been moved, you could change that to safeUnref from core, which takes case of that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Before submitting a pull request, please take a look at our
Contributing guidelines and verify:
yarn lint) & (yarn test).Closes #issue_link_here