Update micrometer version and include OTLP

smallrye · Sep 29, 2023 · a7a15f8 · a7a15f8
1 parent 8d55e58
commit a7a15f8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-~ Copyright 2017 Red Hat, Inc. and/or its affiliates.
+~ Copyright 2017, 2023 Red Hat, Inc. and/or its affiliates.
 ~
 ~ Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 -->
@@ -213,6 +213,11 @@
       <artifactId>micrometer-registry-wavefront</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-otlp</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/implementation/src/main/java/io/smallrye/metrics/micrometer/MicrometerBackends.java b/implementation/src/main/java/io/smallrye/metrics/micrometer/MicrometerBackends.java
@@ -45,6 +45,8 @@
 import io.micrometer.kairos.KairosMeterRegistry;
 import io.micrometer.newrelic.NewRelicConfig;
 import io.micrometer.newrelic.NewRelicMeterRegistry;
+import io.micrometer.registry.otlp.OtlpConfig;
+import io.micrometer.registry.otlp.OtlpMeterRegistry;
 import io.micrometer.signalfx.SignalFxConfig;
 import io.micrometer.signalfx.SignalFxMeterRegistry;
 import io.micrometer.stackdriver.StackdriverConfig;
@@ -378,5 +380,23 @@ public String get(final String propertyName) {
                 }
             }, io.micrometer.core.instrument.Clock.SYSTEM);
         }
+
+    }
+
+    @RequiresClass({ OtlpMeterRegistry.class, OtlpConfig.class })
+    public static class OtlpBackendProducer extends MicrometerBackends {
+
+        public MeterRegistry produce() {
+            if (!Boolean
+                    .parseBoolean(config.getOptionalValue("mp.metrics.otlp.enabled", String.class).orElse("false"))) {
+                return null;
+            }
+            return new OtlpMeterRegistry(new OtlpConfig() {
+                @Override
+                public String get(final String propertyName) {
+                    return config.getOptionalValue("mp.metrics." + propertyName, String.class).orElse(null);
+                }
+            }, io.micrometer.core.instrument.Clock.SYSTEM);
+        }
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~  Copyright 2017 Red Hat, Inc.
+ ~  Copyright 2017, 2023 Red Hat, Inc.
  ~
  ~  Licensed under the Apache License, Version 2.0 (the "License");
  ~  you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
     <version.microprofile-config>3.0.1</version.microprofile-config>
     <version.microprofile-metrics>5.1.0-RC1</version.microprofile-metrics>
 
-    <version.micrometer>1.9.3</version.micrometer>
+    <version.micrometer>1.11.4</version.micrometer>
 
     <version.smallrye.config>3.0.0</version.smallrye.config>
     <version.smallrye.common>2.0.0</version.smallrye.common>
@@ -163,6 +163,11 @@
         <artifactId>micrometer-registry-wavefront</artifactId>
         <version>${version.micrometer}</version>
       </dependency>
+      <dependency>
+        <groupId>io.micrometer</groupId>
+        <artifactId>micrometer-registry-otlp</artifactId>
+        <version>${version.micrometer}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.config</groupId>
         <artifactId>microprofile-config-api</artifactId>