From f368ac4805a104407ab5eb0a6ecdef3b697ed837 Mon Sep 17 00:00:00 2001 From: Andrey Litvitski Date: Wed, 25 Mar 2026 20:15:47 +0300 Subject: [PATCH 1/2] Rename GrpcClientObservationConvention parameter to convention See gh-49787 Signed-off-by: Andrey Litvitski --- .../autoconfigure/GrpcClientObservationAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java b/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java index 394b7aabe310..1e7486579d29 100644 --- a/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java +++ b/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java @@ -53,9 +53,9 @@ public final class GrpcClientObservationAutoConfiguration { @GlobalClientInterceptor @ConditionalOnMissingBean ObservationGrpcClientInterceptor grpcClientObservationInterceptor(ObservationRegistry observationRegistry, - ObjectProvider GrpcClientObservationConvention) { + ObjectProvider convention) { ObservationGrpcClientInterceptor interceptor = new ObservationGrpcClientInterceptor(observationRegistry); - GrpcClientObservationConvention.ifAvailable(interceptor::setCustomConvention); + convention.ifAvailable(interceptor::setCustomConvention); return interceptor; } From d7a4561da851cbf7b73b59fd040218d477c6d9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 26 Mar 2026 08:38:42 +0100 Subject: [PATCH 2/2] Harmonize ObservationConvention parameters in gRPC support Such parameters are usually named "customConvention" so this commit aligns to that naming. See gh-49730 --- .../autoconfigure/GrpcClientObservationAutoConfiguration.java | 4 ++-- .../autoconfigure/GrpcServerObservationAutoConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java b/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java index 1e7486579d29..ae7a4ae6ded9 100644 --- a/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java +++ b/module/spring-boot-grpc-client/src/main/java/org/springframework/boot/grpc/client/autoconfigure/GrpcClientObservationAutoConfiguration.java @@ -53,9 +53,9 @@ public final class GrpcClientObservationAutoConfiguration { @GlobalClientInterceptor @ConditionalOnMissingBean ObservationGrpcClientInterceptor grpcClientObservationInterceptor(ObservationRegistry observationRegistry, - ObjectProvider convention) { + ObjectProvider customConvention) { ObservationGrpcClientInterceptor interceptor = new ObservationGrpcClientInterceptor(observationRegistry); - convention.ifAvailable(interceptor::setCustomConvention); + customConvention.ifAvailable(interceptor::setCustomConvention); return interceptor; } diff --git a/module/spring-boot-grpc-server/src/main/java/org/springframework/boot/grpc/server/autoconfigure/GrpcServerObservationAutoConfiguration.java b/module/spring-boot-grpc-server/src/main/java/org/springframework/boot/grpc/server/autoconfigure/GrpcServerObservationAutoConfiguration.java index 6fc6a7527a89..cf5522b4517c 100644 --- a/module/spring-boot-grpc-server/src/main/java/org/springframework/boot/grpc/server/autoconfigure/GrpcServerObservationAutoConfiguration.java +++ b/module/spring-boot-grpc-server/src/main/java/org/springframework/boot/grpc/server/autoconfigure/GrpcServerObservationAutoConfiguration.java @@ -58,9 +58,9 @@ public final class GrpcServerObservationAutoConfiguration { @GlobalServerInterceptor @ConditionalOnMissingBean ObservationGrpcServerInterceptor grpcServerObservationInterceptor(ObservationRegistry observationRegistry, - ObjectProvider convention) { + ObjectProvider customConvention) { ObservationGrpcServerInterceptor interceptor = new ObservationGrpcServerInterceptor(observationRegistry); - convention.ifAvailable(interceptor::setCustomConvention); + customConvention.ifAvailable(interceptor::setCustomConvention); return interceptor; }