Commit c7187004eeed82d2a3ab987db68ba13cbfb6a411 - golang-github-go-kit-kit

+4

-4

tracing/opentracing/endpoint_test.go less more

32	32	if want, have := "testOp", endpointSpan.OperationName; want != have {
33	33	t.Fatalf("Want %q, have %q", want, have)
34	34	}
35		contextContext := contextSpan.Context().(*mocktracer.MockSpanContext)
36		endpointContext := endpointSpan.Context().(*mocktracer.MockSpanContext)
	35	contextContext := contextSpan.Context().(mocktracer.MockSpanContext)
	36	endpointContext := endpointSpan.Context().(mocktracer.MockSpanContext)
37	37	// ...and that the ID is unmodified.
38	38	if want, have := contextContext.SpanID, endpointContext.SpanID; want != have {
39	39	t.Errorf("Want SpanID %q, have %q", want, have)

85	85	t.Fatalf("Want %q, have %q", want, have)
86	86	}
87	87
88		parentContext := parentSpan.Context().(*mocktracer.MockSpanContext)
89		endpointContext := parentSpan.Context().(*mocktracer.MockSpanContext)
	88	parentContext := parentSpan.Context().(mocktracer.MockSpanContext)
	89	endpointContext := parentSpan.Context().(mocktracer.MockSpanContext)
90	90
91	91	// ... and that the parent ID is set appropriately.
92	92	if want, have := parentContext.SpanID, endpointContext.SpanID; want != have {

+4

-4

tracing/opentracing/grpc_test.go less more

18	18	// Initialize the ctx with a Span to inject.
19	19	beforeSpan := tracer.StartSpan("to_inject").(*mocktracer.MockSpan)
20	20	defer beforeSpan.Finish()
21		beforeSpan.Context().SetBaggageItem("baggage", "check")
	21	beforeSpan.SetBaggageItem("baggage", "check")
22	22	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
23	23
24	24	toGRPCFunc := kitot.ToGRPCRequest(tracer, logger)

43	43	joinCtx := fromGRPCFunc(afterCtx, &md)
44	44	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
45	45
46		joinedContext := joinedSpan.Context().(*mocktracer.MockSpanContext)
47		beforeContext := beforeSpan.Context().(*mocktracer.MockSpanContext)
	46	joinedContext := joinedSpan.Context().(mocktracer.MockSpanContext)
	47	beforeContext := beforeSpan.Context().(mocktracer.MockSpanContext)
48	48
49	49	if joinedContext.SpanID == beforeContext.SpanID {
50	50	t.Error("SpanID should have changed", joinedContext.SpanID, beforeContext.SpanID)

57	57	if want, have := "joined", joinedSpan.OperationName; want != have {
58	58	t.Errorf("Want %q, have %q", want, have)
59	59	}
60		if want, have := "check", joinedSpan.Context().BaggageItem("baggage"); want != have {
	60	if want, have := "check", joinedSpan.BaggageItem("baggage"); want != have {
61	61	t.Errorf("Want %q, have %q", want, have)
62	62	}
63	63	}

+4

-4

tracing/opentracing/http_test.go less more

18	18	// Initialize the ctx with a Span to inject.
19	19	beforeSpan := tracer.StartSpan("to_inject").(*mocktracer.MockSpan)
20	20	defer beforeSpan.Finish()
21		beforeSpan.Context().SetBaggageItem("baggage", "check")
	21	beforeSpan.SetBaggageItem("baggage", "check")
22	22	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
23	23
24	24	toHTTPFunc := kitot.ToHTTPRequest(tracer, logger)

43	43	joinCtx := fromHTTPFunc(afterCtx, req)
44	44	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
45	45
46		joinedContext := joinedSpan.Context().(*mocktracer.MockSpanContext)
47		beforeContext := beforeSpan.Context().(*mocktracer.MockSpanContext)
	46	joinedContext := joinedSpan.Context().(mocktracer.MockSpanContext)
	47	beforeContext := beforeSpan.Context().(mocktracer.MockSpanContext)
48	48
49	49	if joinedContext.SpanID == beforeContext.SpanID {
50	50	t.Error("SpanID should have changed", joinedContext.SpanID, beforeContext.SpanID)

57	57	if want, have := "joined", joinedSpan.OperationName; want != have {
58	58	t.Errorf("Want %q, have %q", want, have)
59	59	}
60		if want, have := "check", joinedSpan.Context().BaggageItem("baggage"); want != have {
	60	if want, have := "check", joinedSpan.BaggageItem("baggage"); want != have {
61	61	t.Errorf("Want %q, have %q", want, have)
62	62	}
63	63	}