Add server interceptor to end in javaagent because they are run in re…

…verse order. (#1383)
open-telemetry · Oct 14, 2020 · 30e75c6 · 30e75c6
1 parent ee0e0a9
commit 30e75c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/...o/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcServerBuilderInstrumentation.java b/...o/opentelemetry/javaagent/instrumentation/grpc/v1_5/GrpcServerBuilderInstrumentation.java
@@ -48,7 +48,7 @@ public static void addInterceptor(
         }
       }
       if (shouldRegister) {
-        interceptors.add(0, TracingServerInterceptor.newInterceptor());
+        interceptors.add(TracingServerInterceptor.newInterceptor());
       }
     }
   }

diff --git a/...esting/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_5/AbstractGrpcTest.groovy b/...esting/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_5/AbstractGrpcTest.groovy
@@ -18,6 +18,7 @@ import io.grpc.Channel
 import io.grpc.ClientCall
 import io.grpc.ClientInterceptor
 import io.grpc.Context
+import io.grpc.Contexts
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
 import io.grpc.Metadata
@@ -323,25 +324,26 @@ abstract class AbstractGrpcTest extends InstrumentationSpecification {
     def port = PortUtils.randomOpenPort()
     Server server
     server = configureServer(ServerBuilder.forPort(port)
-      .addService(greeter))
+      .addService(greeter)
       .intercept(new ServerInterceptor() {
         @Override
         <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
-          def ctx = Context.current().withValue(key, "meow")
-          def oldCtx = ctx.attach()
-          try {
-            return next.startCall(call, headers)
-          } finally {
-            ctx.detach(oldCtx)
+          if (!TracingContextUtils.getSpan(Context.current()).getContext().isValid()) {
+            throw new AssertionError((Object) "span not attached in server interceptor")
           }
+          def ctx = Context.current().withValue(key, "meow")
+          return Contexts.interceptCall(ctx, call, headers, next)
         }
-      })
+      }))
       .build().start()
     ManagedChannelBuilder channelBuilder
     channelBuilder = configureClient(ManagedChannelBuilder.forAddress("localhost", port))
       .intercept(new ClientInterceptor() {
         @Override
         <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
+          if (!TracingContextUtils.getSpan(Context.current()).getContext().isValid()) {
+            throw new AssertionError((Object) "span not attached in client interceptor")
+          }
           def ctx = Context.current().withValue(key, "meow")
           def oldCtx = ctx.attach()
           try {