Rebase on master

Author: Dave Syer

build.gradle

@@ -186,8 +186,6 @@ allprojects { project ->
             }
         }
 
-        ext['micrometer.version'] = '1.10.3'
-
         ext {
             // not explicitly needed in subprojects, as the BOM for Spring Boot sets this version
             micrometerVersion = dependencyManagement.importedProperties['micrometer.version']

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

@@ -27,7 +27,6 @@
 import io.micrometer.core.instrument.binder.grpc.ObservationGrpcClientInterceptor;
 import io.micrometer.observation.ObservationRegistry;
 import net.devh.boot.grpc.client.interceptor.GrpcGlobalClientInterceptor;
-import net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration;
 import net.devh.boot.grpc.common.util.InterceptorOrder;
 
 /**
@@ -37,8 +36,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "management.tracing.grpc.enabled", matchIfMissing = true)
-@AutoConfigureAfter(value = GrpcCommonTraceAutoConfiguration.class,
-        name = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
+@AutoConfigureAfter(name = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
 @ConditionalOnBean(ObservationRegistry.class)
 public class GrpcClientMicrometerTraceAutoConfiguration {
 

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

@@ -26,7 +26,6 @@
 import io.grpc.ServerInterceptor;
 import io.micrometer.core.instrument.binder.grpc.ObservationGrpcServerInterceptor;
 import io.micrometer.observation.ObservationRegistry;
-import net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration;
 import net.devh.boot.grpc.common.util.InterceptorOrder;
 import net.devh.boot.grpc.server.interceptor.GrpcGlobalServerInterceptor;
 
@@ -37,8 +36,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "management.tracing.grpc.enabled", matchIfMissing = true)
-@AutoConfigureAfter(value = GrpcCommonTraceAutoConfiguration.class,
-        name = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
+@AutoConfigureAfter(name = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
 @ConditionalOnBean(ObservationRegistry.class)
 public class GrpcServerMicrometerTraceAutoConfiguration {
 

tests/src/test/java/net/devh/boot/grpc/test/interceptor/DefaultServerInterceptorTest.java

@@ -34,6 +34,7 @@
 
 import io.grpc.ServerInterceptor;
 import io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor;
+import io.micrometer.core.instrument.binder.grpc.ObservationGrpcServerInterceptor;
 import net.devh.boot.grpc.server.interceptor.GlobalServerInterceptorRegistry;
 import net.devh.boot.grpc.server.scope.GrpcRequestScope;
 import net.devh.boot.grpc.server.security.interceptors.AuthenticatingServerInterceptor;
@@ -63,6 +64,7 @@ void testOrderingOfTheDefaultInterceptors() {
         final List<ServerInterceptor> expected = new ArrayList<>();
         expected.add(this.applicationContext.getBean(GrpcRequestScope.class));
         expected.add(this.applicationContext.getBean(MetricCollectingServerInterceptor.class));
+        expected.add(this.applicationContext.getBean(ObservationGrpcServerInterceptor.class));
         expected.add(this.applicationContext.getBean(ExceptionTranslatingServerInterceptor.class));
         expected.add(this.applicationContext.getBean(AuthenticatingServerInterceptor.class));
         expected.add(this.applicationContext.getBean(AuthorizationCheckingServerInterceptor.class));