add root_cause_name instead of changing exception_name

OpenFeign · Dec 16, 2022 · 23cb5ed · 23cb5ed
1 parent d92d77b
commit 23cb5ed
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/dropwizard-metrics4/src/main/java/feign/metrics4/BaseMeteredClient.java b/dropwizard-metrics4/src/main/java/feign/metrics4/BaseMeteredClient.java
@@ -65,6 +65,8 @@ protected void recordFailure(RequestTemplate template, FeignException e) {
             MetricRegistry.name(
                 httpResponseCode(template),
                 "exception_name",
+                e.getClass().getSimpleName(),
+                "root_cause_name",
                 ExceptionUtils.getRootCause(e).getClass().getSimpleName(),
                 "status_group",
                 e.status() / 100 + "xx",
@@ -82,6 +84,8 @@ protected void recordFailure(RequestTemplate template, Exception e) {
             MetricRegistry.name(
                 httpResponseCode(template),
                 "exception_name",
+                e.getClass().getSimpleName(),
+                "root_cause_name",
                 ExceptionUtils.getRootCause(e).getClass().getSimpleName(),
                 "uri",
                 template.methodMetadata().template().path()),

diff --git a/dropwizard-metrics5/src/main/java/feign/metrics5/BaseMeteredClient.java b/dropwizard-metrics5/src/main/java/feign/metrics5/BaseMeteredClient.java
@@ -60,7 +60,9 @@ protected void recordFailure(RequestTemplate template, FeignException e) {
     metricRegistry
         .counter(
             httpResponseCode(template)
-                .tagged("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
+                .tagged("exception_name", e.getClass().getSimpleName())
+                .tagged("root_cause_name",
+                    ExceptionUtils.getRootCause(e).getClass().getSimpleName())
                 .tagged("http_status", String.valueOf(e.status()))
                 .tagged("status_group", e.status() / 100 + "xx")
                 .tagged("uri", template.methodMetadata().template().path()))
@@ -71,7 +73,9 @@ protected void recordFailure(RequestTemplate template, Exception e) {
     metricRegistry
         .counter(
             httpResponseCode(template)
-                .tagged("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
+                .tagged("exception_name", e.getClass().getSimpleName())
+                .tagged("root_cause_name",
+                    ExceptionUtils.getRootCause(e).getClass().getSimpleName())
                 .tagged("uri", template.methodMetadata().template().path()))
         .inc();
   }

diff --git a/dropwizard-metrics5/src/main/java/feign/metrics5/MeteredDecoder.java b/dropwizard-metrics5/src/main/java/feign/metrics5/MeteredDecoder.java
@@ -64,14 +64,16 @@ public Object decode(Response response, Type type)
     } catch (IOException | RuntimeException e) {
       metricRegistry.meter(
           metricName.metricName(template.methodMetadata(), template.feignTarget(), "error_count")
-              .tagged("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
+              .tagged("exception_name", e.getClass().getSimpleName())
+              .tagged("root_cause_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
               .tagged("uri", template.methodMetadata().template().path()),
           metricSuppliers.meters()).mark();
       throw e;
     } catch (Exception e) {
       metricRegistry.meter(
           metricName.metricName(template.methodMetadata(), template.feignTarget(), "error_count")
-              .tagged("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
+              .tagged("exception_name", e.getClass().getSimpleName())
+              .tagged("root_cause_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName())
               .tagged("uri", template.methodMetadata().template().path()),
           metricSuppliers.meters()).mark();
       throw new IOException(e);

diff --git a/dropwizard-metrics5/src/main/java/feign/metrics5/MeteredInvocationHandleFactory.java b/dropwizard-metrics5/src/main/java/feign/metrics5/MeteredInvocationHandleFactory.java
@@ -13,7 +13,6 @@
  */
 package feign.metrics5;
 
-
 import feign.utils.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,7 +86,8 @@ public InvocationHandler create(Target target, Map<Method, MethodHandler> dispat
         metricRegistry
             .meter(metricName.metricName(clientClass, method, target.url())
                 .resolve("exception")
-                .tagged("exception_name",
+                .tagged("exception_name", e.getClass().getSimpleName())
+                .tagged("root_cause_name",
                     ExceptionUtils.getRootCause(e).getClass().getSimpleName()),
                 metricSuppliers.meters())
             .mark();

diff --git a/micrometer/src/main/java/feign/micrometer/FeignMetricTagResolver.java b/micrometer/src/main/java/feign/micrometer/FeignMetricTagResolver.java
@@ -50,7 +50,9 @@ public Tags tag(Class<?> targetType, Method method, String url, Throwable e, Tag
     tags.add(Tag.of("method", method.getName()));
     tags.add(Tag.of("host", extractHost(url)));
     if (e != null) {
-      tags.add(Tag.of("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName()));
+      tags.add(Tag.of("exception_name", e.getClass().getSimpleName()));
+      tags.add(
+          Tag.of("root_cause_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName()));
     }
     tags.addAll(Arrays.asList(extraTags));
     return Tags.of(tags);

diff --git a/micrometer/src/main/java/feign/micrometer/MeteredDecoder.java b/micrometer/src/main/java/feign/micrometer/MeteredDecoder.java
@@ -96,7 +96,8 @@ protected Counter createExceptionCounter(Response response, Type type, Exception
     final RequestTemplate template = response.request().requestTemplate();
     final Tags allTags = metricTagResolver.tag(template.methodMetadata(), template.feignTarget(),
         Tag.of("uri", template.methodMetadata().template().path()),
-        Tag.of("exception_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName()))
+        Tag.of("exception_name", e.getClass().getSimpleName()),
+        Tag.of("root_cause_name", ExceptionUtils.getRootCause(e).getClass().getSimpleName()))
         .and(extraTags);
     return meterRegistry.counter(metricName.name("error_count"), allTags);
   }

diff --git a/micrometer/src/test/java/feign/micrometer/AbstractMetricsTestBase.java b/micrometer/src/test/java/feign/micrometer/AbstractMetricsTestBase.java
@@ -210,7 +210,8 @@ public void shouldMetricCollectionWithCustomException() {
     assertThat(thrown.getMessage(), equalTo("Test error"));
 
     assertThat(
-        getMetric("exception", "exception_name", "RuntimeException", "method", "get"),
+        getMetric("exception", "exception_name", "RuntimeException", "method", "get",
+            "root_cause_name", "RuntimeException"),
         notNullValue());
   }