Merge branch '1.0.x' into 1.1.x

micrometer-metrics · Feb 13, 2019 · 414295f · 414295f
2 parents 429d3c6 + 12f9051
commit 414295f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java b/...-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java
@@ -110,7 +110,8 @@ public long getMax() {
                     @Override
                     public double getMean() {
                         double count = count();
-                        return count == 0 ? 0 : totalTime(baseTimeUnit()) / count;
+                        // This return value is expected to be in nanoseconds, for example in JmxReporter.JmxTimer.
+                        return count == 0 ? 0 : totalTime(TimeUnit.NANOSECONDS) / count;
                     }
 
                     @Override

diff --git a/...e/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimerTest.java b/...e/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimerTest.java
@@ -40,4 +40,11 @@ void totalTimeWhenStateObjectChangedToNullShouldWorkWithChangedTimeUnit() {
         assertThat(functionTimer.totalTime(TimeUnit.SECONDS)).isEqualTo(1d);
     }
 
+    @Test
+    void getDropwizardMeterGetSnapshotGetMeanShouldReturnNanoseconds() {
+        DropwizardFunctionTimer functionTimer = new DropwizardFunctionTimer(
+                null, new MockClock(), new Object(), (o) -> 1L, (o) -> 1d, TimeUnit.SECONDS, TimeUnit.SECONDS);
+        assertThat(functionTimer.getDropwizardMeter().getSnapshot().getMean()).isEqualTo(1000_000_000d);
+    }
+
 }