Merge pull request #47175 from geoand/#47062-more

Slightly improve the way Arc is used in gRPC

Author: geoand

extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java

@@ -52,6 +52,7 @@
 import io.quarkus.arc.deployment.ValidationPhaseBuildItem;
 import io.quarkus.arc.processor.AnnotationsTransformer;
 import io.quarkus.arc.processor.BeanInfo;
+import io.quarkus.arc.processor.BeanStream;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.deployment.ApplicationArchive;
 import io.quarkus.deployment.Capabilities;
@@ -696,8 +697,8 @@ ServiceStartBuildItem initializeServer(GrpcServerRecorder recorder,
             VertxWebRouterBuildItem routerBuildItem,
             VertxBuildItem vertx, Capabilities capabilities,
             List<FilterBuildItem> filterBuildItems,
-            // used to ensure that gRPC server starts after OTel has been set up
-            @SuppressWarnings("unused") BeanContainerBuildItem beanContainerBuildItem) {
+            ValidationPhaseBuildItem validationPhase,
+            BeanContainerBuildItem beanContainerBuildItem) {
 
         // Build the list of blocking methods per service implementation
         Map<String, List<String>> blocking = new HashMap<>();
@@ -733,7 +734,16 @@ ServiceStartBuildItem initializeServer(GrpcServerRecorder recorder,
             } else {
                 routerRuntimeValue = routerBuildItem.getHttpRouter();
             }
-            recorder.initializeGrpcServer(vertx.getVertx(), routerRuntimeValue,
+            Type bindableServiceType = Type.create(GrpcDotNames.BINDABLE_SERVICE, org.jboss.jandex.Type.Kind.CLASS);
+            BeanStream bindableServiceBeanStream = validationPhase.getContext().beans().classBeans()
+                    .matchBeanTypes(new Predicate<>() {
+                        @Override
+                        public boolean test(Set<Type> types) {
+                            return types.contains(bindableServiceType);
+                        }
+                    });
+            recorder.initializeGrpcServer(bindableServiceBeanStream.isEmpty(), beanContainerBuildItem.getValue(),
+                    vertx.getVertx(), routerRuntimeValue,
                     config, shutdown, blocking, virtuals, launchModeBuildItem.getLaunchMode(),
                     capabilities.isPresent(Capability.SECURITY), securityHandlers);
             return new ServiceStartBuildItem(GRPC_SERVER);

extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java

@@ -44,6 +44,7 @@
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.Subclass;
+import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.grpc.api.ServerBuilderCustomizer;
 import io.quarkus.grpc.auth.GrpcSecurityInterceptor;
 import io.quarkus.grpc.reflection.service.ReflectionServiceV1;
@@ -121,18 +122,15 @@ public void handle(RoutingContext event) {
         }
     }
 
-    public void initializeGrpcServer(RuntimeValue<Vertx> vertxSupplier,
+    public void initializeGrpcServer(boolean hasNoBindableServiceBeans, BeanContainer beanContainer,
+            RuntimeValue<Vertx> vertxSupplier,
             RuntimeValue<Router> routerSupplier,
             GrpcConfiguration cfg,
             ShutdownContext shutdown,
             Map<String, List<String>> blockingMethodsPerService,
             Map<String, List<String>> virtualMethodsPerService,
             LaunchMode launchMode, boolean securityPresent, Map<Integer, Handler<RoutingContext>> securityHandlers) {
-        GrpcContainer grpcContainer = Arc.container().instance(GrpcContainer.class).get();
-        if (grpcContainer == null) {
-            throw new IllegalStateException("gRPC not initialized, GrpcContainer not found");
-        }
-        if (hasNoServices(grpcContainer.getServices()) && LaunchMode.current() != LaunchMode.DEVELOPMENT) {
+        if (hasNoBindableServiceBeans && LaunchMode.current() != LaunchMode.DEVELOPMENT) {
             LOGGER.error("Unable to find beans exposing the `BindableService` interface - not starting the gRPC server");
             return; // OK?
         }
@@ -152,20 +150,23 @@ public void initializeGrpcServer(RuntimeValue<Vertx> vertxSupplier,
                 // start single server, not in a verticle, regardless of the configuration.instances
                 // for reason unknown to me, verticles occasionally get undeployed on dev mode reload
                 if (GrpcServerReloader.getServer() != null || (provider != null && provider.serverAlreadyExists())) {
-                    devModeReload(grpcContainer, vertx, configuration, provider, blockingMethodsPerService,
+                    devModeReload(beanContainer.beanInstance(GrpcContainer.class), vertx, configuration, provider,
+                            blockingMethodsPerService,
                             virtualMethodsPerService, shutdown);
                 } else {
-                    devModeStart(grpcContainer, vertx, configuration, provider, blockingMethodsPerService,
+                    devModeStart(beanContainer.beanInstance(GrpcContainer.class), vertx, configuration, provider,
+                            blockingMethodsPerService,
                             virtualMethodsPerService, shutdown,
                             launchMode);
                 }
             } else {
-                prodStart(grpcContainer, vertx, configuration, provider, blockingMethodsPerService, virtualMethodsPerService,
+                prodStart(beanContainer.beanInstance(GrpcContainer.class), vertx, configuration, provider,
+                        blockingMethodsPerService, virtualMethodsPerService,
                         launchMode);
             }
         } else {
             buildGrpcServer(vertx, configuration, routerSupplier, shutdown, blockingMethodsPerService, virtualMethodsPerService,
-                    grpcContainer, launchMode, securityPresent, securityHandlers);
+                    beanContainer.beanInstance(GrpcContainer.class), launchMode, securityPresent, securityHandlers);
         }
     }