diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml index 9fa1d52a0..ed92984dd 100644 --- a/gravitee-node-api/pom.xml +++ b/gravitee-node-api/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-api diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml index 86c7db535..7672a59fe 100644 --- a/gravitee-node-cache/pom.xml +++ b/gravitee-node-cache/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-cache diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml index 0faf28a70..ce8793beb 100644 --- a/gravitee-node-certificates/pom.xml +++ b/gravitee-node-certificates/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-certificates diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml index a2a0a9d84..699e441a3 100644 --- a/gravitee-node-cluster/pom.xml +++ b/gravitee-node-cluster/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-cluster diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml index f573c10a4..c342cd7ec 100644 --- a/gravitee-node-container/pom.xml +++ b/gravitee-node-container/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-container diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml index b3647eee2..dbd0ef033 100644 --- a/gravitee-node-jetty/pom.xml +++ b/gravitee-node-jetty/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-jetty diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml index aa36dfc8f..d1d8739f9 100644 --- a/gravitee-node-kubernetes/pom.xml +++ b/gravitee-node-kubernetes/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-kubernetes diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml index 7a923bbc4..25cdec6c2 100644 --- a/gravitee-node-license/pom.xml +++ b/gravitee-node-license/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-license diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml index 2544f52bb..43886ce4c 100644 --- a/gravitee-node-management/pom.xml +++ b/gravitee-node-management/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-management diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml index 8ffbe3237..55711f4d0 100644 --- a/gravitee-node-monitoring/pom.xml +++ b/gravitee-node-monitoring/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-monitoring diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml index 93fbf0917..79cb7d87d 100644 --- a/gravitee-node-notifier/pom.xml +++ b/gravitee-node-notifier/pom.xml @@ -22,7 +22,7 @@ gravitee-node io.gravitee.node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT 4.0.0 diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml index 1f921eab8..d8346f00d 100644 --- a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml +++ b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node-plugins - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-plugins-service diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml index 2648ea4e4..65060423c 100644 --- a/gravitee-node-plugins/pom.xml +++ b/gravitee-node-plugins/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-plugins diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml index 8520fdd32..7569eaf9b 100644 --- a/gravitee-node-reporter/pom.xml +++ b/gravitee-node-reporter/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-reporter diff --git a/gravitee-node-tracing/pom.xml b/gravitee-node-tracing/pom.xml index 8ac3a593d..6649cb2c8 100644 --- a/gravitee-node-tracing/pom.xml +++ b/gravitee-node-tracing/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-tracing diff --git a/gravitee-node-vertx/pom.xml b/gravitee-node-vertx/pom.xml index f9fee0ac3..e63473765 100644 --- a/gravitee-node-vertx/pom.xml +++ b/gravitee-node-vertx/pom.xml @@ -24,12 +24,16 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.25.0-8218-prometheus-labels-SNAPSHOT gravitee-node-vertx Gravitee.io - Node - Vert.x Support + + 3.12.4 + + @@ -81,5 +85,24 @@ spring-context provided + + + + org.springframework + spring-test + test + + + + org.mockito + mockito-inline + ${mockito-inline.version} + test + + + + ch.qos.logback + logback-classic + diff --git a/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java b/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java index 263df641b..95b59e50f 100644 --- a/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java +++ b/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java @@ -15,10 +15,15 @@ */ package io.gravitee.node.vertx; +import static java.util.stream.Collectors.*; +import static java.util.stream.StreamSupport.stream; + +import io.gravitee.common.util.EnvironmentUtils; import io.gravitee.node.api.Node; import io.gravitee.node.tracing.vertx.LazyVertxTracerFactory; +import io.gravitee.node.vertx.metrics.ExcludeTagsFilter; +import io.gravitee.node.vertx.metrics.RenameVertxFilter; import io.gravitee.node.vertx.verticle.factory.SpringVerticleFactory; -import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics; import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics; @@ -26,21 +31,18 @@ import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics; import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics; import io.micrometer.core.instrument.binder.system.ProcessorMetrics; -import io.micrometer.core.instrument.config.MeterFilter; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; import io.vertx.core.tracing.TracingOptions; import io.vertx.micrometer.*; import io.vertx.micrometer.backends.BackendRegistries; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; /** @@ -65,6 +67,10 @@ public class VertxFactory implements FactoryBean { @Autowired private LazyVertxTracerFactory vertxTracerFactory; + private Set