Create Timer.start() and remove Timer.Sample.start(), polish

jkemming · Jan 16, 2018 · 661e540 · 661e540
1 parent 90f206b
commit 661e540
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/...meter-registry-prometheus/src/main/java/io/micrometer/prometheus/MicrometerCollector.java b/...meter-registry-prometheus/src/main/java/io/micrometer/prometheus/MicrometerCollector.java
@@ -16,11 +16,10 @@
 package io.micrometer.prometheus;
 
 import io.micrometer.core.instrument.Meter;
-import io.micrometer.core.instrument.config.NamingConvention;
 import io.micrometer.core.instrument.Tag;
+import io.micrometer.core.instrument.config.NamingConvention;
 import io.prometheus.client.Collector;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;

diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/Timer.java
@@ -138,6 +138,14 @@ default Type type() {
         return Type.Timer;
     }
 
+    static Sample start(MeterRegistry registry) {
+        return new Sample(registry.config().clock());
+    }
+
+    static Sample start(Clock clock) {
+        return new Sample(clock);
+    }
+
     class Sample {
         private final long startTime;
         private final Clock clock;
@@ -147,18 +155,10 @@ class Sample {
             this.startTime = clock.monotonicTime();
         }
 
-        public static Sample start(Clock clock) {
-            return new Sample(clock);
-        }
-
-        public static Sample start(MeterRegistry registry) {
-            return start(registry.config().clock());
-        }
-
         /**
          * Records the duration of the operation
          *
-         * @return The duration that was stop in nanoseconds
+         * @return The total duration of the sample in nanoseconds
          */
         public long stop(Timer timer){
             long durationNs = clock.monotonicTime() - startTime;

diff --git a/...meter-jersey2/src/main/java/io/micrometer/jersey2/server/MetricsRequestEventListener.java b/...meter-jersey2/src/main/java/io/micrometer/jersey2/server/MetricsRequestEventListener.java
@@ -76,7 +76,7 @@ public void onEvent(RequestEvent event) {
                 timedAnnotations = annotations(event);
 
                 timedAnnotationsOnRequest.put(containerRequest, timedAnnotations);
-                shortTaskSample.put(containerRequest, Timer.Sample.start(registry));
+                shortTaskSample.put(containerRequest, Timer.start(registry));
 
                 List<LongTaskTimer.Sample> longTaskSamples = longTaskTimers(timedAnnotations, event).stream().map(LongTaskTimer::start).collect(Collectors.toList());
                 if (!longTaskSamples.isEmpty()) {

diff --git a/micrometer-spring-legacy/src/main/java/io/micrometer/spring/web/servlet/MetricsFilter.java b/micrometer-spring-legacy/src/main/java/io/micrometer/spring/web/servlet/MetricsFilter.java
@@ -157,7 +157,7 @@ private class TimingSampleContext {
 
         TimingSampleContext(HttpServletRequest request, Object handlerObject) {
             timedAnnotations = annotations(handlerObject);
-            timerSample = Timer.Sample.start(registry);
+            timerSample = Timer.start(registry);
             longTaskTimerSamples = timedAnnotations.stream()
                 .filter(Timed::longTask)
                 .map(t -> LongTaskTimer.builder(t)

diff --git a/micrometer-test/src/main/java/io/micrometer/core/tck/TimerTest.java b/micrometer-test/src/main/java/io/micrometer/core/tck/TimerTest.java
@@ -101,9 +101,9 @@ default void recordWithRunnable(MeterRegistry registry) throws Exception {
 
     @Test
     @DisplayName("record with stateful Sample instance")
-    default void recordWithTiming(MeterRegistry registry) throws Exception {
+    default void recordWithSample(MeterRegistry registry) throws Exception {
         Timer timer = registry.timer("myTimer");
-        Timer.Sample sample = Timer.Sample.start(registry);
+        Timer.Sample sample = Timer.start(registry);
 
         clock(registry).add(10, TimeUnit.NANOSECONDS);
         sample.stop(timer);