summaryrefslogtreecommitdiff
path: root/vendor/github.com/uber/jaeger-client-go/propagation.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-07 18:16:49 +0100
committerGitHub <noreply@github.com>2019-11-07 18:16:49 +0100
commit8f3b0f0d9e5f5131ef294ea0de57e10c05e5b921 (patch)
tree90f2a9a384ac629113dd21723f5220b4448e66ec /vendor/github.com/uber/jaeger-client-go/propagation.go
parent769d4218fff311456b0b61b72cad2b21c2dbed0f (diff)
parent75d67c49208137652adb13956691d4861b2ac15d (diff)
downloadpodman-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/propagation.go')
-rw-r--r--vendor/github.com/uber/jaeger-client-go/propagation.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/github.com/uber/jaeger-client-go/propagation.go b/vendor/github.com/uber/jaeger-client-go/propagation.go
index 5b50cfb71..42fd64b58 100644
--- a/vendor/github.com/uber/jaeger-client-go/propagation.go
+++ b/vendor/github.com/uber/jaeger-client-go/propagation.go
@@ -193,7 +193,7 @@ func (p *BinaryPropagator) Inject(
if err := binary.Write(carrier, binary.BigEndian, sc.parentID); err != nil {
return err
}
- if err := binary.Write(carrier, binary.BigEndian, sc.flags); err != nil {
+ if err := binary.Write(carrier, binary.BigEndian, sc.samplingState.flags()); err != nil {
return err
}
@@ -222,6 +222,7 @@ func (p *BinaryPropagator) Extract(abstractCarrier interface{}) (SpanContext, er
return emptyContext, opentracing.ErrInvalidCarrier
}
var ctx SpanContext
+ ctx.samplingState = &samplingState{}
if err := binary.Read(carrier, binary.BigEndian, &ctx.traceID); err != nil {
return emptyContext, opentracing.ErrSpanContextCorrupted
@@ -232,9 +233,12 @@ func (p *BinaryPropagator) Extract(abstractCarrier interface{}) (SpanContext, er
if err := binary.Read(carrier, binary.BigEndian, &ctx.parentID); err != nil {
return emptyContext, opentracing.ErrSpanContextCorrupted
}
- if err := binary.Read(carrier, binary.BigEndian, &ctx.flags); err != nil {
+
+ var flags byte
+ if err := binary.Read(carrier, binary.BigEndian, &flags); err != nil {
return emptyContext, opentracing.ErrSpanContextCorrupted
}
+ ctx.samplingState.setFlags(flags)
// Handle the baggage items
var numBaggage int32