Skip to content
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

Merged
merged 5 commits into from
Oct 13, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove extra condition
Signed-off-by: Yuri Shkuro <github@ysh.us>
  • Loading branch information
yurishkuro committed Oct 13, 2020
commit aa4ffc4f781594f8a2659b3d8388aae7090c5239
3 changes: 1 addition & 2 deletions cmd/opentelemetry/app/defaultconfig/default_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/jaegertracing/jaeger/cmd/opentelemetry/app/exporter/memoryexporter"
jaegerresource "github.com/jaegertracing/jaeger/cmd/opentelemetry/app/processor/resourceprocessor"
"github.com/jaegertracing/jaeger/cmd/opentelemetry/app/receiver/kafkareceiver"
"github.com/jaegertracing/jaeger/ports"
)

const (
Expand Down Expand Up @@ -164,7 +163,7 @@ func createReceivers(component ComponentType, factories component.Factories) con
"otlp": factories.Receivers["otlp"].CreateDefaultConfig(),
}
zipkin := factories.Receivers["zipkin"].CreateDefaultConfig().(*zipkinreceiver.Config)
if zipkin.Endpoint != "" && zipkin.Endpoint != ports.PortToHostPort(0) {
if zipkin.Endpoint != "" {
recvs["zipkin"] = zipkin
}
return recvs
Expand Down