commit e3d45c1b49efd6674ca4b169a4af9fd067569ba9
author Romain Manni-Bucau <rmannibucau@gmail.com> Thu Apr 16 20:22:09 2020 +0200
committer Romain Manni-Bucau <rmannibucau@gmail.com> Thu Apr 16 20:22:09 2020 +0200
tree e215fe3fcf8d05dde253704fab814a5b542b244e
parent d622a4ff843f56c8a627cbe177eb5a0b9f8032f2

GERONIMO-6770 ensure we don't leak jaxrs artifacts in metrics extension

geronimo-metrics/src/main/java/org/apache/geronimo/microprofile/metrics/cdi/MetricsExtension.java

diff --git a/geronimo-metrics/src/main/java/org/apache/geronimo/microprofile/metrics/cdi/MetricsExtension.java b/geronimo-metrics/src/main/java/org/apache/geronimo/microprofile/metrics/cdi/MetricsExtension.java
index ccd6ad4..49a843d 100644
--- a/geronimo-metrics/src/main/java/org/apache/geronimo/microprofile/metrics/cdi/MetricsExtension.java
+++ b/geronimo-metrics/src/main/java/org/apache/geronimo/microprofile/metrics/cdi/MetricsExtension.java
@@ -19,8 +19,6 @@
 import org.apache.geronimo.microprofile.metrics.common.BaseMetrics;
 import org.apache.geronimo.microprofile.metrics.common.GaugeImpl;
 import org.apache.geronimo.microprofile.metrics.common.RegistryImpl;
-import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints;
-import org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints;
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.Gauge;
 import org.eclipse.microprofile.metrics.Histogram;
@@ -84,7 +82,7 @@
 import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
 
-public class MetricsExtension implements Extension {
+public class MetricsExtension implements Extension { // must not explicitly depend on jaxrs since it is dropped in nojaxrs bundle
     private static final Tag[] NO_TAG = new Tag[0];
 
     private final MetricRegistry applicationRegistry = new RegistryImpl(MetricRegistry.Type.APPLICATION);
@@ -98,8 +96,13 @@
 
     private Map<String, String> environmentalTags;
 
-    void vetoEndpointIfNotActivated(@Observes final ProcessAnnotatedType<CdiMetricsEndpoints> processAnnotatedType) {
-        if ("false".equalsIgnoreCase(System.getProperty("geronimo.metrics.jaxrs.activated"))) { // default is secured so deploy
+    void vetoEndpointIfNotActivated(@Observes final ProcessAnnotatedType<?> processAnnotatedType) {
+        // default is secured so deploy
+        final String name = processAnnotatedType.getAnnotatedType().getJavaClass().getName();
+        if ("false".equalsIgnoreCase(System.getProperty("geronimo.metrics.jaxrs.activated")) &&
+                name.equals("org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints")) {
+            processAnnotatedType.veto();
+        } else if ("org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints".equals(name)) { // can happen in shades
             processAnnotatedType.veto();
         }
     }
@@ -109,13 +112,6 @@
         processAnnotatedType.veto();
     }
 
-    // can happen in shades
-    void vetoNonCdiEndpoint(@Observes final ProcessAnnotatedType<MetricsEndpoints> processAnnotatedType) {
-        if (processAnnotatedType.getAnnotatedType().getJavaClass() == MetricsEndpoints.class) { // not subclasses
-            processAnnotatedType.veto();
-        }
-    }
-
     void letOtherExtensionsUseRegistries(@Observes final BeforeBeanDiscovery beforeBeanDiscovery, final BeanManager beanManager) {
         beforeBeanDiscovery.addQualifier(RegistryType.class);
         beanManager.fireEvent(applicationRegistry);