Skip to content

Commit

Permalink
more tracer tests
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyassrivatsan committed May 3, 2019
1 parent 5593f81 commit 476ac18
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
4 changes: 4 additions & 0 deletions internal/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ var (
todo = new(emptyCtx)
)

func Background() Context {
return background
}

// ErrCanceled is the error returned by Context.Err when the context is canceled.
var ErrCanceled = NewCanceledError()

Expand Down
8 changes: 4 additions & 4 deletions internal/tracer.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (t *tracingContextPropagator) Extract(
if err != nil {
return nil, err
}
span := t.tracer.StartSpan("test-operation", ext.RPCServerOption(spanContext))
span := t.tracer.StartSpan("", ext.RPCServerOption(spanContext))
return opentracing.ContextWithSpan(ctx, span), nil
}

Expand All @@ -83,18 +83,18 @@ func (t *tracingContextPropagator) InjectFromWorkflow(
// retrieve span from context object
span := spanFromContext(ctx)

t.tracer.Inject(span.Context(), opentracing.HTTPHeaders, hw)
t.tracer.Inject(span.Context(), opentracing.HTTPHeaders, tracingWriter{hw})
return nil
}

func (t *tracingContextPropagator) ExtractToWorkflow(
ctx Context,
hr HeaderReader,
) (Context, error) {
spanContext, err := t.tracer.Extract(opentracing.TextMap, hr)
spanContext, err := t.tracer.Extract(opentracing.TextMap, tracingReader{hr})
if err != nil {
return nil, err
}
span := t.tracer.StartSpan("test-operation", ext.RPCServerOption(spanContext))
span := t.tracer.StartSpan("", ext.RPCServerOption(spanContext))
return contextWithSpan(ctx, span), nil
}
25 changes: 25 additions & 0 deletions internal/tracer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,28 @@ func TestTracingContextPropagator(t *testing.T) {
span = opentracing.SpanFromContext(returnCtx)
assert.NotNil(t, span)
}

func TestTracingContextPropagatorWorkflowContext(t *testing.T) {
config := jaeger_config.Configuration{}
closer, err := config.InitGlobalTracer("test-service")
assert.NoError(t, err)
defer closer.Close()
tracer := opentracing.GlobalTracer()
ctxProp := NewTracingContextPropagator(tracer)

span := tracer.StartSpan("test-operation")
ctx := contextWithSpan(Background(), span)
header := &shared.Header{
Fields: map[string][]byte{},
}

err = ctxProp.InjectFromWorkflow(ctx, NewHeaderWriter(header))
assert.NoError(t, err)

returnCtx := Background()
returnCtx, err = ctxProp.ExtractToWorkflow(returnCtx, NewHeaderReader(header))
assert.NoError(t, err)

span = spanFromContext(returnCtx)
assert.NotNil(t, span)
}

0 comments on commit 476ac18

Please sign in to comment.