Commit 142db49d697c17536db6609bd743bac41940369e - golang-github-go-kit-kit

tracing: fixes for new OpenTracing changes - mocktracer.FinishedSpans becomes GetFinishedSpans() - endpoint.Nop is a thing (for tests) - Some idiomaticization of var declaration Peter Bourgon 7 years ago

3 changed file(s) with 29 addition(s) and 33 deletion(s). Raw diff Collapse all Expand all

+21

-25

tracing/opentracing/endpoint_test.go less more

17	17	contextSpan := tracer.StartSpan("").(*mocktracer.MockSpan)
18	18	ctx := opentracing.ContextWithSpan(context.Background(), contextSpan)
19	19
20		var innerEndpoint endpoint.Endpoint
21		innerEndpoint = func(context.Context, interface{}) (interface{}, error) {
22		return struct{}{}, nil
23		}
24		tracedEndpoint := kitot.TraceServer(tracer, "testOp")(innerEndpoint)
	20	tracedEndpoint := kitot.TraceServer(tracer, "testOp")(endpoint.Nop)
25	21	if _, err := tracedEndpoint(ctx, struct{}{}); err != nil {
26	22	t.Fatal(err)
27	23	}
28		if want, have := 1, len(tracer.FinishedSpans); want != have {
	24
	25	finishedSpans := tracer.GetFinishedSpans()
	26	if want, have := 1, len(finishedSpans); want != have {
29	27	t.Fatalf("Want %v span(s), found %v", want, have)
30	28	}
31	29
32		endpointSpan := tracer.FinishedSpans[0]
33	30	// Test that the op name is updated
	31	endpointSpan := finishedSpans[0]
34	32	if want, have := "testOp", endpointSpan.OperationName; want != have {
35	33	t.Fatalf("Want %q, have %q", want, have)
36	34	}
37		// ... and that the ID is unmodified.
	35
	36	// ...and that the ID is unmodified.
38	37	if want, have := contextSpan.SpanID, endpointSpan.SpanID; want != have {
39	38	t.Errorf("Want SpanID %q, have %q", want, have)
40	39	}

43	42	func TestTraceServerNoContextSpan(t *testing.T) {
44	43	tracer := mocktracer.New()
45	44
46		var innerEndpoint endpoint.Endpoint
47		innerEndpoint = func(context.Context, interface{}) (interface{}, error) {
48		return struct{}{}, nil
49		}
50		tracedEndpoint := kitot.TraceServer(tracer, "testOp")(innerEndpoint)
51		// Empty/background context:
	45	// Empty/background context.
	46	tracedEndpoint := kitot.TraceServer(tracer, "testOp")(endpoint.Nop)
52	47	if _, err := tracedEndpoint(context.Background(), struct{}{}); err != nil {
53	48	t.Fatal(err)
54	49	}
55		// tracedEndpoint created a new Span:
56		if want, have := 1, len(tracer.FinishedSpans); want != have {
	50
	51	// tracedEndpoint created a new Span.
	52	finishedSpans := tracer.GetFinishedSpans()
	53	if want, have := 1, len(finishedSpans); want != have {
57	54	t.Fatalf("Want %v span(s), found %v", want, have)
58	55	}
59	56
60		endpointSpan := tracer.FinishedSpans[0]
	57	endpointSpan := finishedSpans[0]
61	58	if want, have := "testOp", endpointSpan.OperationName; want != have {
62	59	t.Fatalf("Want %q, have %q", want, have)
63	60	}

71	68	defer parentSpan.Finish()
72	69	ctx := opentracing.ContextWithSpan(context.Background(), parentSpan)
73	70
74		var innerEndpoint endpoint.Endpoint
75		innerEndpoint = func(context.Context, interface{}) (interface{}, error) {
76		return struct{}{}, nil
77		}
78		tracedEndpoint := kitot.TraceClient(tracer, "testOp")(innerEndpoint)
	71	tracedEndpoint := kitot.TraceClient(tracer, "testOp")(endpoint.Nop)
79	72	if _, err := tracedEndpoint(ctx, struct{}{}); err != nil {
80	73	t.Fatal(err)
81	74	}
82		// tracedEndpoint created a new Span:
83		if want, have := 1, len(tracer.FinishedSpans); want != have {
	75
	76	// tracedEndpoint created a new Span.
	77	finishedSpans := tracer.GetFinishedSpans()
	78	if want, have := 1, len(finishedSpans); want != have {
84	79	t.Fatalf("Want %v span(s), found %v", want, have)
85	80	}
86	81
87		endpointSpan := tracer.FinishedSpans[0]
	82	endpointSpan := finishedSpans[0]
88	83	if want, have := "testOp", endpointSpan.OperationName; want != have {
89	84	t.Fatalf("Want %q, have %q", want, have)
90	85	}
	86
91	87	// ... and that the parent ID is set appropriately.
92	88	if want, have := parentSpan.SpanID, endpointSpan.ParentID; want != have {
93	89	t.Errorf("Want ParentID %q, have %q", want, have)

-4

tracing/opentracing/grpc_test.go less more

8	8	"google.golang.org/grpc/metadata"
9	9
10	10	kitot "github.com/go-kit/kit/tracing/opentracing"
11		"github.com/go-kit/kit/transport/grpc"
12	11	)
13	12
14	13	func TestTraceGRPCRequestRoundtrip(t *testing.T) {

20	19	beforeSpan.SetBaggageItem("baggage", "check")
21	20	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
22	21
23		var toGRPCFunc grpc.RequestFunc = kitot.ToGRPCRequest(tracer, nil)
	22	toGRPCFunc := kitot.ToGRPCRequest(tracer, nil)
24	23	md := metadata.Pairs()
25	24	// Call the RequestFunc.
26	25	afterCtx := toGRPCFunc(beforeCtx, &md)

32	31	}
33	32
34	33	// No spans should have finished yet.
35		if want, have := 0, len(tracer.FinishedSpans); want != have {
	34	finishedSpans := tracer.GetFinishedSpans()
	35	if want, have := 0, len(finishedSpans); want != have {
36	36	t.Errorf("Want %v span(s), found %v", want, have)
37	37	}
38	38
39	39	// Use FromGRPCRequest to verify that we can join with the trace given MD.
40		var fromGRPCFunc grpc.RequestFunc = kitot.FromGRPCRequest(tracer, "joined", nil)
	40	fromGRPCFunc := kitot.FromGRPCRequest(tracer, "joined", nil)
41	41	joinCtx := fromGRPCFunc(afterCtx, &md)
42	42	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
43	43

-4

tracing/opentracing/http_test.go less more

8	8	"golang.org/x/net/context"
9	9
10	10	kitot "github.com/go-kit/kit/tracing/opentracing"
11		kithttp "github.com/go-kit/kit/transport/http"
12	11	)
13	12
14	13	func TestTraceHTTPRequestRoundtrip(t *testing.T) {

20	19	beforeSpan.SetBaggageItem("baggage", "check")
21	20	beforeCtx := opentracing.ContextWithSpan(context.Background(), beforeSpan)
22	21
23		var toHTTPFunc kithttp.RequestFunc = kitot.ToHTTPRequest(tracer, nil)
	22	toHTTPFunc := kitot.ToHTTPRequest(tracer, nil)
24	23	req, _ := http.NewRequest("GET", "http://test.biz/url", nil)
25	24	// Call the RequestFunc.
26	25	afterCtx := toHTTPFunc(beforeCtx, req)

32	31	}
33	32
34	33	// No spans should have finished yet.
35		if want, have := 0, len(tracer.FinishedSpans); want != have {
	34	finishedSpans := tracer.GetFinishedSpans()
	35	if want, have := 0, len(finishedSpans); want != have {
36	36	t.Errorf("Want %v span(s), found %v", want, have)
37	37	}
38	38
39	39	// Use FromHTTPRequest to verify that we can join with the trace given a req.
40		var fromHTTPFunc kithttp.RequestFunc = kitot.FromHTTPRequest(tracer, "joined", nil)
	40	fromHTTPFunc := kitot.FromHTTPRequest(tracer, "joined", nil)
41	41	joinCtx := fromHTTPFunc(afterCtx, req)
42	42	joinedSpan := opentracing.SpanFromContext(joinCtx).(*mocktracer.MockSpan)
43	43