MeteredDecoder records timer once in happy path (#1554)

OpenFeign · Dec 21, 2021 · 4814ae0 · 4814ae0
1 parent 08fe6a3
commit 4814ae0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/micrometer/src/main/java/feign/micrometer/MeteredDecoder.java b/micrometer/src/main/java/feign/micrometer/MeteredDecoder.java
@@ -62,7 +62,6 @@ public Object decode(Response response, Type type)
     try {
       decoded = decoder.decode(meteredResponse, type);
       timer = createTimer(response, type, null);
-      sample.stop(timer);
     } catch (IOException | RuntimeException e) {
       timer = createTimer(response, type, e);
       createExceptionCounter(response, type, e).count();

diff --git a/micrometer/src/test/java/feign/micrometer/AbstractMetricsTestBase.java b/micrometer/src/test/java/feign/micrometer/AbstractMetricsTestBase.java
@@ -74,6 +74,13 @@ public final void addMetricsCapability() {
         .filter(this::doesMetricHasCounter)
         .forEach(metric -> assertEquals(1, getMetricCounter(metric)));
 
+    final Map<METRIC_ID, METRIC> decoderMetrics = getFeignMetrics().entrySet().stream()
+        .filter(entry -> isDecoderMetric(entry.getKey()))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+    decoderMetrics.values().stream()
+        .filter(this::doesMetricHasCounter)
+        .forEach(metric -> assertEquals(1, getMetricCounter(metric)));
   }
 
   protected abstract boolean doesMetricIncludeHost(METRIC_ID metricId);