Make sure that metrics are not created from SmallRye internal classes. …

…Fixes quarkusio#3468
jmartisk · Aug 9, 2019 · a4b265d · a4b265d
1 parent 5de2bed
commit a4b265d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...oyment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java b/...oyment/src/main/java/io/quarkus/smallrye/metrics/deployment/SmallRyeMetricsProcessor.java
@@ -167,12 +167,16 @@ void registerMetricsFromAnnotatedMethods(SmallRyeMetricsRecorder metrics,
                 switch (metricAnnotationTarget.kind()) {
                     case METHOD: {
                         MethodInfo method = metricAnnotationTarget.asMethod();
-                        collectedMetricsMethods.add(method);
+                        if (!method.declaringClass().name().toString().startsWith("io.smallrye.metrics")) {
+                            collectedMetricsMethods.add(method);
+                        }
                         break;
                     }
                     case CLASS: {
                         ClassInfo clazz = metricAnnotationTarget.asClass();
-                        collectMetricsClassAndSubClasses(index, collectedMetricsClasses, clazz);
+                        if (!clazz.name().toString().startsWith("io.smallrye.metrics")) {
+                            collectMetricsClassAndSubClasses(index, collectedMetricsClasses, clazz);
+                        }
                         break;
                     }
                 }

diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/MetricsTestCase.java
@@ -2,6 +2,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 
 import java.util.concurrent.TimeUnit;
 
@@ -149,6 +150,16 @@ public void testEndpointWithMetricsThrowingException() {
                 .statusCode(404);
     }
 
+    /**
+     * Verify that no metrics are created from SmallRye internal classes (for example the
+     * io.smallrye.metrics.interceptors package)
+     */
+    @Test
+    public void testNoMetricsFromSmallRyeInternalClasses() {
+        RestAssured.when().get("/metrics/application").then()
+                .body(not(containsString("io_smallrye_metrics")));
+    }
+
     private void assertMetricExactValue(String name, String val) {
         RestAssured.when().get("/metrics").then()
                 .body(containsString(name + " " + val));