TSH-18197 - Propagate trace context on websocket upgrade request #8739
Closed
theJC wants to merge 4 commits intoapollographql:devfrom
Closed
TSH-18197 - Propagate trace context on websocket upgrade request #8739theJC wants to merge 4 commits intoapollographql:devfrom
theJC wants to merge 4 commits intoapollographql:devfrom
Conversation
theJC
changed the title
theJC
changed the title
Contributor
|
heyo @theJC, this is great; thank you! I'm going to fumble around a bit to see if I can't get mergify to copy this branch to the repo so I don't have to clone yours to review locally (as an explanation for the coming noise) |
Contributor
|
@mergify help |
Contributor
❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚. |
Contributor
|
@mergify copy dev |
Contributor
✅ Pull request copies have been createdDetails
|
10 tasks
Contributor
|
nice, that seems to have worked; I'll check it out and review/respond there, but you'll still get credit for the commit |
bnjjj
suggested changes
Dec 10, 2025
| ); | ||
|
|
||
| // Give the WebSocket connection time to complete the upgrade | ||
| tokio::time::sleep(Duration::from_millis(1000)).await; |
Contributor
There was a problem hiding this comment.
Instead of doing this, can we try to pass something like a channel wrapped in a tokio timeout to make sure it won't be flacky ?
Contributor
|
the mergify pr was merged; closing, thanks @theJC! |
Merged
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
3 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.
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
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. ↩