🐛 Fix Cannot change the uri of the metrics service

#535

commons/src/main/java/org/restheart/utils/PluginUtils.java

@@ -226,13 +226,12 @@ public static <P extends Service> String defaultURI(Class<P> serviceClass) {
     /**
      *
      * @param <P>
-     * @param conf         the plugin configuration got from @InjectConfiguration
+     * @param conf         the plugin configuration got from @Inject("conf")
      * @param serviceClass the class of the service
      * @return the actual service uri set in cofiguration or the defaultURI
      */
     @SuppressWarnings("rawtypes")
     public static <P extends Service> String actualUri(Map<String, Object> conf, Class<P> serviceClass) {
-
         if (conf != null && conf.get("uri") != null && conf.get("uri") instanceof String) {
             return (String) conf.get("uri");
         } else {

core/src/main/java/org/restheart/graal/PluginsReflectionRegistrationFeature.java

@@ -102,8 +102,7 @@ private Field[] annotated(Field... fields) {
      * selects methods annotated with @OnInit
      *
      * @param fields
-     * @return an array of methods that are annotated
-     *         with @OnInit, @InjectMongoClient, @InjectConfiguration, @InjectPluginsRegistry
+     * @return an array of methods that are annotated with @OnInit
      */
     private Method[] annotated(Method... methods) {
         var list = Arrays.stream(methods)

core/src/main/resources/restheart-default-config-no-mongodb.yml

@@ -452,13 +452,15 @@ logging:
   #  - traceparent       # vv opencensus.io headers, see https://github.com/w3c/distributed-tracing/blob/master/trace_context/HTTP_HEADER_FORMAT.md
   #  - tracestate        # ^^
 
-# Metrics
-# see https://restheart.org/docs/metrics
+# Metrics see https://restheart.org/docs/metrics
+metrics:
+  enabled: true
+  uri: /metrics
+
 requestsMetricsCollector:
   enabled: false
-  uri: /metrics
-  include: [ "/*" ]
-  exclude: [ "/metrics", "/metrics/*" ]
+  include: ["/*"]
+  exclude: ["/metrics", "/metrics/*"]
 
 jvmMetricsCollector:
   enabled: false

core/src/main/resources/restheart-default-config.yml

@@ -431,11 +431,14 @@ logging:
   #  - traceparent       # vv opencensus.io headers, see https://github.com/w3c/distributed-tracing/blob/master/trace_context/HTTP_HEADER_FORMAT.md
   #  - tracestate        # ^^
 
-# Metrics
-# see https://restheart.org/docs/metrics
+# Metrics see https://restheart.org/docs/metrics
+
+metrics:
+  enabled: true
+  uri: /metrics
+
 requestsMetricsCollector:
   enabled: false
-  uri: /metrics
   include: [ "/*" ]
   exclude: [ "/metrics", "/metrics/*" ]
 

metrics/src/main/java/org/restheart/metrics/MetricsService.java

@@ -20,9 +20,14 @@
  */
 package org.restheart.metrics;
 
+import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Map;
+
 import org.restheart.exchange.StringRequest;
 import org.restheart.exchange.StringResponse;
+import org.restheart.plugins.Inject;
+import org.restheart.plugins.OnInit;
 import org.restheart.plugins.RegisterPlugin;
 import org.restheart.plugins.StringService;
 import static org.restheart.utils.BsonUtils.array;
@@ -38,21 +43,30 @@
  *
  * @author Andrea Di Cesare {@literal <[email protected]>}
  */
-@RegisterPlugin(name = "metrics", description = "returns requests metrics", secure = true)
+@RegisterPlugin(name = "metrics", description = "returns requests metrics", secure = true, defaultURI="/metrics")
 public class MetricsService implements StringService {
     /**
      *
      * prefix for registry names used by retheart-metrics plugins
      */
     public static String METRICS_REGISTRIES_PREFIX = "METRICS-";
 
+    @Inject("config")
+    private Map<String, Object> config;
+    private String serviceUri = "/metrics";
+
+    @OnInit
+    public void onInit() {
+        this.serviceUri = argOrDefault(config, "uri", "/metrics");
+    }
+
     /**
-     *
-     * @param exchange
-     * @throws Exception
+     * @param request
+     * @param response
+     * @throws java.io.IOException
      */
     @Override
-    public void handle(StringRequest request, StringResponse response) throws Exception {
+    public void handle(StringRequest request, StringResponse response) throws IOException {
         if (request.isOptions()) {
             handleOptions(request);
             return;
@@ -61,7 +75,7 @@ public void handle(StringRequest request, StringResponse response) throws Except
             return;
         }
 
-        var params = request.getPathParams("/{servicename}/{*}");
+        var params = request.getPathParams(serviceUri.concat("/{*}"));
 
         if (!params.containsKey("*")) {
             var content = array();
@@ -82,7 +96,6 @@ public void handle(StringRequest request, StringResponse response) throws Except
                 response.setContent(writer.toString());
             } else {
                 response.setInError(HttpStatus.SC_NOT_FOUND, "metric not found");
-                return;
             }
         }
     }

metrics/src/main/java/org/restheart/metrics/RequestsMetricsCollector.java

@@ -54,12 +54,9 @@ public class RequestsMetricsCollector implements WildcardInterceptor {
     @Inject("config")
     private Map<String, Object> config;
 
-    @Inject("registry")
-    private PluginsRegistry pluginsRegistry;
-
     // include is a set because we want to check all path templates that match the request
-    private Set<PathTemplateMatcher<Boolean>> include = new HashSet<>();
-    private PathTemplateMatcher<Boolean> exclude = new PathTemplateMatcher<>();
+    private final Set<PathTemplateMatcher<Boolean>> include = new HashSet<>();
+    private final PathTemplateMatcher<Boolean> exclude = new PathTemplateMatcher<>();
 
     @OnInit
     public void onInit() {