Skip to content

Commit 9c4fc9b

Browse files
smsteeless047890
andauthored
Client autoconfiguration should be conditional on PrometheusMeterRegistry bean (#37)
* exclude client autoconfiguration from proxy Co-authored-by: ss047890 <[email protected]>
1 parent 666f53f commit 9c4fc9b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

proxy/src/main/java/io/micrometer/prometheus/rsocket/PrometheusRSocketProxyMain.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
package io.micrometer.prometheus.rsocket;
1717

1818
import io.micrometer.prometheus.rsocket.autoconfigure.EnablePrometheusRSocketProxyServer;
19+
import io.micrometer.prometheus.rsocket.autoconfigure.PrometheusRSocketClientAutoConfiguration;
1920
import org.springframework.boot.SpringApplication;
2021
import org.springframework.boot.autoconfigure.SpringBootApplication;
2122

22-
@SpringBootApplication
23+
@SpringBootApplication(exclude = PrometheusRSocketClientAutoConfiguration.class)
2324
@EnablePrometheusRSocketProxyServer
2425
public class PrometheusRSocketProxyMain {
2526
public static void main(String[] args) {

starter-spring/src/main/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.micrometer.prometheus.rsocket.PrometheusRSocketClient;
2121
import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
2222
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
23-
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
23+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -30,7 +30,7 @@
3030

3131
@Configuration
3232
@AutoConfigureAfter(PrometheusMetricsExportAutoConfiguration.class)
33-
@ConditionalOnClass(PrometheusMeterRegistry.class)
33+
@ConditionalOnBean(PrometheusMeterRegistry.class)
3434
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus.rsocket", name = "enabled", havingValue = "true", matchIfMissing = true)
3535
@EnableConfigurationProperties(PrometheusRSocketClientProperties.class)
3636
public class PrometheusRSocketClientAutoConfiguration {

0 commit comments

Comments
 (0)