diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt index a3d6f85db47..82ec677e795 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] @@ -406,10 +410,12 @@ 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 [57] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0 [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 2fc4f434124..31ed31ffc16 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -292,24 +292,20 @@ Apache Software License, Version 2. - lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51] - lib/com.carrotsearch-hppc-0.9.1.jar [52] - lib/com.lmax-disruptor-4.0.0.jar [53] -- 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 @@ -352,7 +348,7 @@ 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/LMAX-Exchange/disruptor/releases/tag/4.0.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/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 e473a34f477..5f74d40b2e9 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] @@ -401,10 +405,12 @@ 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 [56] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0 [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 de32adf8cb0..4d7bd029c85 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,9 @@ 1 4.0.0 3.0.1 - 1.26.0 + 1.45.0 + 1.33.6 + 1.29.0-alpha http://archive.ubuntu.com/ubuntu/ http://security.ubuntu.com/ubuntu/ @@ -649,6 +651,37 @@ pom import + + io.opentelemetry.contrib + opentelemetry-gcp-resources + ${otel.version}-alpha + + + io.opentelemetry + opentelemetry-bom-alpha + ${otel.version}-alpha + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom + ${otel.instrumentation.version} + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + ${otel.instrumentation.version}-alpha + pom + import + + + io.opentelemetry.semconv + opentelemetry-semconv + ${otel.semconv.version} + diff --git a/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml b/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml index f2e92ce26fb..796fcef49e2 100644 --- a/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml +++ b/stats/bookkeeper-stats-providers/otel-metrics-provider/pom.xml @@ -42,7 +42,6 @@ io.opentelemetry opentelemetry-exporter-prometheus - ${otel.version}-alpha io.opentelemetry @@ -50,13 +49,11 @@ io.opentelemetry.instrumentation - opentelemetry-runtime-metrics - ${otel.version}-alpha + opentelemetry-runtime-telemetry-java8 io.opentelemetry opentelemetry-sdk-extension-autoconfigure - ${otel.version}-alpha io.netty 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 54393c91553..440c6fa2611 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.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;