Merge branch 'master' into feature/log-call-credential-selection

Author: yidongnan

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/autoconfigure/GrpcClientAutoConfiguration.java

@@ -35,6 +35,7 @@
 import io.grpc.DecompressorRegistry;
 import io.grpc.NameResolverProvider;
 import io.grpc.NameResolverRegistry;
+import lombok.extern.slf4j.Slf4j;
 import net.devh.boot.grpc.client.channelfactory.GrpcChannelConfigurer;
 import net.devh.boot.grpc.client.channelfactory.GrpcChannelFactory;
 import net.devh.boot.grpc.client.channelfactory.InProcessChannelFactory;
@@ -55,8 +56,8 @@
  * The auto configuration used by Spring-Boot that contains all beans to create and inject grpc clients into beans.
  *
  * @author Michael ([email protected])
- * @since 5/17/16
  */
+@Slf4j
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @AutoConfigureAfter(name = "org.springframework.cloud.client.CommonsClientAutoConfiguration",
@@ -112,7 +113,7 @@ AnnotationGlobalClientInterceptorConfigurer annotationGlobalClientInterceptorCon
     @Bean
     NameResolverRegistration grpcNameResolverRegistration(
             @Autowired(required = false) final List<NameResolverProvider> nameResolverProviders) {
-        NameResolverRegistration nameResolverRegistration = new NameResolverRegistration(nameResolverProviders);
+        final NameResolverRegistration nameResolverRegistration = new NameResolverRegistration(nameResolverProviders);
         nameResolverRegistration.register(NameResolverRegistry.getDefaultRegistry());
         return nameResolverRegistration;
     }
@@ -141,9 +142,12 @@ List<GrpcChannelConfigurer> defaultChannelConfigurers() {
             "io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder"})
     @Bean
     @Lazy
-    GrpcChannelFactory shadedNettyGrpcChannelFactory(final GrpcChannelsProperties properties,
+    GrpcChannelFactory shadedNettyGrpcChannelFactory(
+            final GrpcChannelsProperties properties,
             final GlobalClientInterceptorRegistry globalClientInterceptorRegistry,
             final List<GrpcChannelConfigurer> channelConfigurers) {
+
+        log.info("Detected grpc-netty-shaded: Creating ShadedNettyChannelFactory + InProcessChannelFactory");
         final ShadedNettyChannelFactory channelFactory =
                 new ShadedNettyChannelFactory(properties, globalClientInterceptorRegistry, channelConfigurers);
         final InProcessChannelFactory inProcessChannelFactory =
@@ -156,9 +160,12 @@ GrpcChannelFactory shadedNettyGrpcChannelFactory(final GrpcChannelsProperties pr
     @ConditionalOnClass(name = {"io.netty.channel.Channel", "io.grpc.netty.NettyChannelBuilder"})
     @Bean
     @Lazy
-    GrpcChannelFactory nettyGrpcChannelFactory(final GrpcChannelsProperties properties,
+    GrpcChannelFactory nettyGrpcChannelFactory(
+            final GrpcChannelsProperties properties,
             final GlobalClientInterceptorRegistry globalClientInterceptorRegistry,
             final List<GrpcChannelConfigurer> channelConfigurers) {
+
+        log.info("Detected grpc-netty: Creating NettyChannelFactory + InProcessChannelFactory");
         final NettyChannelFactory channelFactory =
                 new NettyChannelFactory(properties, globalClientInterceptorRegistry, channelConfigurers);
         final InProcessChannelFactory inProcessChannelFactory =
@@ -170,9 +177,12 @@ GrpcChannelFactory nettyGrpcChannelFactory(final GrpcChannelsProperties properti
     @ConditionalOnMissingBean(GrpcChannelFactory.class)
     @Bean
     @Lazy
-    GrpcChannelFactory inProcessGrpcChannelFactory(final GrpcChannelsProperties properties,
+    GrpcChannelFactory inProcessGrpcChannelFactory(
+            final GrpcChannelsProperties properties,
             final GlobalClientInterceptorRegistry globalClientInterceptorRegistry,
             final List<GrpcChannelConfigurer> channelConfigurers) {
+
+        log.warn("Could not find a GrpcChannelFactory on the classpath: Creating InProcessChannelFactory as fallback");
         return new InProcessChannelFactory(properties, globalClientInterceptorRegistry, channelConfigurers);
     }
 

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcServerFactoryAutoConfiguration.java

@@ -28,6 +28,7 @@
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
+import lombok.extern.slf4j.Slf4j;
 import net.devh.boot.grpc.server.condition.ConditionalOnInterprocessServer;
 import net.devh.boot.grpc.server.config.GrpcServerProperties;
 import net.devh.boot.grpc.server.serverfactory.GrpcServerConfigurer;
@@ -45,6 +46,7 @@
  *
  * @author Daniel Theuke ([email protected])
  */
+@Slf4j
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnMissingBean({GrpcServerFactory.class, GrpcServerLifecycle.class})
 @AutoConfigureAfter(GrpcServerAutoConfiguration.class)
@@ -63,8 +65,12 @@ public class GrpcServerFactoryAutoConfiguration {
             "io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder"})
     @Conditional(ConditionalOnInterprocessServer.class)
     @Bean
-    public ShadedNettyGrpcServerFactory shadedNettyGrpcServerFactory(final GrpcServerProperties properties,
-            final GrpcServiceDiscoverer serviceDiscoverer, final List<GrpcServerConfigurer> serverConfigurers) {
+    public ShadedNettyGrpcServerFactory shadedNettyGrpcServerFactory(
+            final GrpcServerProperties properties,
+            final GrpcServiceDiscoverer serviceDiscoverer,
+            final List<GrpcServerConfigurer> serverConfigurers) {
+
+        log.info("Detected grpc-netty-shaded: Creating ShadedNettyGrpcServerFactory");
         final ShadedNettyGrpcServerFactory factory = new ShadedNettyGrpcServerFactory(properties, serverConfigurers);
         for (final GrpcServiceDefinition service : serviceDiscoverer.findGrpcServices()) {
             factory.addService(service);
@@ -80,7 +86,7 @@ public ShadedNettyGrpcServerFactory shadedNettyGrpcServerFactory(final GrpcServe
      */
     @ConditionalOnBean(ShadedNettyGrpcServerFactory.class)
     @Bean
-    public GrpcServerLifecycle shadedNettyGrpcServerLifecycle(ShadedNettyGrpcServerFactory factory) {
+    public GrpcServerLifecycle shadedNettyGrpcServerLifecycle(final ShadedNettyGrpcServerFactory factory) {
         return new GrpcServerLifecycle(factory);
     }
 
@@ -97,8 +103,12 @@ public GrpcServerLifecycle shadedNettyGrpcServerLifecycle(ShadedNettyGrpcServerF
     @Conditional(ConditionalOnInterprocessServer.class)
     @ConditionalOnClass(name = {"io.netty.channel.Channel", "io.grpc.netty.NettyServerBuilder"})
     @Bean
-    public NettyGrpcServerFactory nettyGrpcServerFactory(final GrpcServerProperties properties,
-            final GrpcServiceDiscoverer serviceDiscoverer, final List<GrpcServerConfigurer> serverConfigurers) {
+    public NettyGrpcServerFactory nettyGrpcServerFactory(
+            final GrpcServerProperties properties,
+            final GrpcServiceDiscoverer serviceDiscoverer,
+            final List<GrpcServerConfigurer> serverConfigurers) {
+
+        log.info("Detected grpc-netty: Creating NettyGrpcServerFactory");
         final NettyGrpcServerFactory factory = new NettyGrpcServerFactory(properties, serverConfigurers);
         for (final GrpcServiceDefinition service : serviceDiscoverer.findGrpcServices()) {
             factory.addService(service);
@@ -127,8 +137,11 @@ public GrpcServerLifecycle nettyGrpcServerLifecycle(final NettyGrpcServerFactory
      */
     @ConditionalOnProperty(prefix = "grpc.server", name = "in-process-name")
     @Bean
-    public InProcessGrpcServerFactory inProcessGrpcServerFactory(final GrpcServerProperties properties,
+    public InProcessGrpcServerFactory inProcessGrpcServerFactory(
+            final GrpcServerProperties properties,
             final GrpcServiceDiscoverer serviceDiscoverer) {
+
+        log.info("'grpc.server.in-process-name' is set: Creating InProcessGrpcServerFactory");
         final InProcessGrpcServerFactory factory = new InProcessGrpcServerFactory(properties);
         for (final GrpcServiceDefinition service : serviceDiscoverer.findGrpcServices()) {
             factory.addService(service);