diff --git a/bundles/org.openhab.io.metrics/pom.xml b/bundles/org.openhab.io.metrics/pom.xml
index 8ab50ffd9ab..a7794e2fcfb 100644
--- a/bundles/org.openhab.io.metrics/pom.xml
+++ b/bundles/org.openhab.io.metrics/pom.xml
@@ -15,8 +15,8 @@
openHAB Add-ons :: Bundles :: IO :: Metrics Service
- 1.6.3
- io.micrometer.core.*;resolution:=optional;ch.qos.logback.*;resolution:=optional,com.codahale.*;resolution:=optional,com.github.benmanes.caffeine.*;resolution:=optional;com.mongodb.*;resolution:=optional,com.netflix.*;resolution:=optional;com.sun.management.*;resolution:=optional,io.netty.*;resolution:=optional;javax.annotation.meta.*;resolution:=optional,javax.cache.*;resolution:=optional,javax.persistence.*;resolution:=optional,net.sf.ehcache.*;resolution:=optional,okhttp3.*;resolution:=optional,org.apache.catalina.*;resolution:=optional,org.apache.http.*;resolution:=optional,org.apache.kafka.*;resolution:=optional,org.apache.logging.*;resolution:=optional,org.aspectj.*;resolution:=optional,org.hibernate.*;resolution:=optional,org.jooq.*;resolution:=optional,org.reactivestreams.*;resolution:=optional,reactor.*;resolution:=optional,rx.*;resolution:=optional
+ 1.14.5
+ io.micrometer.core.*;resolution:=optional;io.prometheus.client.exemplars.tracer.*;resolution:=optional;resolution:=optional;io.prometheus.metrics.tracer.*;resolution:=optional;io.opentelemetry.*;resolution:=optional;ch.qos.logback.*;resolution:=optional,com.codahale.*;resolution:=optional,com.github.benmanes.caffeine.*;resolution:=optional;com.mongodb.*;resolution:=optional,com.netflix.*;resolution:=optional;com.sun.management.*;resolution:=optional,io.netty.*;resolution:=optional;javax.annotation.meta.*;resolution:=optional,javax.cache.*;resolution:=optional,javax.persistence.*;resolution:=optional,net.sf.ehcache.*;resolution:=optional,okhttp3.*;resolution:=optional,org.apache.catalina.*;resolution:=optional,org.apache.http.*;resolution:=optional,org.apache.kafka.*;resolution:=optional,org.apache.logging.*;resolution:=optional,org.aspectj.*;resolution:=optional,org.hibernate.*;resolution:=optional,org.jooq.*;resolution:=optional,org.reactivestreams.*;resolution:=optional,reactor.*;resolution:=optional,rx.*;resolution:=optional
@@ -30,7 +30,7 @@
org.hdrhistogram
HdrHistogram
- 2.1.12
+ 2.2.2
compile
@@ -48,7 +48,7 @@
io.dropwizard.metrics
metrics-jmx
- 4.0.7
+ 4.2.30
compile
@@ -63,18 +63,6 @@
${micrometer.version}
compile
-
- io.prometheus
- simpleclient_common
- 0.9.0
- compile
-
-
- io.prometheus
- simpleclient
- 0.9.0
- compile
-
io.micrometer
micrometer-registry-influx
@@ -87,6 +75,37 @@
+
+ io.micrometer
+ micrometer-commons
+ ${micrometer.version}
+ compile
+
+
+ io.prometheus
+ prometheus-metrics-core
+ 1.3.6
+
+
+ io.prometheus
+ prometheus-metrics-model
+ 1.3.6
+
+
+ io.prometheus
+ prometheus-metrics-config
+ 1.3.6
+
+
+ io.prometheus
+ prometheus-metrics-exposition-formats
+ 1.3.6
+
+
+ io.prometheus
+ prometheus-metrics-exposition-textformats
+ 1.3.6
+
org.openhab.core.bundles
org.openhab.core.io.rest
diff --git a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/MetricsRestController.java b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/MetricsRestController.java
index d409538f53b..66ed804fc23 100644
--- a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/MetricsRestController.java
+++ b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/MetricsRestController.java
@@ -43,8 +43,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/InfluxMetricsExporter.java b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/InfluxMetricsExporter.java
index 1e3b9e0b50a..ba170e8c029 100644
--- a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/InfluxMetricsExporter.java
+++ b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/InfluxMetricsExporter.java
@@ -86,7 +86,6 @@ public class InfluxMetricsExporter extends MetricsExporter {
}
@Override
- @io.micrometer.core.lang.Nullable
@Nullable
public String get(@Nullable String k) {
return null; // accept the rest of the defaults
diff --git a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/JmxMetricsExporter.java b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/JmxMetricsExporter.java
index 1c3b0d34623..053cf343120 100644
--- a/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/JmxMetricsExporter.java
+++ b/bundles/org.openhab.io.metrics/src/main/java/org/openhab/io/metrics/exporters/JmxMetricsExporter.java
@@ -57,7 +57,6 @@ public class JmxMetricsExporter extends MetricsExporter {
private JmxConfig getJmxConfig() {
return new JmxConfig() {
@Override
- @io.micrometer.core.lang.Nullable
@Nullable
public String get(@Nullable String k) {
return null; // accept the rest of the defaults