Skip to content

Commit 996f51c

Browse files
committed
Fix classNotFoundException when using old version of io.micrometer:micrometer-core
1 parent 9495d5e commit 996f51c

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2222
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
24+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2425
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2526
import org.springframework.context.annotation.Configuration;
2627
import org.springframework.core.annotation.Order;
@@ -40,6 +41,7 @@
4041
@AutoConfigureAfter(CompositeMeterRegistryAutoConfiguration.class)
4142
@AutoConfigureBefore(GrpcClientAutoConfiguration.class)
4243
@ConditionalOnBean(MeterRegistry.class)
44+
@ConditionalOnClass(MetricCollectingClientInterceptor.class)
4345
public class GrpcClientMetricAutoConfiguration {
4446

4547
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3333
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
35+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3536
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3637
import org.springframework.context.annotation.Bean;
3738
import org.springframework.context.annotation.Configuration;
@@ -58,6 +59,7 @@
5859
@AutoConfigureAfter(CompositeMeterRegistryAutoConfiguration.class)
5960
@AutoConfigureBefore(GrpcServerAutoConfiguration.class)
6061
@ConditionalOnBean(MeterRegistry.class)
62+
@ConditionalOnClass(MetricCollectingServerInterceptor.class)
6163
public class GrpcServerMetricAutoConfiguration {
6264

6365
@GrpcGlobalServerInterceptor

0 commit comments

Comments
 (0)