Skip to content

Commit 6cd90c9

Browse files
Merge pull request #77 from onobc/cbono-update-configprops-prefix
Update the PrometheusRSocketClientProperties prefix
2 parents acd6f84 + aada12b commit 6cd90c9

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ or
6565
This will autoconfigure the Micrometer `PrometheusMeterRegistry`, a `PrometheusRSocketClient`, and a call to `pushAndClose` on application shutdown. The client will be configured to retry failing connections to the proxy. Retrying can be tuned with:
6666

6767
```yml
68-
management.metrics.export.prometheus.rsocket:
68+
micrometer.prometheus.rsocket:
6969
host: YOURPROXYHOSTHERE #required
7070
port: 7001
7171
max-retries: 10000 # default is Long.MAX_VALUE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@AutoConfiguration
3232
@AutoConfigureAfter(PrometheusMetricsExportAutoConfiguration.class)
3333
@ConditionalOnBean(PrometheusMeterRegistry.class)
34-
@ConditionalOnProperty(prefix = "management.metrics.export.prometheus.rsocket", name = "enabled", havingValue = "true", matchIfMissing = true)
34+
@ConditionalOnProperty(prefix = "micrometer.prometheus.rsocket", name = "enabled", havingValue = "true", matchIfMissing = true)
3535
@EnableConfigurationProperties(PrometheusRSocketClientProperties.class)
3636
public class PrometheusRSocketClientAutoConfiguration {
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import java.time.Duration;
2727

28-
@ConfigurationProperties("management.metrics.export.prometheus.rsocket")
28+
@ConfigurationProperties("micrometer.prometheus.rsocket")
2929
public class PrometheusRSocketClientProperties {
3030

3131
/**

starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketClientAutoConfigurationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ void prometheusRSocketClientTcp() {
6969

7070
contextRunner
7171
.withPropertyValues(
72-
"management.metrics.export.prometheus.rsocket.port=" + port,
73-
"management.metrics.export.prometheus.rsocket.transport=tcp"
72+
"micrometer.prometheus.rsocket.port=" + port,
73+
"micrometer.prometheus.rsocket.transport=tcp"
7474
)
7575
.run(context -> {
7676
latch.await(5, TimeUnit.SECONDS);
@@ -87,8 +87,8 @@ void prometheusRSocketClientWebsocket() {
8787

8888
contextRunner
8989
.withPropertyValues(
90-
"management.metrics.export.prometheus.rsocket.port=" + port,
91-
"management.metrics.export.prometheus.rsocket.transport=websocket"
90+
"micrometer.prometheus.rsocket.port=" + port,
91+
"micrometer.prometheus.rsocket.transport=websocket"
9292
)
9393
.run(context -> {
9494
latch.await(5, TimeUnit.SECONDS);

0 commit comments

Comments
 (0)