diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-15 10:36:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 10:36:44 -0400 |
commit | 4fe573edfc47a42c7e587311adc21a49eac23424 (patch) | |
tree | 635b7d84cc4b5f60cbb8df9a89f32b0b589f2815 /vendor/github.com/uber/jaeger-client-go/config/config_env.go | |
parent | 230cd2525f110d507c1bf2195f04649f03218c8f (diff) | |
parent | ea75042fb3784654f5ae7a1c5bb68eda450a0798 (diff) | |
download | podman-4fe573edfc47a42c7e587311adc21a49eac23424.tar.gz podman-4fe573edfc47a42c7e587311adc21a49eac23424.tar.bz2 podman-4fe573edfc47a42c7e587311adc21a49eac23424.zip |
Merge pull request #6606 from containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.24.0incompatible
Bump github.com/uber/jaeger-client-go from 2.23.1+incompatible to 2.24.0+incompatible
Diffstat (limited to 'vendor/github.com/uber/jaeger-client-go/config/config_env.go')
-rw-r--r-- | vendor/github.com/uber/jaeger-client-go/config/config_env.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/vendor/github.com/uber/jaeger-client-go/config/config_env.go b/vendor/github.com/uber/jaeger-client-go/config/config_env.go index a729bd8fe..f38eb9d93 100644 --- a/vendor/github.com/uber/jaeger-client-go/config/config_env.go +++ b/vendor/github.com/uber/jaeger-client-go/config/config_env.go @@ -36,7 +36,8 @@ const ( envTags = "JAEGER_TAGS" envSamplerType = "JAEGER_SAMPLER_TYPE" envSamplerParam = "JAEGER_SAMPLER_PARAM" - envSamplerManagerHostPort = "JAEGER_SAMPLER_MANAGER_HOST_PORT" + envSamplerManagerHostPort = "JAEGER_SAMPLER_MANAGER_HOST_PORT" // Deprecated by envSamplingEndpoint + envSamplingEndpoint = "JAEGER_SAMPLING_ENDPOINT" envSamplerMaxOperations = "JAEGER_SAMPLER_MAX_OPERATIONS" envSamplerRefreshInterval = "JAEGER_SAMPLER_REFRESH_INTERVAL" envReporterMaxQueueSize = "JAEGER_REPORTER_MAX_QUEUE_SIZE" @@ -118,7 +119,9 @@ func (sc *SamplerConfig) samplerConfigFromEnv() (*SamplerConfig, error) { } } - if e := os.Getenv(envSamplerManagerHostPort); e != "" { + if e := os.Getenv(envSamplingEndpoint); e != "" { + sc.SamplingServerURL = e + } else if e := os.Getenv(envSamplerManagerHostPort); e != "" { sc.SamplingServerURL = e } else if e := os.Getenv(envAgentHost); e != "" { // Fallback if we know the agent host - try the sampling endpoint there @@ -184,20 +187,25 @@ func (rc *ReporterConfig) reporterConfigFromEnv() (*ReporterConfig, error) { rc.User = user rc.Password = pswd } else { + useEnv := false host := jaeger.DefaultUDPSpanServerHost if e := os.Getenv(envAgentHost); e != "" { host = e + useEnv = true } port := jaeger.DefaultUDPSpanServerPort if e := os.Getenv(envAgentPort); e != "" { if value, err := strconv.ParseInt(e, 10, 0); err == nil { port = int(value) + useEnv = true } else { return nil, errors.Wrapf(err, "cannot parse env var %s=%s", envAgentPort, e) } } - rc.LocalAgentHostPort = fmt.Sprintf("%s:%d", host, port) + if useEnv || rc.LocalAgentHostPort == "" { + rc.LocalAgentHostPort = fmt.Sprintf("%s:%d", host, port) + } } return rc, nil |