diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-16 17:18:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:18:10 -0400 |
| commit | 0bd51819428e402599f681f273947c805f4641cf (patch) | |
| tree | 094a16e8ad451916a5d9d7cb86f2788dd293ef71 /vendor/github.com/uber/jaeger-client-go/span_context.go | |
| parent | 8c59e3f6e87b1c02760427897ab482fed33be0eb (diff) | |
| parent | 4113d2c2986922cb3a89c9a5ca04366110d505a3 (diff) | |
| download | podman-0bd51819428e402599f681f273947c805f4641cf.tar.gz podman-0bd51819428e402599f681f273947c805f4641cf.tar.bz2 podman-0bd51819428e402599f681f273947c805f4641cf.zip | |
Merge pull request #6963 from containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.25.0incompatible
Bump github.com/uber/jaeger-client-go from 2.24.0+incompatible to 2.25.0+incompatible
Diffstat (limited to 'vendor/github.com/uber/jaeger-client-go/span_context.go')
| -rw-r--r-- | vendor/github.com/uber/jaeger-client-go/span_context.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/github.com/uber/jaeger-client-go/span_context.go b/vendor/github.com/uber/jaeger-client-go/span_context.go index 1b44f3f8c..ae9d94a9a 100644 --- a/vendor/github.com/uber/jaeger-client-go/span_context.go +++ b/vendor/github.com/uber/jaeger-client-go/span_context.go @@ -212,10 +212,14 @@ func (c SpanContext) SetFirehose() { } func (c SpanContext) String() string { + var flags int32 + if c.samplingState != nil { + flags = c.samplingState.stateFlags.Load() + } if c.traceID.High == 0 { - return fmt.Sprintf("%016x:%016x:%016x:%x", c.traceID.Low, uint64(c.spanID), uint64(c.parentID), c.samplingState.stateFlags.Load()) + return fmt.Sprintf("%016x:%016x:%016x:%x", c.traceID.Low, uint64(c.spanID), uint64(c.parentID), flags) } - return fmt.Sprintf("%016x%016x:%016x:%016x:%x", c.traceID.High, c.traceID.Low, uint64(c.spanID), uint64(c.parentID), c.samplingState.stateFlags.Load()) + return fmt.Sprintf("%016x%016x:%016x:%016x:%x", c.traceID.High, c.traceID.Low, uint64(c.spanID), uint64(c.parentID), flags) } // ContextFromString reconstructs the Context encoded in a string |