Skip to content

Commit 0e89da2

Browse files
committed
Address PR comments
Signed-off-by: Thomas Vitale <[email protected]>
1 parent 771eac8 commit 0e89da2

File tree

3 files changed

+3
-62
lines changed

3 files changed

+3
-62
lines changed

module/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/metrics/OpenTelemetryMetricsAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.beans.factory.ObjectProvider;
3030
import org.springframework.boot.autoconfigure.AutoConfiguration;
3131
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
32-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3332
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3433
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3534
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -50,7 +49,6 @@ public final class OpenTelemetryMetricsAutoConfiguration {
5049

5150
@Bean
5251
@ConditionalOnMissingBean
53-
@ConditionalOnBean({ Clock.class, Resource.class })
5452
SdkMeterProvider meterProvider(Clock clock, ExemplarFilter exemplarFilter,
5553
OpenTelemetryMetricsProperties properties, Resource resource,
5654
ObjectProvider<SdkMeterProviderBuilderCustomizer> customizers) {
@@ -80,7 +78,6 @@ ExemplarFilter exemplarFilter(OpenTelemetryMetricsProperties properties) {
8078

8179
@Bean
8280
@ConditionalOnMissingBean
83-
@ConditionalOnBean(OpenTelemetry.class)
8481
Meter meter(OpenTelemetry openTelemetry) {
8582
return openTelemetry.getMeter(INSTRUMENTATION_SCOPE_NAME);
8683
}

module/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/metrics/OpenTelemetryMetricsProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ public class OpenTelemetryMetricsProperties {
3535
/**
3636
* Maximum number of distinct points per metric.
3737
*/
38-
private Integer cardinalityLimit = 2000;
38+
private int cardinalityLimit = 2000;
3939

4040
public Exemplars getExemplars() {
4141
return this.exemplars;
4242
}
4343

44-
public Integer getCardinalityLimit() {
44+
public int getCardinalityLimit() {
4545
return this.cardinalityLimit;
4646
}
4747

48-
public void setCardinalityLimit(Integer cardinalityLimit) {
48+
public void setCardinalityLimit(int cardinalityLimit) {
4949
this.cardinalityLimit = cardinalityLimit;
5050
}
5151

module/spring-boot-opentelemetry/src/test/java/org/springframework/boot/opentelemetry/autoconfigure/metrics/OpenTelemetryMetricsPropertiesTests.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)