This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.17
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.17 by this push:
new cf0f4e189f Upgrade OpenTelemetry version and align versions using BOMs
(#4589)
cf0f4e189f is described below
commit cf0f4e189f21d777968877f276f974380465eebf
Author: Lari Hotari <[email protected]>
AuthorDate: Thu Apr 17 03:47:00 2025 +0300
Upgrade OpenTelemetry version and align versions using BOMs (#4589)
OpenTelemetry library version is outdated in BookKeeper and conflicting
with Pulsar OTel libraries since some libraries have evolved.
- upgrade Otel to 1.45.0
- upgrade Otel instrumentation version to 1.33.6 (this was split from main
Otel library to a separate project)
(cherry picked from commit 1e59ae015c524992ccc603fe65fe66e961585ae7)
---
.../src/main/resources/LICENSE-all.bin.txt | 52 ++++++++++++----------
.../src/main/resources/LICENSE-bkctl.bin.txt | 34 +++++++-------
.../src/main/resources/LICENSE-server.bin.txt | 52 ++++++++++++----------
pom.xml | 35 ++++++++++++++-
.../otel-metrics-provider/pom.xml | 5 +--
.../bookkeeper/stats/otel/OtelMetricsProvider.java | 12 ++---
6 files changed, 114 insertions(+), 76 deletions(-)
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index a80ad69338..f4fe87775c 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -327,29 +327,33 @@ Apache Software License, Version 2.
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [54]
- lib/com.squareup.okio-okio-3.6.0.jar [54]
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-exporter-common-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
--
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.26.0-alpha.jar
[55]
--
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar
[55]
-- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar
[55]
-- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
--
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar
[55]
--
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar
[55]
--
lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.jar
[54]
+- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
+- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [55]
+- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar
[55]
+-
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar
[55]
+- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
+- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar
[55]
+- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [55]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar
[59]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar
[59]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar
[59]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
+- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [60]
+- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [60]
+- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [60]
+- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [60]
+- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [60]
+- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [60]
- lib/org.jetbrains-annotations-13.0.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [56]
@@ -405,9 +409,11 @@ Apache Software License, Version 2.
[52] Source available at
https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10
[53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
[54] Source available at
https://github.com/square/okio/releases/tag/parent-3.6.0
-[55] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
+[55] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[56] Source available at
https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
[58] Source available at
https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
+[59] Source available at
https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
+[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 2af98eadb2..9e01855c8f 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -291,24 +291,20 @@ Apache Software License, Version 2.
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
-- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
--
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar
[55]
-- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
-- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-api-incubator-1.43.0-alpha.jar [55]
-- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar
[55]
-- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
-- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.43.0.jar
[55]
+- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
+- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
+-
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar
[55]
+- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
+- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
+- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar
[55]
+- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar
[55]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
[1] Source available at
https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
@@ -350,7 +346,7 @@ Apache Software License, Version 2.
[50] Source available at
https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
-[54] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
+[54] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[55] Source available at
https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index e80f7aaed0..a48cdadbac 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -323,29 +323,33 @@ Apache Software License, Version 2.
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [53]
- lib/com.squareup.okio-okio-3.6.0.jar [53]
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [53]
-- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [54]
-- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [54]
-- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-exporter-common-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.26.0-alpha.jar [54]
-- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [54]
-- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [54]
--
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.26.0-alpha.jar
[54]
--
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar
[54]
-- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [54]
-- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [54]
-- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [54]
--
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar
[54]
--
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar
[54]
--
lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.jar
[54]
-- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar
[54]
-- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [54]
+- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [54]
+- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [54]
+- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar
[54]
+-
lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar
[54]
+- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [54]
+- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [54]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar
[58]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar
[58]
+-
lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar
[58]
+- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar
[54]
+- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [54]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
+- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [59]
+- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [59]
+- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [59]
+- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [59]
+- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [59]
+- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [59]
- lib/org.jetbrains-annotations-13.0.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [55]
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [55]
@@ -400,9 +404,11 @@ Apache Software License, Version 2.
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
[53] Source available at
https://github.com/square/okio/releases/tag/parent-3.6.0
-[54] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
+[54] Source available at
https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
[55] Source available at
https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
[57] Source available at
https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
+[58] Source available at
https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
+[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
diff --git a/pom.xml b/pom.xml
index ac78dcfde9..af492f266f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,7 +201,9 @@
<forkCount.variable>1</forkCount.variable>
<servlet-api.version>4.0.0</servlet-api.version>
<rxjava.version>3.0.1</rxjava.version>
- <otel.version>1.26.0</otel.version>
+ <otel.version>1.45.0</otel.version>
+ <otel.instrumentation.version>1.33.6</otel.instrumentation.version>
+ <otel.semconv.version>1.29.0-alpha</otel.semconv.version>
<UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
<UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
</properties>
@@ -638,6 +640,37 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.contrib</groupId>
+ <artifactId>opentelemetry-gcp-resources</artifactId>
+ <version>${otel.version}-alpha</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-bom-alpha</artifactId>
+ <version>${otel.version}-alpha</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-bom</artifactId>
+ <version>${otel.instrumentation.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.instrumentation</groupId>
+ <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
+ <version>${otel.instrumentation.version}-alpha</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>${otel.semconv.version}</version>
+ </dependency>
<!-- http-client -->
<dependency>
diff --git a/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml
b/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml
index b17d92c330..6e03cb69bb 100644
--- a/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml
+++ b/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-prometheus</artifactId>
- <version>${otel.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
@@ -53,13 +52,11 @@
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
- <artifactId>opentelemetry-runtime-metrics</artifactId>
- <version>${otel.version}-alpha</version>
+ <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
- <version>${otel.version}-alpha</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
diff --git
a/stats/bookkeeper-stats-providers/otel-metrics-provider/src/main/java/org/apache/bookkeeper/stats/otel/OtelMetricsProvider.java
b/stats/bookkeeper-stats-providers/otel-metrics-provider/src/main/java/org/apache/bookkeeper/stats/otel/OtelMetricsProvider.java
index 54393c9155..440c6fa261 100644
---
a/stats/bookkeeper-stats-providers/otel-metrics-provider/src/main/java/org/apache/bookkeeper/stats/otel/OtelMetricsProvider.java
+++
b/stats/bookkeeper-stats-providers/otel-metrics-provider/src/main/java/org/apache/bookkeeper/stats/otel/OtelMetricsProvider.java
@@ -21,12 +21,12 @@ import io.netty.util.internal.PlatformDependent;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.Meter;
-import io.opentelemetry.instrumentation.runtimemetrics.BufferPools;
-import io.opentelemetry.instrumentation.runtimemetrics.Classes;
-import io.opentelemetry.instrumentation.runtimemetrics.Cpu;
-import io.opentelemetry.instrumentation.runtimemetrics.GarbageCollector;
-import io.opentelemetry.instrumentation.runtimemetrics.MemoryPools;
-import io.opentelemetry.instrumentation.runtimemetrics.Threads;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.MemoryPools;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Threads;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.metrics.Aggregation;
import io.opentelemetry.sdk.metrics.InstrumentSelector;
