move /metrics-json endpoint to /metrics

quarkusio · Sep 8, 2020 · ff7837b · ff7837b
1 parent ef5f53b
commit ff7837b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/...ons/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/JsonConfig.java b/...ons/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/JsonConfig.java
@@ -17,7 +17,7 @@ public class JsonConfig implements MicrometerConfig.CapabilityEnabled {
      * The path for the JSON metrics endpoint.
      * The default value is {@code /metrics-json}.
      */
-    @ConfigItem(defaultValue = "/metrics-json")
+    @ConfigItem(defaultValue = "/metrics")
     public String path;
 
     @Override

diff --git a/...s/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonRecorder.java b/...s/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/JsonRecorder.java
@@ -2,8 +2,6 @@
 
 import java.util.function.Function;
 
-import javax.ws.rs.core.MediaType;
-
 import io.quarkus.micrometer.runtime.export.handlers.JsonHandler;
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.ext.web.Route;
@@ -25,7 +23,7 @@ public Function<Router, Route> route(String path) {
         return new Function<Router, Route>() {
             @Override
             public Route apply(Router router) {
-                return router.route(path).produces(MediaType.APPLICATION_JSON);
+                return router.route(path).order(2).produces("application/json");
             }
         };
     }

diff --git a/...ometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusRecorder.java b/...ometer/runtime/src/main/java/io/quarkus/micrometer/runtime/export/PrometheusRecorder.java
@@ -2,7 +2,6 @@
 
 import java.util.function.Function;
 
-import io.prometheus.client.exporter.common.TextFormat;
 import io.quarkus.micrometer.runtime.export.handlers.PrometheusHandler;
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.ext.web.Route;
@@ -24,7 +23,7 @@ public Function<Router, Route> route(String path) {
         return new Function<Router, Route>() {
             @Override
             public Route apply(Router router) {
-                return router.route(path).produces(TextFormat.CONTENT_TYPE_004);
+                return router.route(path).order(1).produces("text/plain");
             }
         };
     }

diff --git a/...micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsTest.java b/...micrometer-mp-metrics/src/test/java/io/quarkus/it/micrometer/mpmetrics/MPMetricsTest.java
@@ -102,7 +102,8 @@ void validateMetricsOutput_2() {
     @Order(7)
     void validateJsonOutput() {
         given()
-                .when().get("/metrics-json")
+                .header("Accept", "application/json")
+                .when().get("/metrics")
                 .then()
                 .log().body()
                 .statusCode(200)