Skip to content

Commit c17d2d6

Browse files
authored
Merge pull request quarkusio#49360 from mcruzdev/issue-48292
Introduce quarkus.micrometer.binder.enable-all property
2 parents ae0ff2b + 853e8bd commit c17d2d6

File tree

15 files changed

+319
-19
lines changed

15 files changed

+319
-19
lines changed

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/GrpcBinderProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static class GrpcClientSupportEnabled implements BooleanSupplier {
2727

2828
public boolean getAsBoolean() {
2929
return QuarkusClassLoader.isClassPresentAtRuntime(CLIENT_INTERCEPTOR)
30-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().grpcClient());
30+
&& mConfig.isEnabled(mConfig.binder().grpcClient());
3131
}
3232
}
3333

@@ -36,7 +36,7 @@ static class GrpcServerSupportEnabled implements BooleanSupplier {
3636

3737
public boolean getAsBoolean() {
3838
return QuarkusClassLoader.isClassPresentAtRuntime(SERVER_INTERCEPTOR)
39-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().grpcServer());
39+
&& mConfig.isEnabled(mConfig.binder().grpcServer());
4040
}
4141
}
4242

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ static class HttpServerBinderEnabled implements BooleanSupplier {
3939
MicrometerConfig mConfig;
4040

4141
public boolean getAsBoolean() {
42-
return mConfig.checkBinderEnabledWithDefault(mConfig.binder().vertx())
43-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().httpServer());
42+
return mConfig.isEnabled(mConfig.binder().vertx())
43+
&& mConfig.isEnabled(mConfig.binder().httpServer());
4444
}
4545
}
4646

@@ -49,7 +49,7 @@ static class HttpClientBinderEnabled implements BooleanSupplier {
4949

5050
public boolean getAsBoolean() {
5151
return QuarkusClassLoader.isClassPresentAtRuntime(REST_CLIENT_REQUEST_FILTER)
52-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().httpClient());
52+
&& mConfig.isEnabled(mConfig.binder().httpClient());
5353
}
5454
}
5555

@@ -59,8 +59,8 @@ SyntheticBeanBuildItem enableHttpBinders(MicrometerRecorder recorder,
5959
MicrometerConfig buildTimeConfig,
6060
BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
6161

62-
boolean clientEnabled = buildTimeConfig.checkBinderEnabledWithDefault(buildTimeConfig.binder().httpClient());
63-
boolean serverEnabled = buildTimeConfig.checkBinderEnabledWithDefault(buildTimeConfig.binder().httpServer());
62+
boolean clientEnabled = buildTimeConfig.isEnabled(buildTimeConfig.binder().httpClient());
63+
boolean serverEnabled = buildTimeConfig.isEnabled(buildTimeConfig.binder().httpServer());
6464

6565
if (clientEnabled || serverEnabled) {
6666
// Protect from uri tag flood

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/KafkaBinderProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ static class KafkaSupportEnabled implements BooleanSupplier {
2727
MicrometerConfig mConfig;
2828

2929
public boolean getAsBoolean() {
30-
return KAFKA_CONSUMER_CLASS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().kafka());
30+
return KAFKA_CONSUMER_CLASS_CLASS != null && mConfig.isEnabled(mConfig.binder().kafka());
3131
}
3232
}
3333

3434
static class KafkaStreamsSupportEnabled implements BooleanSupplier {
3535
MicrometerConfig mConfig;
3636

3737
public boolean getAsBoolean() {
38-
return KAFKA_STREAMS_CLASS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().kafka());
38+
return KAFKA_STREAMS_CLASS_CLASS != null && mConfig.isEnabled(mConfig.binder().kafka());
3939
}
4040
}
4141

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/NettyBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Class<?> metricsClass() {
5151

5252
public boolean getAsBoolean() {
5353
return metricsClass() != null && getCheckClass() != null
54-
&& getMicrometerConfig().checkBinderEnabledWithDefault(getMicrometerConfig().binder().netty());
54+
&& getMicrometerConfig().isEnabled(getMicrometerConfig().binder().netty());
5555
}
5656
}
5757

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/ReactiveMessagingProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ static class ReactiveMessagingSupportEnabled implements BooleanSupplier {
1919

2020
public boolean getAsBoolean() {
2121
return MESSAGE_OBSERVATION_COLLECTOR_CLASS != null &&
22-
mConfig.checkBinderEnabledWithDefault(mConfig.binder().messaging());
22+
mConfig.isEnabled(mConfig.binder().messaging());
2323
}
2424
}
2525

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/RedisBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static class RedisMetricsSupportEnabled implements BooleanSupplier {
1818
MicrometerConfig mConfig;
1919

2020
public boolean getAsBoolean() {
21-
return OBSERVABLE_CLIENT_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().redis());
21+
return OBSERVABLE_CLIENT_CLASS != null && mConfig.isEnabled(mConfig.binder().redis());
2222
}
2323
}
2424

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/StorkBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static class StorkMetricsSupportEnabled implements BooleanSupplier {
1818
MicrometerConfig mConfig;
1919

2020
public boolean getAsBoolean() {
21-
return OBSERVABLE_CLIENT_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().stork());
21+
return OBSERVABLE_CLIENT_CLASS != null && mConfig.isEnabled(mConfig.binder().stork());
2222
}
2323
}
2424

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static class VertxBinderEnabled implements BooleanSupplier {
3333
MicrometerConfig mConfig;
3434

3535
public boolean getAsBoolean() {
36-
return METRIC_OPTIONS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().vertx());
36+
return METRIC_OPTIONS_CLASS != null && mConfig.isEnabled(mConfig.binder().vertx());
3737
}
3838
}
3939

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VirtualThreadBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static class VirtualThreadSupportEnabled implements BooleanSupplier {
2424

2525
public boolean getAsBoolean() {
2626
return VIRTUAL_THREAD_BINDER_CLASS != null // The binder is in another Micrometer artifact
27-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().virtualThreads());
27+
&& mConfig.isEnabled(mConfig.binder().virtualThreads());
2828
}
2929
}
3030

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/mpmetrics/MicroprofileMetricsProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static class MicroprofileMetricsEnabled implements BooleanSupplier {
5353
MicrometerConfig mConfig;
5454

5555
public boolean getAsBoolean() {
56-
return METRIC_ANNOTATION_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().mpMetrics());
56+
return METRIC_ANNOTATION_CLASS != null && mConfig.isEnabled(mConfig.binder().mpMetrics());
5757
}
5858
}
5959

0 commit comments

Comments
 (0)