@@ -27,7 +27,6 @@ import (
2727 "google.golang.org/grpc/test/bufconn"
2828
2929 "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
30- "go.opentelemetry.io/otel/api/trace"
3130 "go.opentelemetry.io/otel/api/trace/tracetest"
3231 "go.opentelemetry.io/otel/label"
3332 "go.opentelemetry.io/otel/semconv"
@@ -73,51 +72,50 @@ func doCalls(cOpt []grpc.DialOption, sOpt []grpc.ServerOption) error {
7372
7473func TestInterceptors (t * testing.T ) {
7574 clientUnarySR := new (tracetest.StandardSpanRecorder )
76- clientUnaryTracer := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (clientUnarySR )). Tracer ( "TestUnaryClientInterceptor" )
75+ clientUnaryTP := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (clientUnarySR ))
7776
7877 clientStreamSR := new (tracetest.StandardSpanRecorder )
79- clientStreamTracer := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (clientStreamSR )). Tracer ( "TestStreamClientInterceptor" )
78+ clientStreamTP := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (clientStreamSR ))
8079
8180 serverUnarySR := new (tracetest.StandardSpanRecorder )
82- serverUnaryTracer := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (serverUnarySR )). Tracer ( "TestUnaryServerInterceptor" )
81+ serverUnaryTP := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (serverUnarySR ))
8382
8483 serverStreamSR := new (tracetest.StandardSpanRecorder )
85- serverStreamTracer := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (serverStreamSR )). Tracer ( "TestStreamServerInterceptor" )
84+ serverStreamTP := tracetest .NewTracerProvider (tracetest .WithSpanRecorder (serverStreamSR ))
8685
8786 assert .NoError (t , doCalls (
8887 []grpc.DialOption {
89- grpc .WithUnaryInterceptor (otelgrpc .UnaryClientInterceptor (clientUnaryTracer )),
90- grpc .WithStreamInterceptor (otelgrpc .StreamClientInterceptor (clientStreamTracer )),
88+ grpc .WithUnaryInterceptor (otelgrpc .UnaryClientInterceptor (otelgrpc . WithTracerProvider ( clientUnaryTP ) )),
89+ grpc .WithStreamInterceptor (otelgrpc .StreamClientInterceptor (otelgrpc . WithTracerProvider ( clientStreamTP ) )),
9190 },
9291 []grpc.ServerOption {
93- grpc .UnaryInterceptor (otelgrpc .UnaryServerInterceptor (serverUnaryTracer )),
94- grpc .StreamInterceptor (otelgrpc .StreamServerInterceptor (serverStreamTracer )),
92+ grpc .UnaryInterceptor (otelgrpc .UnaryServerInterceptor (otelgrpc . WithTracerProvider ( serverUnaryTP ) )),
93+ grpc .StreamInterceptor (otelgrpc .StreamServerInterceptor (otelgrpc . WithTracerProvider ( serverStreamTP ) )),
9594 },
9695 ))
9796
9897 t .Run ("UnaryClientSpans" , func (t * testing.T ) {
99- checkUnaryClientSpans (t , clientUnaryTracer , clientUnarySR .Completed ())
98+ checkUnaryClientSpans (t , clientUnarySR .Completed ())
10099 })
101100
102101 t .Run ("StreamClientSpans" , func (t * testing.T ) {
103- checkStreamClientSpans (t , clientStreamTracer , clientStreamSR .Completed ())
102+ checkStreamClientSpans (t , clientStreamSR .Completed ())
104103 })
105104
106105 t .Run ("UnaryServerSpans" , func (t * testing.T ) {
107- checkUnaryServerSpans (t , serverUnaryTracer , serverUnarySR .Completed ())
106+ checkUnaryServerSpans (t , serverUnarySR .Completed ())
108107 })
109108
110109 t .Run ("StreamServerSpans" , func (t * testing.T ) {
111- checkStreamServerSpans (t , serverStreamTracer , serverStreamSR .Completed ())
110+ checkStreamServerSpans (t , serverStreamSR .Completed ())
112111 })
113112}
114113
115- func checkUnaryClientSpans (t * testing.T , tracer trace. Tracer , spans []* tracetest.Span ) {
114+ func checkUnaryClientSpans (t * testing.T , spans []* tracetest.Span ) {
116115 require .Len (t , spans , 2 )
117116
118117 emptySpan := spans [0 ]
119118 assert .True (t , emptySpan .Ended ())
120- assert .Equal (t , tracer , emptySpan .Tracer ())
121119 assert .Equal (t , "grpc.testing.TestService/EmptyCall" , emptySpan .Name ())
122120 assert .Equal (t , []tracetest.Event {
123121 {
@@ -145,7 +143,6 @@ func checkUnaryClientSpans(t *testing.T, tracer trace.Tracer, spans []*tracetest
145143
146144 largeSpan := spans [1 ]
147145 assert .True (t , largeSpan .Ended ())
148- assert .Equal (t , tracer , largeSpan .Tracer ())
149146 assert .Equal (t , "grpc.testing.TestService/UnaryCall" , largeSpan .Name ())
150147 assert .Equal (t , []tracetest.Event {
151148 {
@@ -174,12 +171,11 @@ func checkUnaryClientSpans(t *testing.T, tracer trace.Tracer, spans []*tracetest
174171 }, largeSpan .Attributes ())
175172}
176173
177- func checkStreamClientSpans (t * testing.T , tracer trace. Tracer , spans []* tracetest.Span ) {
174+ func checkStreamClientSpans (t * testing.T , spans []* tracetest.Span ) {
178175 require .Len (t , spans , 3 )
179176
180177 streamInput := spans [0 ]
181178 assert .True (t , streamInput .Ended ())
182- assert .Equal (t , tracer , streamInput .Tracer ())
183179 assert .Equal (t , "grpc.testing.TestService/StreamingInputCall" , streamInput .Name ())
184180 // sizes from reqSizes in "google.golang.org/grpc/interop".
185181 assert .Equal (t , []tracetest.Event {
@@ -225,7 +221,6 @@ func checkStreamClientSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
225221
226222 streamOutput := spans [1 ]
227223 assert .True (t , streamOutput .Ended ())
228- assert .Equal (t , tracer , streamOutput .Tracer ())
229224 assert .Equal (t , "grpc.testing.TestService/StreamingOutputCall" , streamOutput .Name ())
230225 // sizes from respSizes in "google.golang.org/grpc/interop".
231226 assert .Equal (t , []tracetest.Event {
@@ -278,7 +273,6 @@ func checkStreamClientSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
278273
279274 pingPong := spans [2 ]
280275 assert .True (t , pingPong .Ended ())
281- assert .Equal (t , tracer , pingPong .Tracer ())
282276 assert .Equal (t , "grpc.testing.TestService/FullDuplexCall" , pingPong .Name ())
283277 assert .Equal (t , []tracetest.Event {
284278 {
@@ -353,12 +347,11 @@ func checkStreamClientSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
353347 }, pingPong .Attributes ())
354348}
355349
356- func checkStreamServerSpans (t * testing.T , tracer trace. Tracer , spans []* tracetest.Span ) {
350+ func checkStreamServerSpans (t * testing.T , spans []* tracetest.Span ) {
357351 require .Len (t , spans , 3 )
358352
359353 streamInput := spans [0 ]
360354 assert .True (t , streamInput .Ended ())
361- assert .Equal (t , tracer , streamInput .Tracer ())
362355 assert .Equal (t , "grpc.testing.TestService/StreamingInputCall" , streamInput .Name ())
363356 // sizes from reqSizes in "google.golang.org/grpc/interop".
364357 assert .Equal (t , []tracetest.Event {
@@ -411,7 +404,6 @@ func checkStreamServerSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
411404
412405 streamOutput := spans [1 ]
413406 assert .True (t , streamOutput .Ended ())
414- assert .Equal (t , tracer , streamOutput .Tracer ())
415407 assert .Equal (t , "grpc.testing.TestService/StreamingOutputCall" , streamOutput .Name ())
416408 // sizes from respSizes in "google.golang.org/grpc/interop".
417409 assert .Equal (t , []tracetest.Event {
@@ -464,7 +456,6 @@ func checkStreamServerSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
464456
465457 pingPong := spans [2 ]
466458 assert .True (t , pingPong .Ended ())
467- assert .Equal (t , tracer , pingPong .Tracer ())
468459 assert .Equal (t , "grpc.testing.TestService/FullDuplexCall" , pingPong .Name ())
469460 assert .Equal (t , []tracetest.Event {
470461 {
@@ -539,12 +530,11 @@ func checkStreamServerSpans(t *testing.T, tracer trace.Tracer, spans []*tracetes
539530 }, pingPong .Attributes ())
540531}
541532
542- func checkUnaryServerSpans (t * testing.T , tracer trace. Tracer , spans []* tracetest.Span ) {
533+ func checkUnaryServerSpans (t * testing.T , spans []* tracetest.Span ) {
543534 require .Len (t , spans , 2 )
544535
545536 emptySpan := spans [0 ]
546537 assert .True (t , emptySpan .Ended ())
547- assert .Equal (t , tracer , emptySpan .Tracer ())
548538 assert .Equal (t , "grpc.testing.TestService/EmptyCall" , emptySpan .Name ())
549539 assert .Equal (t , []tracetest.Event {
550540 {
@@ -572,7 +562,6 @@ func checkUnaryServerSpans(t *testing.T, tracer trace.Tracer, spans []*tracetest
572562
573563 largeSpan := spans [1 ]
574564 assert .True (t , largeSpan .Ended ())
575- assert .Equal (t , tracer , largeSpan .Tracer ())
576565 assert .Equal (t , "grpc.testing.TestService/UnaryCall" , largeSpan .Name ())
577566 assert .Equal (t , []tracetest.Event {
578567 {
0 commit comments