15234 switch to micrometer metrics

Author: sschu

quarkus/deployment/pom.xml

@@ -76,7 +76,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics-deployment</artifactId>
+            <artifactId>quarkus-micrometer-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

quarkus/runtime/pom.xml

@@ -77,7 +77,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-smallrye-metrics</artifactId>
+            <artifactId>quarkus-micrometer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java

@@ -33,8 +33,6 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.infinispan.manager.DefaultCacheManager;
-import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsHandler;
-import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 
 import org.keycloak.Config;
@@ -116,12 +114,6 @@ public void run() {
         });
     }
 
-    public Handler<RoutingContext> createMetricsHandler(String path) {
-        SmallRyeMetricsHandler metricsHandler = new SmallRyeMetricsHandler();
-        metricsHandler.setMetricsPath(path);
-        return metricsHandler;
-    }
-
     public HibernateOrmIntegrationRuntimeInitListener createUserDefinedUnitListener(String name) {
         return new HibernateOrmIntegrationRuntimeInitListener() {
             @Override

quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java

@@ -12,7 +12,7 @@ private MetricsPropertyMappers(){}
     public static PropertyMapper[] getMetricsPropertyMappers() {
         return new PropertyMapper[] {
                 fromOption(MetricsOptions.METRICS_ENABLED)
-                        .to("quarkus.smallrye-metrics.extensions.enabled")
+                        .to("quarkus.micrometer.enabled")
                         .paramLabel(Boolean.TRUE + "|" + Boolean.FALSE)
                         .build()
         };

quarkus/runtime/src/main/resources/application.properties

@@ -10,7 +10,7 @@ quarkus.health.extensions.enabled=false
 quarkus.datasource.health.enabled=false
 
 # Enables metrics from other extensions if metrics is enabled
-quarkus.datasource.metrics.enabled=${quarkus.smallrye-metrics.extensions.enabled}
+quarkus.datasource.metrics.enabled=${quarkus.micrometer.enabled}
 
 # Default transaction timeout
 quarkus.transaction-manager.default-transaction-timeout=300

quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/MetricsDistTest.java

@@ -46,15 +46,15 @@ void testMetricsEndpointNotEnabled() {
     void testMetricsEndpoint() {
         when().get("/metrics").then()
                 .statusCode(200)
-                .body(containsString("base_gc_total"));
+                .body(containsString("jvm_gc_"));
     }
 
     @Test
     @Launch({ "start-dev", "--http-relative-path=/auth", "--metrics-enabled=true" })
     void testMetricsEndpointUsingRelativePath() {
         when().get("/auth/metrics").then()
                 .statusCode(200)
-                .body(containsString("base_gc_total"));
+                .body(containsString("jvm_gc_"));
     }
 
     @Test

quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesAutoBuildDistTest.java

@@ -167,7 +167,7 @@ public static class EnableQuarkusMetrics implements Consumer<KeycloakDistributio
         @Override
         public void accept(KeycloakDistribution distribution) {
             distribution.setManualStop(true);
-            distribution.setQuarkusProperty("quarkus.smallrye-metrics.extensions.enabled","true");
+            distribution.setQuarkusProperty("quarkus.micrometer.enabled","true");
         }
     }
 }

quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java

@@ -126,7 +126,7 @@ void testUnknownQuarkusBuildTimePropertyApplied(LaunchResult result) {
         CLIResult cliResult = (CLIResult) result;
         cliResult.assertNoBuild();
         when().get("/metrics").then().statusCode(200)
-                .body(containsString("vendor_hibernate_cache_query_plan_total"));
+                .body(containsString("jvm_gc_"));
     }
 
     public static class UpdateConsoleLogLevelToWarnFromQuarkusProps implements Consumer<KeycloakDistribution> {