-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Disable Zipkin server if port/address is not configured #2554
Disable Zipkin server if port/address is not configured #2554
Conversation
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will break at least two things in the otel collector/agent. I can review after this is merged and provide a PR if that's easiest.
This test will need to be corrected to the new value:
https://github.com/jaegertracing/jaeger/blob/master/cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver_test.go#L42
This check will need to updated to the new default:
https://github.com/jaegertracing/jaeger/blob/master/cmd/opentelemetry/app/defaultconfig/default_config.go#L167
Codecov Report
@@ Coverage Diff @@
## master #2554 +/- ##
==========================================
- Coverage 95.36% 95.34% -0.03%
==========================================
Files 208 208
Lines 9251 9254 +3
==========================================
+ Hits 8822 8823 +1
- Misses 353 354 +1
- Partials 76 77 +1
Continue to review full report at Codecov.
|
Hold on, how is it that you're saying tests will need to be fixed but they are not failing in the CI? Are we not running them at all in travis? |
Signed-off-by: Yuri Shkuro <[email protected]>
Added a fix to invoke OTEL tests from |
Signed-off-by: Yuri Shkuro <[email protected]>
Confirmed that OTEL tests are now running and failing with this change (https://travis-ci.org/github/jaegertracing/jaeger/jobs/735111015), so fixed it by changing how GetAddressFromCLIOptions works. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: This line
could be simplified to:
if zipkin.Endpoint != "" {
Other than that, looks good to me.
Signed-off-by: Yuri Shkuro <[email protected]>
In the past Zipkin server would not be started if the port was not configured, but not it's always started.
test-ci
(without coverage)ports.GetAddressFromCLIOptions()
to return empty string whenport=0 && hostPort=""
(previously it was returning":"
, which didn't make sense, it's better to return default value for string when no parts of the address are specified)With this change: