Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
Add an extension to Tracer interface for custom go context creation (#…
Browse files Browse the repository at this point in the history
…220)

* Add an extension interface for Tracer implementations

The new TracerContextWithSpanExtension interface provides a way to
hook into the ContextWithSpan function, so the implementation can put
some extra information to the context.

The opentracing to opentelemetry bridge needs the context to set the
current opentelemetry span, so the opentelemetry API in the layer
below the one using opentracing can still get the right parent span.

* Call the hook in the ContextWithSpan function if possible

So the implementation can still affect the way the go context is set
up.

* Add a test for the TracerContextWithSpanExtension interface
  • Loading branch information
krnowak authored and yurishkuro committed Sep 12, 2019
1 parent 94e0bdd commit 16ba2b6
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 0 deletions.
24 changes: 24 additions & 0 deletions ext.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package opentracing

import (
"context"
)

// TracerContextWithSpanExtension is an extension interface that the
// implementation of the Tracer interface may want to implement. It
// allows to have some control over the go context when the
// ContextWithSpan is invoked.
//
// The primary purpose of this extension are adapters from opentracing
// API to some other tracing API.
type TracerContextWithSpanExtension interface {
// ContextWithSpanHook gets called by the ContextWithSpan
// function, when the Tracer implementation also implements
// this interface. It allows to put extra information into the
// context and make it available to the callers of the
// ContextWithSpan.
//
// This hook is invoked before the ContextWithSpan function
// actually puts the span into the context.
ContextWithSpanHook(ctx context.Context, span Span) context.Context
}
3 changes: 3 additions & 0 deletions gocontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ var activeSpanKey = contextKey{}
// ContextWithSpan returns a new `context.Context` that holds a reference to
// `span`'s SpanContext.
func ContextWithSpan(ctx context.Context, span Span) context.Context {
if tracerWithHook, ok := span.Tracer().(TracerContextWithSpanExtension); ok {
ctx = tracerWithHook.ContextWithSpanHook(ctx, span)
}
return context.WithValue(ctx, activeSpanKey, span)
}

Expand Down
35 changes: 35 additions & 0 deletions gocontext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,41 @@ func TestContextWithSpan(t *testing.T) {
}
}

type noopExtTracer struct {
NoopTracer
}

type noopExtTracerCtxType struct{}

func (noopExtTracer) ContextWithSpanHook(ctx context.Context, span Span) context.Context {
return context.WithValue(ctx, noopExtTracerCtxType{}, noopExtTracerCtxType{})
}

var _ Tracer = noopExtTracer{}
var _ TracerContextWithSpanExtension = noopExtTracer{}

type noopExtSpan struct {
noopSpan
}

func (noopExtSpan) Tracer() Tracer {
return noopExtTracer{}
}

var _ Span = noopExtSpan{}

func TestContextWithSpanWithExtension(t *testing.T) {
span := &noopExtSpan{}
ctx := ContextWithSpan(context.Background(), span)
span2 := SpanFromContext(ctx)
if span != span2 {
t.Errorf("Not the same span returned from context, expected=%+v, actual=%+v", span, span2)
}
if _, ok := ctx.Value(noopExtTracerCtxType{}).(noopExtTracerCtxType); !ok {
t.Error("ContextWithSpanHook was not called")
}
}

func TestStartSpanFromContext(t *testing.T) {
testTracer := testTracer{}

Expand Down

0 comments on commit 16ba2b6

Please sign in to comment.