#1: Autoconfigure metric registry support

- rename metric to observation
- new condition changes

Signed-off-by: Sunny <hmtang@gmail.com>
[resolves #1]

Author: hmtang

spring-grpc-core/pom.xml

@@ -67,19 +67,13 @@
 			<artifactId>grpc-stub</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 
-
 	</dependencies>
 
 

spring-grpc-spring-boot-autoconfigure/pom.xml

@@ -75,6 +75,16 @@
 			<artifactId>spring-boot-starter</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-observation</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 
 		<!-- test dependencies -->
 		<dependency>

spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerMetricAutoConfiguration.java renamed to spring-grpc-spring-boot-autoconfigure/src/main/java/org/springframework/grpc/autoconfigure/server/GrpcServerObservationAutoConfiguration.java

@@ -7,13 +7,16 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.grpc.server.ServerBuilderCustomizer;
 
-@AutoConfiguration
-@ConditionalOnClass(ObservationGrpcServerInterceptor.class)
+@AutoConfiguration(
+		afterName = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
+@ConditionalOnClass(value = { ObservationRegistry.class, ObservationGrpcServerInterceptor.class })
 @ConditionalOnBean(ObservationRegistry.class)
-public class GrpcServerMetricAutoConfiguration {
+@ConditionalOnProperty(value = "spring.grpc.server.observation.enabled", matchIfMissing = true)
+public class GrpcServerObservationAutoConfiguration {
 
 	@Bean
 	public ServerInterceptor observationGrpcServerInterceptor(ObservationRegistry observationRegistry) {

spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/server/GrpcServerMetricAutoConfigurationTests.java renamed to spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/server/GrpcServerObservationAutoConfigurationTests.java

@@ -2,7 +2,6 @@
 
 import io.grpc.ServerBuilder;
 import io.grpc.ServerInterceptor;
-import io.micrometer.core.instrument.binder.grpc.ObservationGrpcServerInterceptor;
 import io.micrometer.observation.ObservationRegistry;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -11,20 +10,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class GrpcServerMetricAutoConfigurationTests {
+class GrpcServerObservationAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(GrpcServerMetricAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(GrpcServerObservationAutoConfiguration.class));
 
 	@Test
-	void whenObservationRegistryNotProvided_thenMetricsInterceptorNotConfigured() {
+	void whenObservationRegistryNotProvided_thenObservationInterceptorNotConfigured() {
 		this.contextRunner.run(context -> {
 			assertThat(context).doesNotHaveBean(ServerBuilderCustomizer.class);
 		});
 	}
 
 	@Test
-	void whenMetricsInterceptorConfigured_thenServerBuilderCustomizerConfigured() {
+	void whenObservationInterceptorConfigured_thenServerBuilderCustomizerConfigured() {
 		this.contextRunner.withBean(ObservationRegistry.class, ObservationRegistry::create).run(context -> {
 			assertThat(context).hasSingleBean(ServerBuilderCustomizer.class);
 			assertThat(context).hasSingleBean(ServerInterceptor.class);
@@ -36,4 +35,14 @@ void whenMetricsInterceptorConfigured_thenServerBuilderCustomizerConfigured() {
 		});
 	}
 
+	@Test
+	void whenObservationPropertyDisabled_thenServerBuilderCustomizerNotConfigured() {
+		this.contextRunner.withPropertyValues("spring.grpc.server.observation.enabled=false")
+			.withBean(ObservationRegistry.class, ObservationRegistry::create)
+			.run(context -> {
+				assertThat(context).doesNotHaveBean(ServerBuilderCustomizer.class);
+				assertThat(context).doesNotHaveBean(ServerInterceptor.class);
+			});
+	}
+
 }