Address comments by @be-hase

line · Jun 12, 2023 · b868bc0 · b868bc0
1 parent 0b93c98
commit b868bc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/...lin/src/main/kotlin/com/linecorp/armeria/server/grpc/kotlin/CoroutineServerInterceptor.kt b/...lin/src/main/kotlin/com/linecorp/armeria/server/grpc/kotlin/CoroutineServerInterceptor.kt
@@ -65,20 +65,12 @@ interface CoroutineServerInterceptor : AsyncServerInterceptor {
         headers: Metadata,
         next: ServerCallHandler<I, O>
     ): CompletableFuture<ServerCall.Listener<I>> {
-        check(call is AbstractServerCall) {
-            throw IllegalArgumentException(
-                "Cannot use ${AsyncServerInterceptor::class.java.name} with a non-Armeria gRPC server"
-            )
-        }
-        val executor = call.blockingExecutor() ?: call.eventLoop()
-
         // COROUTINE_CONTEXT_KEY.get():
         //   It is necessary to propagate the CoroutineContext set by the previous CoroutineContextServerInterceptor.
         //   (The ArmeriaRequestCoroutineContext is also propagated by CoroutineContextServerInterceptor)
         // GrpcContextElement.current():
         //   In gRPC-kotlin, the Coroutine Context is propagated using the gRPC Context.
         return CoroutineScope(
-            executor.asCoroutineDispatcher() + ArmeriaRequestCoroutineContext(call.ctx()) +
                 COROUTINE_CONTEXT_KEY.get() + GrpcContextElement.current()
         ).future {
             suspendedInterceptCall(call, headers, next)

diff --git a/grpc/src/main/java/com/linecorp/armeria/server/grpc/GrpcServiceBuilder.java b/grpc/src/main/java/com/linecorp/armeria/server/grpc/GrpcServiceBuilder.java
@@ -948,11 +948,6 @@ static GrpcStatusFunction toGrpcStatusFunction(
     private ImmutableList.Builder<ServerInterceptor> interceptors() {
         if (interceptors == null) {
             interceptors = ImmutableList.builder();
-            if (USE_COROUTINE_CONTEXT_INTERCEPTOR) {
-                final ServerInterceptor coroutineContextInterceptor =
-                        new ArmeriaCoroutineContextInterceptor(useBlockingTaskExecutor);
-                interceptors.add(coroutineContextInterceptor);
-            }
         }
         return interceptors;
     }
@@ -966,6 +961,11 @@ private ImmutableList.Builder<ServerInterceptor> interceptors() {
      */
     public GrpcService build() {
         final HandlerRegistry handlerRegistry;
+        if (USE_COROUTINE_CONTEXT_INTERCEPTOR) {
+            final ServerInterceptor coroutineContextInterceptor =
+                    new ArmeriaCoroutineContextInterceptor(useBlockingTaskExecutor);
+            interceptors().add(coroutineContextInterceptor);
+        }
         if (!enableUnframedRequests && unframedGrpcErrorHandler != null) {
             throw new IllegalStateException(
                     "'unframedGrpcErrorHandler' can only be set if unframed requests are enabled");
@@ -981,9 +981,9 @@ public GrpcService build() {
         if (grpcHealthCheckService != null) {
             registryBuilder.addService(grpcHealthCheckService.bindService(), null, ImmutableList.of());
         }
-        final ImmutableList<ServerInterceptor> interceptors = interceptors().build();
-        if (!interceptors.isEmpty()) {
+        if (interceptors != null) {
             final HandlerRegistry.Builder newRegistryBuilder = new HandlerRegistry.Builder();
+            final ImmutableList<ServerInterceptor> interceptors = this.interceptors.build();
             for (Entry entry : registryBuilder.entries()) {
                 final MethodDescriptor<?, ?> methodDescriptor = entry.method();
                 final ServerServiceDefinition intercepted =