Skip to content

Support custom GrpcServerObservationConvention in GrpcServerObservationAutoConfiguration #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
therepanic wants to merge 1 commit into from
Closed

Support custom GrpcServerObservationConvention in GrpcServerObservationAutoConfiguration #390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ...pringframework/boot/grpc/server/autoconfigure/GrpcServerObservationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,18 @@

package org.springframework.boot.grpc.server.autoconfigure;

import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.grpc.server.GlobalServerInterceptor;

import io.micrometer.core.instrument.binder.grpc.GrpcServerObservationConvention;
import io.micrometer.core.instrument.binder.grpc.ObservationGrpcServerInterceptor;
import io.micrometer.core.instrument.kotlin.ObservationCoroutineContextServerInterceptor;
import io.micrometer.observation.ObservationRegistry;
Expand All @@ -35,6 +38,7 @@
* @author Sunny Tang
* @author Chris Bono
* @author Dave Syer
* @author Andrey Litvitski
* @since 1.0.0
*/
@AutoConfiguration(
Expand All @@ -48,8 +52,14 @@ public final class GrpcServerObservationAutoConfiguration {
@Bean
@Order(0)
@GlobalServerInterceptor
ObservationGrpcServerInterceptor observationGrpcServerInterceptor(ObservationRegistry observationRegistry) {
return new ObservationGrpcServerInterceptor(observationRegistry);
@ConditionalOnMissingBean
ObservationGrpcServerInterceptor observationGrpcServerInterceptor(ObservationRegistry observationRegistry,
ObjectProvider<GrpcServerObservationConvention> convention) {
ObservationGrpcServerInterceptor interceptor = new ObservationGrpcServerInterceptor(observationRegistry);
if (convention.getIfAvailable() != null) {
interceptor.setCustomConvention(convention.getIfAvailable());
}
return interceptor;
}

@Configuration(proxyBeanMethods = false)
Expand Down
Loading