Rebase

tjquinno · Aug 31, 2023 · 9eb9e92 · 9eb9e92
1 parent c36953f
commit 9eb9e92
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git a/.../src/main/java/io/helidon/integrations/microstream/metrics/MicrostreamMetricsSupport.java b/.../src/main/java/io/helidon/integrations/microstream/metrics/MicrostreamMetricsSupport.java
@@ -103,8 +103,8 @@ private record GaugeInfo<T>(String name,
                              ToDoubleFunction<T> fn,
                              Tag... tags) {
 
-        Gauge.Builder<T> builder(T stateObject) {
-            Gauge.Builder<T> builder = Gauge.builder(name, stateObject, fn)
+        Gauge.Builder builder(T stateObject) {
+            Gauge.Builder<Double> builder = Gauge.builder(name, stateObject, fn)
                     .description(description);
             if (unit != null) {
                 builder.baseUnit(unit);

diff --git a/integrations/neo4j/metrics/src/main/java/module-info.java b/integrations/neo4j/metrics/src/main/java/module-info.java
@@ -33,8 +33,6 @@
     requires io.helidon.integrations.neo4j;
     requires io.helidon.metrics.api;
 
-    requires org.neo4j.driver;
-
     requires transitive io.helidon.common;
     requires transitive org.neo4j.driver;
 

diff --git a/...oci/metrics/metrics/src/main/java/io/helidon/integrations/oci/metrics/OciMetricsData.java b/...oci/metrics/metrics/src/main/java/io/helidon/integrations/oci/metrics/OciMetricsData.java
@@ -91,7 +91,7 @@ private Stream<MetricDataDetails> forCounter(Meter.Id metricId, Counter counter)
     }
 
     private Stream<MetricDataDetails> forGauge(Meter.Id metricId, Gauge gauge) {
-        return Stream.of(metricDataDetails(gauge, metricId, null, gauge.value()));
+        return Stream.of(metricDataDetails(gauge, metricId, null, gauge.value().doubleValue()));
     }
 
     private Stream<MetricDataDetails> forTimer(Meter.Id metricId, Timer timer) {

diff --git a/metrics/api/src/main/java/io/helidon/metrics/api/Meter.java b/metrics/api/src/main/java/io/helidon/metrics/api/Meter.java
@@ -111,6 +111,7 @@ interface Builder<B extends Builder<B, M>, M extends Meter> {
          *
          * @return properly-typed builder itself
          */
+        @SuppressWarnings("unchecked")
         default B identity() {
             return (B) this;
         }

diff --git a/metrics/metrics/pom.xml b/metrics/metrics/pom.xml
@@ -40,7 +40,15 @@
     </properties>
 
    <dependencies>
-        <dependency>
+       <dependency>
+           <groupId>io.helidon.common.features</groupId>
+           <artifactId>helidon-common-features-api</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.helidon.metrics</groupId>
+           <artifactId>helidon-metrics-api</artifactId>
+       </dependency>
+       <dependency>
             <groupId>io.helidon.metrics.providers</groupId>
             <artifactId>helidon-metrics-providers-micrometer</artifactId>
             <scope>runtime</scope>
@@ -50,7 +58,8 @@
            <artifactId>helidon-metrics-system-meters</artifactId>
            <scope>runtime</scope>
        </dependency>
-    </dependencies>
+
+   </dependencies>
 
     <build>
         <plugins>

diff --git a/metrics/metrics/src/main/java/module-info.java b/metrics/metrics/src/main/java/module-info.java
@@ -25,7 +25,6 @@
         in = HelidonFlavor.SE,
         path = {"Metrics"}
 )
-@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.metrics {
     requires static io.helidon.common.features.api;
 

diff --git a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/MetricsCdiExtension.java
@@ -208,7 +208,7 @@ private static MetricsFeature createMetricsService(Config helidonConfig) {
 
         MetricsFeature.Builder builder = MetricsFeature.builder()
                 .meterRegistry(metricsFactory.globalRegistry())
-                .metricsConfig(metricsFactory.metricsConfig())
+                .metricsConfig(MetricsConfig.builder(metricsFactory.metricsConfig()))
                 .webContext("/metrics")
                 .config(helidonConfig);
 

diff --git a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/Registry.java b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/Registry.java
@@ -624,8 +624,8 @@ private <N extends Number> HelidonGauge<N> createGauge(io.helidon.metrics.api.Ga
     private <T> HelidonGauge<Long> createFunctionalCounter(io.helidon.metrics.api.FunctionalCounter.Builder<T> fcBuilder) {
         io.helidon.metrics.api.Gauge delegate = meterRegistry
                 .getOrCreate(io.helidon.metrics.api.Gauge.builder(fcBuilder.name(),
-                                                                  () -> (long) fcBuilder.fn()
-                                                                          .applyAsDouble(fcBuilder.stateObject())));
+                                                                  () -> fcBuilder.fn()
+                                                                          .apply(fcBuilder.stateObject())));
         return (HelidonGauge<Long>) metricsByDelegate.get(delegate);
     }
 

diff --git a/microprofile/metrics/src/main/java/module-info.java b/microprofile/metrics/src/main/java/module-info.java
@@ -29,7 +29,6 @@
 )
 @SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.microprofile.metrics {
-    requires static io.helidon.common.features.api;
 
     requires io.helidon.config.mp;
     requires io.helidon.metrics.api;
@@ -54,8 +53,8 @@
     opens io.helidon.microprofile.metrics.spi to io.helidon.microprofile.cdi, weld.core.impl;
 
     provides jakarta.enterprise.inject.spi.Extension with io.helidon.microprofile.metrics.MetricsCdiExtension;
-    provides io.helidon.metrics.spi.MetricsProgrammaticSettings
-            with io.helidon.microprofile.metrics.MpMetricsProgrammaticSettings;
+    provides io.helidon.metrics.spi.MetricsProgrammaticConfig
+            with io.helidon.microprofile.metrics.MpMetricsProgrammaticConfig;
     provides io.helidon.metrics.spi.MeterRegistryLifeCycleListener
             with io.helidon.microprofile.metrics.RegistryFactoryManager;
     provides io.helidon.metrics.spi.InitialMetersConsumer