d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #971 from champly/fix-jaeger-deprecated-config

Browse Source 
fix jaeger deprecated config
This commit is contained in:
Brian Goff
2021-05-19 14:31:11 -07:00
committed by GitHub
parent 5cd25230c5 50f1346977
commit e6fc00e8dd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/virtual-kubelet/internal/commands/root/tracing_register_jaeger.go
View File

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