Merge branch '1.15.x'

Author: jonatan-ivanov

gradle/libs.versions.toml

@@ -56,7 +56,7 @@ log4j = "2.25.1"
 maven-resolver = "1.9.24"
 mockito5 = "5.18.0"
 mongo = "4.11.5"
-netty = "4.1.122.Final"
+netty = "4.1.123.Final"
 newrelic-api = "5.14.0"
 # Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
 okhttp = "4.11.0"

micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogram.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.core.instrument.distribution;
 
+import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
 import io.micrometer.core.instrument.Clock;
 import org.HdrHistogram.DoubleHistogram;
 import org.HdrHistogram.DoubleRecorder;
@@ -36,6 +37,9 @@
  */
 public class TimeWindowPercentileHistogram extends AbstractTimeWindowHistogram<DoubleRecorder, DoubleHistogram> {
 
+    private static final WarnThenDebugLogger WARN_THEN_DEBUG_LOGGER = new WarnThenDebugLogger(
+            TimeWindowPercentileHistogram.class);
+
     private final DoubleHistogram intervalHistogram;
 
     private final double[] histogramBuckets;
@@ -102,7 +106,12 @@ DoubleHistogram newAccumulatedHistogram(DoubleRecorder[] ringBuffer) {
     @Override
     void accumulate() {
         currentHistogram().getIntervalHistogramInto(intervalHistogram);
-        accumulatedHistogram().add(intervalHistogram);
+        try {
+            accumulatedHistogram().add(intervalHistogram);
+        }
+        catch (ArrayIndexOutOfBoundsException ex) {
+            WARN_THEN_DEBUG_LOGGER.log("Failed to accumulate.", ex);
+        }
     }
 
     @Override

micrometer-core/src/test/java/io/micrometer/core/instrument/DistributionSummaryTest.java

@@ -19,11 +19,15 @@
 import io.micrometer.core.instrument.simple.CountingMode;
 import io.micrometer.core.instrument.simple.SimpleConfig;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.testsupport.system.CapturedOutput;
+import io.micrometer.core.testsupport.system.OutputCaptureExtension;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@ExtendWith(OutputCaptureExtension.class)
 class DistributionSummaryTest {
 
     @Test
@@ -68,4 +72,18 @@ public CountingMode mode() {
         assertThat(summary.takeSnapshot().histogramCounts()).containsExactly(new CountAtBucket(1.0, 0));
     }
 
+    @Test
+    void takeSnapshotShouldNotThrowExceptionEvenIfDoubleHistogramThrowsException(CapturedOutput output) {
+        SimpleMeterRegistry registry = new SimpleMeterRegistry();
+        DistributionSummary summary = DistributionSummary.builder("my.summary")
+            .publishPercentiles(0.1, 0.25, 0.5, 0.75, 0.9, 0.95, 0.99)
+            .register(registry);
+        summary.record(1);
+        summary.record(1E-10);
+        summary.takeSnapshot();
+        summary.record(1E-20);
+        summary.takeSnapshot();
+        assertThat(output).contains("Failed to accumulate.");
+    }
+
 }