Skip to content

Commit 5ffa905

Browse files
committed
Merge branch '1.8.x' into 1.9.x
2 parents 0a07d1f + bce0e58 commit 5ffa905

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractTimer.java

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import io.micrometer.core.instrument.distribution.*;
1919
import io.micrometer.core.instrument.distribution.pause.ClockDriftPauseDetector;
20+
import io.micrometer.core.instrument.distribution.pause.NoPauseDetector;
2021
import io.micrometer.core.instrument.distribution.pause.PauseDetector;
2122
import io.micrometer.core.lang.Nullable;
2223
import org.LatencyUtils.IntervalEstimator;
@@ -101,6 +102,9 @@ else if (distributionStatisticConfig.isPublishingHistogram()) {
101102
}
102103

103104
private void initPauseDetector(PauseDetector pauseDetectorType) {
105+
if (pauseDetectorType instanceof NoPauseDetector) {
106+
return;
107+
}
104108
pauseDetector = pauseDetectorCache.computeIfAbsent(pauseDetectorType, detector -> {
105109
if (detector instanceof ClockDriftPauseDetector) {
106110
ClockDriftPauseDetector clockDriftPauseDetector = (ClockDriftPauseDetector) detector;

samples/micrometer-samples-boot2/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ repositories {
1010
}
1111

1212
dependencies {
13-
implementation project(":micrometer-core")
13+
implementation(project(":micrometer-core")) {
14+
// see gh-1599; pause detection and percentiles are not configured so these dependencies can be excluded
15+
exclude module: 'LatencyUtils'
16+
exclude module: 'HdrHistogram'
17+
}
1418
['atlas', 'azure-monitor', 'prometheus', 'datadog', 'elastic', 'ganglia', 'graphite', 'health', 'jmx', 'influx', 'statsd', 'new-relic', 'cloudwatch', 'cloudwatch2', 'signalfx', 'wavefront', 'elastic', 'dynatrace', 'humio', 'appoptics', 'stackdriver'].each { sys ->
1519
implementation project(":micrometer-registry-$sys")
1620
}

0 commit comments

Comments
 (0)