Skip to content

Commit ec4746a

Browse files
committed
1 parent 2fafb3d commit ec4746a

File tree

8 files changed

+108
-100
lines changed

8 files changed

+108
-100
lines changed

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ default Map<String, String> resourceAttributes() {
9494
* {@link AggregationTemporality} of the OtlpMeterRegistry. This determines whether
9595
* the meters should be cumulative(AGGREGATION_TEMPORALITY_CUMULATIVE) or
9696
* step/delta(AGGREGATION_TEMPORALITY_DELTA).
97-
* @return the aggregationTemporality for OtlpRegistry
97+
* @return the aggregationTemporality for OtlpMeterRegistry
9898
* @see <a href=
9999
* "https://opentelemetry.io/docs/reference/specification/metrics/data-model/#temporality">OTLP
100100
* Temporality</a>

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private OtlpMeterRegistry(OtlpConfig config, Clock clock, HttpSender httpSender)
104104
this.resource = Resource.newBuilder().addAllAttributes(getResourceAttributes()).build();
105105
this.otlpAggregationTemporality = AggregationTemporality
106106
.toOtlpAggregationTemporality(config.aggregationTemporality());
107-
this.setDeltaAggregationTimeUnixNano();
107+
setDeltaAggregationTimeUnixNano();
108108
config().namingConvention(NamingConvention.dot);
109109
start(DEFAULT_THREAD_FACTORY);
110110
}
@@ -131,7 +131,7 @@ public void stop() {
131131
@Override
132132
protected void publish() {
133133
if (isDelta()) {
134-
this.setDeltaAggregationTimeUnixNano();
134+
setDeltaAggregationTimeUnixNano();
135135
}
136136
for (List<Meter> batch : MeterPartition.partition(this, config.batchSize())) {
137137
List<Metric> metrics = batch.stream()

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepDistributionSummary.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ class OtlpStepDistributionSummary extends AbstractDistributionSummary {
3333
private final StepMax max;
3434

3535
/**
36-
* Create a new {@code StepDistributionSummary}.
36+
* Create a new {@code OtlpStepDistributionSummary}.
3737
* @param id ID
3838
* @param clock clock
39-
* @param distributionStatisticConfig distribution static configuration
39+
* @param distributionStatisticConfig distribution statistic configuration
4040
* @param scale scale
4141
* @param stepMillis step in milliseconds
4242
*/
43-
public OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
43+
OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
4444
double scale, long stepMillis) {
4545
super(id, scale, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
4646
AggregationTemporality.DELTA, stepMillis));

implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepTimer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class OtlpStepTimer extends AbstractTimer {
3535
private final StepMax max;
3636

3737
/**
38-
* Create a new {@code StepTimer}.
38+
* Create a new {@code OtlpStepTimer}.
3939
* @param id ID
4040
* @param clock clock
4141
* @param distributionStatisticConfig distribution statistic configuration
4242
* @param pauseDetector pause detector
4343
* @param baseTimeUnit base time unit
4444
* @param stepDurationMillis step in milliseconds
4545
*/
46-
public OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
46+
OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
4747
PauseDetector pauseDetector, TimeUnit baseTimeUnit, long stepDurationMillis) {
4848
super(id, clock, pauseDetector, baseTimeUnit, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
4949
AggregationTemporality.DELTA, stepDurationMillis));

implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpConfigTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,22 @@ void aggregationTemporalityDefault() {
118118
assertThat(otlpConfig.validate().isValid()).isTrue();
119119
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);
120120

121-
properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.toString());
121+
properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.name());
122122
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);
123123
}
124124

125125
@Test
126126
void aggregationTemporalityDelta() {
127127
Map<String, String> properties = new HashMap<>();
128-
properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.toString());
128+
properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.name());
129129

130130
OtlpConfig otlpConfig = properties::get;
131131
assertThat(otlpConfig.validate().isValid()).isTrue();
132132
assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.DELTA);
133133
}
134134

135135
@Test
136-
void inValidAggregationTemporalityShouldBeCaptured() {
136+
void invalidAggregationTemporalityShouldBeCaptured() {
137137
Map<String, String> properties = new HashMap<>();
138138
properties.put("otlp.aggregationTemporality", "some_random_thing");
139139

implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ void longTaskTimer() {
505505
void testMetricsStartAndEndTime() {
506506
Counter counter = Counter.builder("test_publish_time").register(registry);
507507
final long startTime = ((StartTimeAwareMeter) counter).getStartTimeNanos();
508-
Function<Meter, NumberDataPoint> getDataPoint = (Meter meter) -> writeToMetric(meter).getSum().getDataPoints(0);
508+
Function<Meter, NumberDataPoint> getDataPoint = (meter) -> writeToMetric(meter).getSum().getDataPoints(0);
509509
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(startTime);
510510
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(1000000L);
511511
clock.addSeconds(59);

0 commit comments

Comments
 (0)