diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-30 11:53:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-30 11:53:01 -0700 |
commit | 04b3a73635d8150138fab853ce8f2e6e60f6581d (patch) | |
tree | dbd35cb6a356029228ee880d3c18f7ad13c7e428 /vendor/github.com/uber/jaeger-client-go/config/config.go | |
parent | 79c18f134dbc985e6dce7bc88eea57a75b035c89 (diff) | |
parent | 2f397ecdeb1f5f064e30c3ab9bf85f5c10c41afa (diff) | |
download | podman-04b3a73635d8150138fab853ce8f2e6e60f6581d.tar.gz podman-04b3a73635d8150138fab853ce8f2e6e60f6581d.tar.bz2 podman-04b3a73635d8150138fab853ce8f2e6e60f6581d.zip |
Merge pull request #4145 from containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.19.0+incompatible
Bump github.com/uber/jaeger-client-go from 2.16.0+incompatible to 2.19.0+incompatible
Diffstat (limited to 'vendor/github.com/uber/jaeger-client-go/config/config.go')
-rw-r--r-- | vendor/github.com/uber/jaeger-client-go/config/config.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vendor/github.com/uber/jaeger-client-go/config/config.go b/vendor/github.com/uber/jaeger-client-go/config/config.go index 320125087..6bce1b3b0 100644 --- a/vendor/github.com/uber/jaeger-client-go/config/config.go +++ b/vendor/github.com/uber/jaeger-client-go/config/config.go @@ -181,13 +181,14 @@ func (c Configuration) New( // NewTracer returns a new tracer based on the current configuration, using the given options, // and a closer func that can be used to flush buffers before shutdown. func (c Configuration) NewTracer(options ...Option) (opentracing.Tracer, io.Closer, error) { + if c.Disabled { + return &opentracing.NoopTracer{}, &nullCloser{}, nil + } + if c.ServiceName == "" { return nil, nil, errors.New("no service name provided") } - if c.Disabled { - return &opentracing.NoopTracer{}, &nullCloser{}, nil - } opts := applyOptions(options...) tracerMetrics := jaeger.NewMetrics(opts.metrics, nil) if c.RPCMetrics { @@ -234,6 +235,7 @@ func (c Configuration) NewTracer(options ...Option) (opentracing.Tracer, io.Clos jaeger.TracerOptions.PoolSpans(opts.poolSpans), jaeger.TracerOptions.ZipkinSharedRPCSpan(opts.zipkinSharedRPCSpan), jaeger.TracerOptions.MaxTagValueLength(opts.maxTagValueLength), + jaeger.TracerOptions.NoDebugFlagOnForcedSampling(opts.noDebugFlagOnForcedSampling), } for _, tag := range opts.tags { |