diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-07 18:16:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 18:16:49 +0100 |
| commit | 8f3b0f0d9e5f5131ef294ea0de57e10c05e5b921 (patch) | |
| tree | 90f2a9a384ac629113dd21723f5220b4448e66ec /vendor/github.com/uber/jaeger-client-go/zipkin.go | |
| parent | 769d4218fff311456b0b61b72cad2b21c2dbed0f (diff) | |
| parent | 75d67c49208137652adb13956691d4861b2ac15d (diff) | |
| download | podman-8f3b0f0d9e5f5131ef294ea0de57e10c05e5b921.tar.gz podman-8f3b0f0d9e5f5131ef294ea0de57e10c05e5b921.tar.bz2 podman-8f3b0f0d9e5f5131ef294ea0de57e10c05e5b921.zip | |
Merge pull request #4471 from containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.20.0+incompatible
Bump github.com/uber/jaeger-client-go from 2.19.0+incompatible to 2.20.0+incompatible
Diffstat (limited to 'vendor/github.com/uber/jaeger-client-go/zipkin.go')
| -rw-r--r-- | vendor/github.com/uber/jaeger-client-go/zipkin.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/uber/jaeger-client-go/zipkin.go b/vendor/github.com/uber/jaeger-client-go/zipkin.go index 636952b7f..98cab4b6e 100644 --- a/vendor/github.com/uber/jaeger-client-go/zipkin.go +++ b/vendor/github.com/uber/jaeger-client-go/zipkin.go @@ -55,7 +55,7 @@ func (p *zipkinPropagator) Inject( carrier.SetTraceID(ctx.TraceID().Low) // TODO this cannot work with 128bit IDs carrier.SetSpanID(uint64(ctx.SpanID())) carrier.SetParentID(uint64(ctx.ParentID())) - carrier.SetFlags(ctx.flags) + carrier.SetFlags(ctx.samplingState.flags()) return nil } @@ -71,6 +71,7 @@ func (p *zipkinPropagator) Extract(abstractCarrier interface{}) (SpanContext, er ctx.traceID.Low = carrier.TraceID() ctx.spanID = SpanID(carrier.SpanID()) ctx.parentID = SpanID(carrier.ParentID()) - ctx.flags = carrier.Flags() + ctx.samplingState = &samplingState{} + ctx.samplingState.setFlags(carrier.Flags()) return ctx, nil } |