Merge branch '1.10.x' into 1.11.x

micrometer-metrics · Sep 11, 2023 · 33c4414 · 33c4414
2 parents 209cc10 + e6e61b0
commit 33c4414
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/...icrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusTimer.java b/...icrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusTimer.java
@@ -94,7 +94,7 @@ protected void recordNonNegative(long amount, TimeUnit unit) {
         max.record(nanoAmount, TimeUnit.NANOSECONDS);
 
         if (histogram != null) {
-            histogram.recordLong(TimeUnit.NANOSECONDS.convert(amount, unit));
+            histogram.recordLong(nanoAmount);
         }
     }
 

diff --git a/...meter-core/src/main/java/io/micrometer/core/instrument/binder/logging/LogbackMetrics.java b/...meter-core/src/main/java/io/micrometer/core/instrument/binder/logging/LogbackMetrics.java
@@ -206,7 +206,7 @@ public FilterReply decide(Marker marker, Logger logger, Level level, String form
         // and can return immediately and
         // avoid the relatively expensive ThreadLocal access below. See also logbacks
         // Logger.callTurboFilters().
-        // Calling logger.isEnabledFor(level) might be sub-optimal since it cals this
+        // Calling logger.isEnabledFor(level) might be sub-optimal since it calls this
         // filter again. This behavior caused a StackOverflowError in the past.
         if (format == null || !level.isGreaterOrEqual(logger.getEffectiveLevel())) {
             return FilterReply.NEUTRAL;

diff --git a/...ain/java/io/micrometer/core/instrument/distribution/TimeWindowFixedBoundaryHistogram.java b/...ain/java/io/micrometer/core/instrument/distribution/TimeWindowFixedBoundaryHistogram.java
@@ -118,9 +118,10 @@ void outputSummary(PrintStream printStream, double bucketScaling) {
 
         String bucketFormatString = "%14.1f %10d\n";
 
+        FixedBoundaryHistogram currentHistogram = currentHistogram();
         for (int i = 0; i < buckets.length; i++) {
             printStream.format(Locale.US, bucketFormatString, buckets[i] / bucketScaling,
-                    currentHistogram().values.get(i));
+                    currentHistogram.values.get(i));
         }
 
         printStream.write('\n');

diff --git a/...ometer-core/src/main/java/io/micrometer/core/instrument/step/StepDistributionSummary.java b/...ometer-core/src/main/java/io/micrometer/core/instrument/step/StepDistributionSummary.java
@@ -47,7 +47,7 @@ public class StepDistributionSummary extends AbstractDistributionSummary impleme
      * Create a new {@code StepDistributionSummary}.
      * @param id ID
      * @param clock clock
-     * @param distributionStatisticConfig distribution static configuration
+     * @param distributionStatisticConfig distribution statistic configuration
      * @param scale scale
      * @param stepMillis step in milliseconds
      * @param supportsAggregablePercentiles whether it supports aggregable percentiles
@@ -77,7 +77,7 @@ protected StepDistributionSummary(Id id, Clock clock, DistributionStatisticConfi
 
     @Override
     protected void recordNonNegative(double amount) {
-        count.add(1);
+        count.add(1L);
         total.add(amount);
         max.record(amount);
     }

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepTimer.java
@@ -78,7 +78,7 @@ protected StepTimer(final Id id, final Clock clock, final DistributionStatisticC
     @Override
     protected void recordNonNegative(final long amount, final TimeUnit unit) {
         final long nanoAmount = (long) TimeUtils.convert(amount, unit, TimeUnit.NANOSECONDS);
-        count.add(1);
+        count.add(1L);
         total.add(nanoAmount);
         max.record(nanoAmount);
     }