diff --git a/cmd/virtual-kubelet/internal/commands/root/tracing_register_jaeger.go b/cmd/virtual-kubelet/internal/commands/root/tracing_register_jaeger.go index f23b56f34..3241d36dc 100644 --- a/cmd/virtual-kubelet/internal/commands/root/tracing_register_jaeger.go +++ b/cmd/virtual-kubelet/internal/commands/root/tracing_register_jaeger.go @@ -18,6 +18,7 @@ package root import ( "errors" + "fmt" "os" "contrib.go.opencensus.io/exporter/jaeger" @@ -31,17 +32,21 @@ func init() { // NewJaegerExporter creates a new opencensus tracing exporter. func NewJaegerExporter(opts TracingExporterOptions) (trace.Exporter, error) { jOpts := jaeger.Options{ - Endpoint: os.Getenv("JAEGER_ENDPOINT"), - AgentEndpoint: os.Getenv("JAEGER_AGENT_ENDPOINT"), - Username: os.Getenv("JAEGER_USER"), - Password: os.Getenv("JAEGER_PASSWORD"), + Endpoint: os.Getenv("JAEGER_ENDPOINT"), // deprecated + CollectorEndpoint: os.Getenv("JAEGER_COLLECTOR_ENDPOINT"), + AgentEndpoint: os.Getenv("JAEGER_AGENT_ENDPOINT"), + Username: os.Getenv("JAEGER_USER"), + Password: os.Getenv("JAEGER_PASSWORD"), Process: jaeger.Process{ ServiceName: opts.ServiceName, }, } - if jOpts.Endpoint == "" && jOpts.AgentEndpoint == "" { // nolint:staticcheck - return nil, errors.New("Must specify either JAEGER_ENDPOINT or JAEGER_AGENT_ENDPOINT") + if jOpts.Endpoint != "" && jOpts.CollectorEndpoint == "" { + jOpts.CollectorEndpoint = fmt.Sprintf("%s/api/traces", jOpts.Endpoint) + } + if jOpts.CollectorEndpoint == "" && jOpts.AgentEndpoint == "" { // nolint:staticcheck + return nil, errors.New("Must specify either JAEGER_COLLECTOR_ENDPOINT or JAEGER_AGENT_ENDPOINT") } for k, v := range opts.Tags {