TSH-18197 - Propagate trace context on websocket upgrade request (copy #8739)#8746
Merged
aaronArinder merged 5 commits intodevfrom Dec 10, 2025
Merged
TSH-18197 - Propagate trace context on websocket upgrade request (copy #8739)#8746aaronArinder merged 5 commits intodevfrom
aaronArinder merged 5 commits intodevfrom
Conversation
10 tasks
|
@mergify[bot]: Thank you for submitting a pull request! Before we can merge it, you'll need to sign the Apollo Contributor License Agreement here: https://contribute.apollographql.com/ |
✅ Docs preview has no changesThe preview was not built because there were no changes. Build ID: 73d12e7a2fae343f8ee470b9 |
Contributor
|
@theJC: tests passing locally, hopefully in circle too; the code's in a place for a business logic review now, and I plan on doing that tomorrow |
Contributor
|
@aaronArinder @theJC I added a comment here but that can be done in a follow up PR if needed |
aaronArinder
approved these changes
Dec 10, 2025
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
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.
TSH-18197
Router does not currently propagate the trace context for websocket connections. This is problematic and prevents important diagnostic and observability capabilities for Router subscriptions.
This simple PR adds propagation to the http request that is used to upgrade to websockets.
I have system tested this with Netflix DGS/Spring Boot based subgraphs with subscriptions instrumented with Datadog's dd-trace-java APM instrumentation library, and verified spans emanated from the subgraph for the subscription are now showing up and are associated with the trace.
Checklist
Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.
Exceptions
Note any exceptions here
Notes
This is an automatic copy of pull request #8739 done by [Mergify](https://mergify.com).
Footnotes
It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. ↩
Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩
A lot of (if not most) features benefit from built-in observability and
debug-level logs. Please read this guidance on metrics best-practices. ↩Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩