Merge pull request #22681 from jmartisk/main-issue-22662

Make sure REST methods can be called without an active CDI context
quarkusio · Jan 6, 2022 · 300d2a3 · 300d2a3
2 parents 63d29a6 + 6c61302
commit 300d2a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...untime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java b/...untime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java
@@ -10,7 +10,7 @@
 
 import io.micrometer.core.instrument.Tags;
 
-class MetricDescriptor {
+public class MetricDescriptor {
     final String name;
     final Tags tags;
     ExtendedMetricID metricId = null;

diff --git a/...runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java b/...runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java
@@ -4,6 +4,7 @@
 import java.util.Set;
 
 import javax.annotation.Priority;
+import javax.enterprise.context.ContextNotActiveException;
 import javax.inject.Inject;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
@@ -12,6 +13,7 @@
 import io.quarkus.arc.ArcInvocationContext;
 import io.quarkus.vertx.http.runtime.CurrentVertxRequest;
 import io.vertx.core.http.impl.HttpServerRequestInternal;
+import io.vertx.ext.web.RoutingContext;
 
 @SuppressWarnings("unused")
 @QuarkusRestPathTemplate
@@ -24,7 +26,13 @@ public class QuarkusRestPathTemplateInterceptor {
     @AroundInvoke
     Object restMethodInvoke(InvocationContext context) throws Exception {
         QuarkusRestPathTemplate annotation = getAnnotation(context);
-        if ((annotation != null) && (request.getCurrent() != null)) {
+        RoutingContext routingContext = null;
+        try {
+            routingContext = request.getCurrent();
+        } catch (ContextNotActiveException ex) {
+            // just leave routingContext as null
+        }
+        if ((annotation != null) && (routingContext != null)) {
             ((HttpServerRequestInternal) request.getCurrent().request()).context().putLocal("UrlPathTemplate",
                     annotation.value());
         }

diff --git a/...micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java b/...micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java
@@ -70,6 +70,8 @@ String checkPrime(long number) {
     }
 
     @Gauge(name = "highestPrimeNumberSoFar", unit = MetricUnits.NONE, description = "Highest prime number so far.")
+    @GET
+    @Path("/blabla") // make this a REST method just to verify that a gauge will still work on it
     public Long highestPrimeNumberSoFar() {
         return highestPrimeSoFar.get();
     }