Fix Zipkin receiver keep-alive flag not being applied to HTTP server #7389
Conversation
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
Signed-off-by: Parship Chowdhury <[email protected]>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #7389 +/- ##
==========================================
- Coverage 96.44% 96.44% -0.01%
==========================================
Files 375 375
Lines 22871 22922 +51
==========================================
+ Hits 22058 22106 +48
- Misses 615 617 +2
- Partials 198 199 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Parship Chowdhury <[email protected]>
Signed-off-by: Parship Chowdhury <[email protected]>
Signed-off-by: Parship Chowdhury <[email protected]>
|
@yurishkuro could you please take a look and let me know if the approach seems correct? |
yurishkuro
reviewed
Jul 29, 2025
| return errors.New("receiver is nil") | ||
| } | ||
|
|
||
| receiverValue := reflect.ValueOf(w.Traces) |
There was a problem hiding this comment.
it seems like you're trying to unwrap the zipkin receiver internals and set a flag. Why not just create a PR in OTEL contrib to expose the keepalive (assuming it's not exposed now)?
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.
Which problem is this PR solving?
Description of the changes
Issue is the
--collector.zipkin.keep-aliveflag was not being applied to the HTTP server created by the OpenTelemetry Zipkin receiver. While the flag existed in the collector configuration (options.Zipkin.KeepAlive), it was never used to control the actual HTTP server's keep alive behavior.Root Cause:
confighttp.ServerConfig.ToServer(), but theKeepAlivesetting from Jaeger's configuration was stored separately and never applied to the server.My solution:
zipkinReceiverWrapperthat wraps the OpenTelemetry Zipkin receiver--collector.zipkin.keep-alive=false, the wrapper callsSetKeepAlivesEnabled(false)on the HTTP server--collector.zipkin.keep-alive=true(default) then no action takes place and keep alive remains enabledImplementation:
serverfield in the OpenTelemetry zipkin receiver*http.Serverhttp.Server.SetKeepAlivesEnabled()How was this change tested?
TestZipkinReceiverKeepAlivethat verifies the wrapper correctly applies keep-alive settings--collector.zipkin.keep-alive=falseand--collector.zipkin.keep-alive=truekeep-alive=false: HTTP responses includeconnection: closekeep-alive=true: HTTP connections are kept alive (noconnection: closeheader)curl -vto see the HTTP connection behaviorChecklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test