Autowire client observation convention if available

Fixes #295

Author: dsyer

spring-grpc-client-spring-boot-autoconfigure/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.grpc.client.autoconfigure;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -24,11 +25,11 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.grpc.client.GlobalClientInterceptor;
 
+import io.micrometer.core.instrument.binder.grpc.GrpcClientObservationConvention;
 import io.micrometer.core.instrument.binder.grpc.ObservationGrpcClientInterceptor;
 import io.micrometer.observation.ObservationRegistry;
 
-@AutoConfiguration(
-		afterName = "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration")
+@AutoConfiguration(afterName = "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration")
 @ConditionalOnGrpcClientEnabled
 @ConditionalOnClass({ ObservationRegistry.class, ObservationGrpcClientInterceptor.class })
 @ConditionalOnBean(ObservationRegistry.class)
@@ -39,8 +40,13 @@ public final class GrpcClientObservationAutoConfiguration {
 	@Bean
 	@GlobalClientInterceptor
 	@ConditionalOnMissingBean
-	ObservationGrpcClientInterceptor observationGrpcClientInterceptor(ObservationRegistry observationRegistry) {
-		return new ObservationGrpcClientInterceptor(observationRegistry);
+	ObservationGrpcClientInterceptor observationGrpcClientInterceptor(ObservationRegistry observationRegistry,
+			ObjectProvider<GrpcClientObservationConvention> convention) {
+		ObservationGrpcClientInterceptor interceptor = new ObservationGrpcClientInterceptor(observationRegistry);
+		if (convention.getIfAvailable() != null) {
+			interceptor.setCustomConvention(convention.getIfAvailable());
+		}
+		return interceptor;
 	}
 
 }

spring-grpc-client-spring-boot-autoconfigure/src/test/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientAutoConfigurationTests.java

@@ -63,7 +63,7 @@
  *
  * @author Chris Bono
  */
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({ "unchecked" })
 class GrpcClientAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner() {
@@ -407,7 +407,6 @@ void inProcessChannelFactoryAutoConfiguredWithCustomizers() {
 				builder, InProcessGrpcChannelFactory.class);
 	}
 
-	@SuppressWarnings("unchecked")
 	private <T extends ManagedChannelBuilder<T>> void channelFactoryAutoConfiguredWithCustomizers(
 			ApplicationContextRunner contextRunner, ManagedChannelBuilder<T> mockChannelBuilder,
 			Class<?> expectedChannelFactoryType) {