Polish micrometer-metricsgh-3625

See micrometer-metricsgh-3625
izeye · May 27, 2023 · ec4746a · ec4746a
1 parent 2fafb3d
commit ec4746a
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 100 deletions.
diff --git a/...ations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java b/...ations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpConfig.java
@@ -94,7 +94,7 @@ default Map<String, String> resourceAttributes() {
      * {@link AggregationTemporality} of the OtlpMeterRegistry. This determines whether
      * the meters should be cumulative(AGGREGATION_TEMPORALITY_CUMULATIVE) or
      * step/delta(AGGREGATION_TEMPORALITY_DELTA).
-     * @return the aggregationTemporality for OtlpRegistry
+     * @return the aggregationTemporality for OtlpMeterRegistry
      * @see <a href=
      * "https://opentelemetry.io/docs/reference/specification/metrics/data-model/#temporality">OTLP
      * Temporality</a>

diff --git a/...micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java b/...micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpMeterRegistry.java
@@ -104,7 +104,7 @@ private OtlpMeterRegistry(OtlpConfig config, Clock clock, HttpSender httpSender)
         this.resource = Resource.newBuilder().addAllAttributes(getResourceAttributes()).build();
         this.otlpAggregationTemporality = AggregationTemporality
             .toOtlpAggregationTemporality(config.aggregationTemporality());
-        this.setDeltaAggregationTimeUnixNano();
+        setDeltaAggregationTimeUnixNano();
         config().namingConvention(NamingConvention.dot);
         start(DEFAULT_THREAD_FACTORY);
     }
@@ -131,7 +131,7 @@ public void stop() {
     @Override
     protected void publish() {
         if (isDelta()) {
-            this.setDeltaAggregationTimeUnixNano();
+            setDeltaAggregationTimeUnixNano();
         }
         for (List<Meter> batch : MeterPartition.partition(this, config.batchSize())) {
             List<Metric> metrics = batch.stream()

diff --git a/...-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepDistributionSummary.java b/...-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepDistributionSummary.java
@@ -33,14 +33,14 @@ class OtlpStepDistributionSummary extends AbstractDistributionSummary {
     private final StepMax max;
 
     /**
-     * Create a new {@code StepDistributionSummary}.
+     * Create a new {@code OtlpStepDistributionSummary}.
      * @param id ID
      * @param clock clock
-     * @param distributionStatisticConfig distribution static configuration
+     * @param distributionStatisticConfig distribution statistic configuration
      * @param scale scale
      * @param stepMillis step in milliseconds
      */
-    public OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
+    OtlpStepDistributionSummary(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
             double scale, long stepMillis) {
         super(id, scale, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
                 AggregationTemporality.DELTA, stepMillis));

diff --git a/...ons/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepTimer.java b/...ons/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpStepTimer.java
@@ -35,15 +35,15 @@ class OtlpStepTimer extends AbstractTimer {
     private final StepMax max;
 
     /**
-     * Create a new {@code StepTimer}.
+     * Create a new {@code OtlpStepTimer}.
      * @param id ID
      * @param clock clock
      * @param distributionStatisticConfig distribution statistic configuration
      * @param pauseDetector pause detector
      * @param baseTimeUnit base time unit
      * @param stepDurationMillis step in milliseconds
      */
-    public OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
+    OtlpStepTimer(Id id, Clock clock, DistributionStatisticConfig distributionStatisticConfig,
             PauseDetector pauseDetector, TimeUnit baseTimeUnit, long stepDurationMillis) {
         super(id, clock, pauseDetector, baseTimeUnit, OtlpMeterRegistry.getHistogram(clock, distributionStatisticConfig,
                 AggregationTemporality.DELTA, stepDurationMillis));

diff --git a/...ns/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpConfigTest.java b/...ns/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpConfigTest.java
@@ -118,22 +118,22 @@ void aggregationTemporalityDefault() {
         assertThat(otlpConfig.validate().isValid()).isTrue();
         assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);
 
-        properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.toString());
+        properties.put("otlp.aggregationTemporality", AggregationTemporality.CUMULATIVE.name());
         assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.CUMULATIVE);
     }
 
     @Test
     void aggregationTemporalityDelta() {
         Map<String, String> properties = new HashMap<>();
-        properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.toString());
+        properties.put("otlp.aggregationTemporality", AggregationTemporality.DELTA.name());
 
         OtlpConfig otlpConfig = properties::get;
         assertThat(otlpConfig.validate().isValid()).isTrue();
         assertThat(otlpConfig.aggregationTemporality()).isSameAs(AggregationTemporality.DELTA);
     }
 
     @Test
-    void inValidAggregationTemporalityShouldBeCaptured() {
+    void invalidAggregationTemporalityShouldBeCaptured() {
         Map<String, String> properties = new HashMap<>();
         properties.put("otlp.aggregationTemporality", "some_random_thing");
 

diff --git a/...istry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java b/...istry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java
@@ -505,7 +505,7 @@ void longTaskTimer() {
     void testMetricsStartAndEndTime() {
         Counter counter = Counter.builder("test_publish_time").register(registry);
         final long startTime = ((StartTimeAwareMeter) counter).getStartTimeNanos();
-        Function<Meter, NumberDataPoint> getDataPoint = (Meter meter) -> writeToMetric(meter).getSum().getDataPoints(0);
+        Function<Meter, NumberDataPoint> getDataPoint = (meter) -> writeToMetric(meter).getSum().getDataPoints(0);
         assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(startTime);
         assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(1000000L);
         clock.addSeconds(59);