4.x Metrics followup

dbclient/metrics/src/main/java/io/helidon/dbclient/metrics/MeterMetadata.java

@@ -61,6 +61,7 @@ static MeterMetadata.Builder builder(Meter meter) {
         return new MeterMetadata.Builder(meter);
     }
 
+    private static final String SCOPE = "application";
     private final String name;
     private final String description;
     private final String unit;
@@ -118,6 +119,7 @@ <B extends Meter.Builder<B, M>, M extends Meter> B apply(B builder) {
         if (unit != null) {
             builder.baseUnit(unit);
         }
+        builder.scope(SCOPE);
         return builder;
     }
 

examples/cors/pom.xml

@@ -68,8 +68,13 @@
         <dependency>
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency><dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
@@ -81,10 +86,6 @@
             <groupId>io.helidon.health</groupId>
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>

examples/dbclient/jdbc/pom.xml

@@ -109,9 +109,15 @@
             <artifactId>helidon-examples-dbclient-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 

examples/dbclient/mongodb/pom.xml

@@ -76,7 +76,17 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.tracing</groupId>

examples/dbclient/pokemons/pom.xml

@@ -95,9 +95,14 @@
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

examples/employee-app/pom.xml

@@ -66,9 +66,15 @@
             <groupId>io.helidon.health</groupId>
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.dbclient</groupId>

examples/integrations/microstream/greetings-se/pom.xml

@@ -64,11 +64,15 @@
             <artifactId>helidon-metrics-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency><dependency>
             <groupId>io.helidon.webserver.testing.junit5</groupId>
             <artifactId>helidon-webserver-testing-junit5</artifactId>
             <scope>test</scope>

examples/metrics/exemplar/pom.xml

@@ -63,11 +63,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

examples/metrics/filtering/mp/pom.xml

@@ -39,6 +39,16 @@
             <groupId>io.helidon.microprofile.metrics</groupId>
             <artifactId>helidon-microprofile-metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.webclient</groupId>
             <artifactId>helidon-webclient</artifactId>

examples/metrics/filtering/mp/src/main/resources/META-INF/microprofile-config.properties

@@ -21,5 +21,5 @@ config_ordinal=1000
 server.port=8080
 server.host=0.0.0.0
 
-metrics.registries.0.scope = application
-metrics.registries.0.filter.exclude = .*Gets
+metrics.scoping.scopes.0.name=application
+metrics.scoping.scopes.0.filter.exclude = .*Gets

examples/metrics/filtering/mp/src/test/java/io/helidon/examples/metrics/filtering/mp/MainTest.java

@@ -23,7 +23,6 @@
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.MetricRegistry;
 import org.eclipse.microprofile.metrics.Timer;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -44,8 +43,6 @@ void checkEnabledMetric() {
                    personalizedGreetingsCounter.getCount() - before, is(1L));
     }
 
-    // TODO metrics
-    @Disabled
     @Test
     void checkDisabledMetric() {
         Timer getsTimer = appRegistry.timer(GreetResource.TIMER_FOR_GETS);

examples/metrics/filtering/se/pom.xml

@@ -58,14 +58,6 @@
             <groupId>io.helidon.metrics</groupId>
             <artifactId>helidon-metrics-api</artifactId>
         </dependency>
-        <!--
-            The following provides a full-featured metrics implementation so the example works correctly.
-        -->
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>

examples/metrics/filtering/se/src/main/java/io/helidon/examples/metrics/filtering/se/Main.java

@@ -16,6 +16,8 @@
 
 package io.helidon.examples.metrics.filtering.se;
 
+import java.util.regex.Pattern;
+
 import io.helidon.common.config.Config;
 import io.helidon.common.config.GlobalConfig;
 import io.helidon.logging.common.LogConfig;
@@ -73,7 +75,7 @@ static void setup(WebServerConfig.Builder server) {
         // the metrics feature class will use.
         ScopeConfig scopeConfig = ScopeConfig.builder()
                 .name(Meter.Scope.APPLICATION)
-                .exclude(GreetService.TIMER_FOR_GETS)
+                .exclude(Pattern.compile(GreetService.TIMER_FOR_GETS))
                 .build();
 
         MetricsConfig initialMetricsConfig = config.get(MetricsConfig.METRICS_CONFIG_KEY)

examples/metrics/http-status-count-se/pom.xml

@@ -50,11 +50,6 @@
             <groupId>io.helidon.metrics</groupId>
             <artifactId>helidon-metrics-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe</artifactId>
@@ -63,6 +58,11 @@
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe-metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe-health</artifactId>

examples/metrics/kpi/pom.xml

@@ -53,11 +53,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

examples/microprofile/http-status-count-mp/pom.xml

@@ -54,6 +54,16 @@
             <groupId>io.helidon.microprofile.health</groupId>
             <artifactId>helidon-microprofile-health</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>

examples/microprofile/http-status-count-mp/src/test/java/io/helidon/examples/mp/httpstatuscount/MainTest.java

@@ -24,16 +24,13 @@
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.MetricRegistry;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-// TODO metrics
-@Disabled
 @HelidonTest
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class MainTest {

examples/microprofile/multiport/pom.xml

@@ -45,6 +45,16 @@
             <groupId>io.helidon.microprofile.health</groupId>
             <artifactId>helidon-microprofile-health</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

examples/openapi/pom.xml

@@ -62,10 +62,12 @@
         <dependency>
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.openapi</groupId>

examples/quickstarts/helidon-quickstart-mp/pom.xml

@@ -36,6 +36,16 @@
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>

examples/quickstarts/helidon-quickstart-se/pom.xml

@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.openapi</groupId>

examples/quickstarts/helidon-standalone-quickstart-mp/pom.xml

@@ -68,6 +68,10 @@
             <groupId>io.helidon.microprofile.bundles</groupId>
             <artifactId>helidon-microprofile</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.metrics</groupId>
+            <artifactId>helidon-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>

examples/quickstarts/helidon-standalone-quickstart-se/pom.xml

@@ -78,10 +78,12 @@
         <dependency>
             <groupId>io.helidon.webserver.observe</groupId>
             <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>

examples/todo-app/frontend/pom.xml

@@ -125,9 +125,14 @@
             <groupId>io.helidon.security.providers</groupId>
             <artifactId>helidon-security-providers-http-sign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.webserver.observe</groupId>
+            <artifactId>helidon-webserver-observe-metrics</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <artifactId>helidon-metrics-system-meters</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

examples/webclient/standalone/pom.xml

@@ -47,8 +47,8 @@
             <artifactId>helidon-metrics-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.helidon.metrics</groupId>
-            <artifactId>helidon-metrics</artifactId>
+            <groupId>io.helidon.metrics.providers</groupId>
+            <artifactId>helidon-metrics-providers-micrometer</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>