diff options
author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-07-02 09:11:54 +0000 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-02 06:40:04 -0400 |
commit | c4248e62ca8721aaed1fba241a822e201327317d (patch) | |
tree | 93a98cc4f859d4b96fd594dab22768ae3d5dcd24 /vendor/github.com/opentracing/opentracing-go/gocontext.go | |
parent | e84695213e35c22ba085e3831cbd025cd55a4c84 (diff) | |
download | podman-c4248e62ca8721aaed1fba241a822e201327317d.tar.gz podman-c4248e62ca8721aaed1fba241a822e201327317d.tar.bz2 podman-c4248e62ca8721aaed1fba241a822e201327317d.zip |
Bump github.com/opentracing/opentracing-go from 1.1.0 to 1.2.0
Bumps [github.com/opentracing/opentracing-go](https://github.com/opentracing/opentracing-go) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/opentracing/opentracing-go/releases)
- [Changelog](https://github.com/opentracing/opentracing-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/opentracing/opentracing-go/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/opentracing/opentracing-go/gocontext.go')
-rw-r--r-- | vendor/github.com/opentracing/opentracing-go/gocontext.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/github.com/opentracing/opentracing-go/gocontext.go b/vendor/github.com/opentracing/opentracing-go/gocontext.go index 08c00c04e..1831bc9b2 100644 --- a/vendor/github.com/opentracing/opentracing-go/gocontext.go +++ b/vendor/github.com/opentracing/opentracing-go/gocontext.go @@ -7,8 +7,13 @@ type contextKey struct{} var activeSpanKey = contextKey{} // ContextWithSpan returns a new `context.Context` that holds a reference to -// `span`'s SpanContext. +// the span. If span is nil, a new context without an active span is returned. func ContextWithSpan(ctx context.Context, span Span) context.Context { + if span != nil { + if tracerWithHook, ok := span.Tracer().(TracerContextWithSpanExtension); ok { + ctx = tracerWithHook.ContextWithSpanHook(ctx, span) + } + } return context.WithValue(ctx, activeSpanKey, span) } |