From f75840811e9f6a11889328e7421892a5f4777a50 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 3 May 2024 23:58:31 +0300 Subject: [PATCH] [improve][build] Upgrade OTel library versions and use opentelemetry-instrumentation-bom --- .../server/src/assemble/LICENSE.bin.txt | 51 +++++++++---------- .../shell/src/assemble/LICENSE.bin.txt | 6 +-- pom.xml | 20 ++++++-- pulsar-broker/pom.xml | 6 --- pulsar-client/pom.xml | 2 +- .../pulsar/client/impl/metrics/Counter.java | 2 +- .../client/impl/metrics/LatencyHistogram.java | 2 +- .../client/impl/metrics/UpDownCounter.java | 2 +- 8 files changed, 47 insertions(+), 44 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index c5c243796b6f3..aec4df2a93af9 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -338,12 +338,12 @@ The Apache Software License, Version 2.0 - io.prometheus-simpleclient_tracer_otel-0.16.0.jar - io.prometheus-simpleclient_tracer_otel_agent-0.16.0.jar * Prometheus exporter - - io.prometheus-prometheus-metrics-config-1.1.0.jar - - io.prometheus-prometheus-metrics-exporter-common-1.1.0.jar - - io.prometheus-prometheus-metrics-exporter-httpserver-1.1.0.jar - - io.prometheus-prometheus-metrics-exposition-formats-1.1.0.jar - - io.prometheus-prometheus-metrics-model-1.1.0.jar - - io.prometheus-prometheus-metrics-shaded-protobuf-1.1.0.jar + - io.prometheus-prometheus-metrics-config-1.2.1.jar + - io.prometheus-prometheus-metrics-exporter-common-1.2.1.jar + - io.prometheus-prometheus-metrics-exporter-httpserver-1.2.1.jar + - io.prometheus-prometheus-metrics-exposition-formats-1.2.1.jar + - io.prometheus-prometheus-metrics-model-1.2.1.jar + - io.prometheus-prometheus-metrics-shaded-protobuf-1.2.1.jar * Jakarta Bean Validation API - jakarta.validation-jakarta.validation-api-2.0.2.jar - javax.validation-validation-api-1.1.0.Final.jar @@ -524,26 +524,25 @@ The Apache Software License, Version 2.0 - org.roaringbitmap-RoaringBitmap-0.9.44.jar - org.roaringbitmap-shims-0.9.44.jar * OpenTelemetry - - io.opentelemetry-opentelemetry-api-1.34.1.jar - - io.opentelemetry-opentelemetry-api-events-1.34.1-alpha.jar - - io.opentelemetry-opentelemetry-context-1.34.1.jar - - io.opentelemetry-opentelemetry-exporter-common-1.34.1.jar - - io.opentelemetry-opentelemetry-exporter-otlp-1.34.1.jar - - io.opentelemetry-opentelemetry-exporter-otlp-common-1.34.1.jar - - io.opentelemetry-opentelemetry-exporter-prometheus-1.34.1-alpha.jar - - io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.34.1.jar - - io.opentelemetry-opentelemetry-extension-incubator-1.34.1-alpha.jar - - io.opentelemetry-opentelemetry-sdk-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-common-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-logs-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-metrics-1.34.1.jar - - io.opentelemetry-opentelemetry-sdk-trace-1.34.1.jar - - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.32.1.jar - - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.32.1-alpha.jar - - io.opentelemetry.instrumentation-opentelemetry-resources-1.32.1-alpha.jar - - io.opentelemetry.semconv-opentelemetry-semconv-1.23.1-alpha.jar + - io.opentelemetry-opentelemetry-api-1.37.0.jar + - io.opentelemetry-opentelemetry-api-incubator-1.37.0-alpha.jar + - io.opentelemetry-opentelemetry-context-1.37.0.jar + - io.opentelemetry-opentelemetry-exporter-common-1.37.0.jar + - io.opentelemetry-opentelemetry-exporter-otlp-1.37.0.jar + - io.opentelemetry-opentelemetry-exporter-otlp-common-1.37.0.jar + - io.opentelemetry-opentelemetry-exporter-prometheus-1.37.0-alpha.jar + - io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-common-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-logs-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-metrics-1.37.0.jar + - io.opentelemetry-opentelemetry-sdk-trace-1.37.0.jar + - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.2.jar + - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.2-alpha.jar + - io.opentelemetry.instrumentation-opentelemetry-resources-1.33.2-alpha.jar + - io.opentelemetry.semconv-opentelemetry-semconv-1.25.0-alpha.jar BSD 3-clause "New" or "Revised" License * Google auth library diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 41b38f17dce77..be1f7db63134c 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -389,9 +389,9 @@ The Apache Software License, Version 2.0 - log4j-slf4j2-impl-2.23.1.jar - log4j-web-2.23.1.jar * OpenTelemetry - - opentelemetry-api-1.34.1.jar - - opentelemetry-context-1.34.1.jar - - opentelemetry-extension-incubator-1.34.1-alpha.jar + - opentelemetry-api-1.37.0.jar + - opentelemetry-api-incubator-1.37.0-alpha.jar + - opentelemetry-context-1.37.0.jar * BookKeeper - bookkeeper-common-allocator-4.17.0.jar diff --git a/pom.xml b/pom.xml index 4bfdc54e55d31..7d094a27df219 100644 --- a/pom.xml +++ b/pom.xml @@ -256,10 +256,11 @@ flexible messaging model and an intuitive client API. 3.4.3 1.5.2-3 2.0.6 - 1.34.1 - 1.34.1-alpha - 1.32.1-alpha - 1.23.1-alpha + 1.37.0 + ${opentelemetry.version}-alpha + 1.33.2 + ${opentelemetry.instrumentation.version}-alpha + 1.25.0-alpha 4.7.5 @@ -1497,8 +1498,17 @@ flexible messaging model and an intuitive client API. io.opentelemetry.instrumentation - opentelemetry-resources + opentelemetry-instrumentation-bom ${opentelemetry.instrumentation.version} + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + ${opentelemetry.instrumentation.alpha.version} + pom + import io.opentelemetry.semconv diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 3548877912199..1fe67ca1e2d4f 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -496,12 +496,6 @@ pulsar-package-filesystem-storage ${project.version} - - - io.opentelemetry - opentelemetry-sdk-testing - test - diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index f79af79d57452..b2829fbd21cfc 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -59,7 +59,7 @@ io.opentelemetry - opentelemetry-extension-incubator + opentelemetry-api-incubator diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/Counter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/Counter.java index fffbab4217a86..4042ff8e5d66e 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/Counter.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/Counter.java @@ -21,10 +21,10 @@ import static org.apache.pulsar.client.impl.metrics.MetricsUtil.getDefaultAggregationLabels; import static org.apache.pulsar.client.impl.metrics.MetricsUtil.getTopicAttributes; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder; public class Counter { diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/LatencyHistogram.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/LatencyHistogram.java index ed04eff03b39d..fdae0a14d65fc 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/LatencyHistogram.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/LatencyHistogram.java @@ -23,10 +23,10 @@ import static org.apache.pulsar.client.impl.metrics.MetricsUtil.getTopicAttributes; import com.google.common.collect.Lists; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/UpDownCounter.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/UpDownCounter.java index 3df0c2bb42302..dc2984268cdb6 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/UpDownCounter.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/metrics/UpDownCounter.java @@ -22,10 +22,10 @@ import static org.apache.pulsar.client.impl.metrics.MetricsUtil.getDefaultAggregationLabels; import static org.apache.pulsar.client.impl.metrics.MetricsUtil.getTopicAttributes; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.api.metrics.Meter; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; public class UpDownCounter {