Skip to content

feat(server-utils): Rewrite @opentelemetry/instrumentation-hapi to orchestrion - #21866

Merged
chargome merged 5 commits into
developfrom
charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion
Jul 7, 2026
Merged

feat(server-utils): Rewrite @opentelemetry/instrumentation-hapi to orchestrion#21866
chargome merged 5 commits into
developfrom
charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion

Conversation

@chargome

@chargomechargome commented Jun 30, 2026•
edited
Loading

Copy link
Copy Markdown
Member
  • Adds hapiChannelIntegration in @sentry/server-utils for injecting orchestrion channels
  • A start-only subscriber swaps route handlers / ext methods
  • Span-building helpers are ported OTel-free into hapi-utils.ts / hapi-types.ts (structural types, no @hapi/* runtime dep), HTTP attribute keys come from @sentry/conventions/attributes.

closes#20753

@chargomechargome self-assigned this Jun 30, 2026
@linear-code

linear-codeBot commented Jun 30, 2026

Copy link
Copy Markdown

JS-2404

@chargomechargome changed the title feat(server-utils): Rewrite @opentelemetry/instrumentation-hapi to orchestrionfeat(server-utils): Rewrite @opentelemetry/instrumentation-hapi to orchestrionJun 30, 2026
@chargome

chargome commented Jun 30, 2026

Copy link
Copy Markdown
MemberAuthor

bugbot run

cursor[bot]
cursorBot reviewed Jun 30, 2026
View reviewed changes
Comment threadpackages/server-utils/src/integrations/tracing-channel/hapi-utils.ts
@chargome

chargome commented Jun 30, 2026

Copy link
Copy Markdown
MemberAuthor

bugbot run

cursor[bot]
cursorBot reviewed Jun 30, 2026
View reviewed changes

@cursorcursorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

Reviewed by Cursor Bugbot for commit 993f38b. Configure here.

@chargome
chargomeforce-pushed the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch from 993f38b to fadc582CompareJuly 1, 2026 10:30
@chargome
chargome marked this pull request as ready for review July 1, 2026 12:20
@chargome
chargome requested a review from a team as a code ownerJuly 1, 2026 12:20
@chargome
chargome requested review from JPeer264, andreiborza and mydea and removed request for a teamJuly 1, 2026 12:20
@nicohrubec
nicohrubec self-requested a review July 1, 2026 12:24
@chargome
chargomeforce-pushed the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch from 93210f8 to 3a69cebCompareJuly 2, 2026 13:05
sentry[bot]
sentryBot reviewed Jul 2, 2026
View reviewed changes
Comment threadpackages/server-utils/src/integrations/tracing-channel/hapi-utils.ts
@chargome
chargomeforce-pushed the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch from 3a69ceb to 2ccdbe7CompareJuly 3, 2026 08:06
sentry[bot]
sentryBot reviewed Jul 3, 2026
View reviewed changes
Comment threadpackages/server-utils/src/integrations/tracing-channel/hapi-utils.ts
@chargome
chargomeforce-pushed the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch 2 times, most recently from fdcef3c to f4078e9CompareJuly 3, 2026 08:52
chargomeand others added 5 commits July 6, 2026 10:17
@chargome
wip
67017d6
@chargome
guard
22756a4
@chargome
conventions
5f6f3a4
@chargome
.
cec717d
@chargome@claude
test(node): Adapt hapi integration test to orchestrion auto-run
931c07a
Rely on `createEsmAndCjsTests` auto-running the suite with orchestrion on
CI (#21911) instead of a manual instrument matrix: drop
`instrument-orchestrion.mjs` and branch the expected span origin on
`isOrchestrionEnabled()`.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@chargome
chargomeforce-pushed the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch from f4078e9 to 931c07aCompareJuly 6, 2026 08:20
sentry[bot]
sentryBot reviewed Jul 6, 2026
View reviewed changes
Comment threadpackages/server-utils/src/integrations/tracing-channel/hapi-utils.ts
@github-actions

github-actionsBot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

👋 @mydea, @JPeer264, @nicohrubec, @andreiborza — Please review this PR when you get a chance!

@chargome
chargome merged commit 5e48cb0 into developJul 7, 2026
201 checks passed
@chargome
chargome deleted the charlygomez/js-2404-rewrite-opentelemetryinstrumentation-hapi-to-orchestrion branch July 7, 2026 09:05
@sentry-release-botsentry-release-botBot mentioned this pull request Jul 7, 2026
Closed
49 tasks
@github-actionsgithub-actionsBot mentioned this pull request Jul 7, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sentrysentry[bot]sentry[bot] left review comments
@cursorcursor[bot]cursor[bot] left review comments
@JPeer264JPeer264JPeer264 approved these changes
@mydeamydeaAwaiting requested review from mydeamydea is a code owner automatically assigned from getsentry/team-javascript-sdks-server
@andreiborzaandreiborzaAwaiting requested review from andreiborzaandreiborza is a code owner automatically assigned from getsentry/team-javascript-sdks-server
@nicohrubecnicohrubecAwaiting requested review from nicohrubec

Assignees

@chargomechargome

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Rewrite @opentelemetry/instrumentation-hapi to orchestrion

2 participants

@chargome@JPeer264