Skip to content

Commit 5d44eba

Browse files
lhotarilhotari
committed
[improve] Upgrade OpenTelemetry library to 1.44.1 version (#23656)
(cherry picked from commit 9ed44dd)
1 parent 4c99912 commit 5d44eba

File tree

5 files changed

+45
-32
lines changed

5 files changed

+45
-32
lines changed

‎distribution/server/src/assemble/LICENSE.bin.txt‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,11 @@ The Apache Software License, Version 2.0
337337
- io.prometheus-simpleclient_tracer_otel-0.16.0.jar
338338
- io.prometheus-simpleclient_tracer_otel_agent-0.16.0.jar
339339
* Prometheus exporter
340-
- io.prometheus-prometheus-metrics-config-1.2.1.jar
341-
- io.prometheus-prometheus-metrics-exporter-common-1.2.1.jar
342-
- io.prometheus-prometheus-metrics-exporter-httpserver-1.2.1.jar
343-
- io.prometheus-prometheus-metrics-exposition-formats-1.2.1.jar
344-
- io.prometheus-prometheus-metrics-model-1.2.1.jar
345-
- io.prometheus-prometheus-metrics-shaded-protobuf-1.2.1.jar
340+
- io.prometheus-prometheus-metrics-config-1.3.3.jar
341+
- io.prometheus-prometheus-metrics-exporter-common-1.3.3.jar
342+
- io.prometheus-prometheus-metrics-exporter-httpserver-1.3.3.jar
343+
- io.prometheus-prometheus-metrics-exposition-formats-1.3.3.jar
344+
- io.prometheus-prometheus-metrics-model-1.3.3.jar
346345
* Jakarta Bean Validation API
347346
- jakarta.validation-jakarta.validation-api-2.0.2.jar
348347
- javax.validation-validation-api-1.1.0.Final.jar
@@ -515,21 +514,21 @@ The Apache Software License, Version 2.0
515514
* RoaringBitmap
516515
- org.roaringbitmap-RoaringBitmap-1.2.0.jar
517516
* OpenTelemetry
518-
- io.opentelemetry-opentelemetry-api-1.38.0.jar
519-
- io.opentelemetry-opentelemetry-api-incubator-1.38.0-alpha.jar
520-
- io.opentelemetry-opentelemetry-context-1.38.0.jar
521-
- io.opentelemetry-opentelemetry-exporter-common-1.38.0.jar
522-
- io.opentelemetry-opentelemetry-exporter-otlp-1.38.0.jar
523-
- io.opentelemetry-opentelemetry-exporter-otlp-common-1.38.0.jar
524-
- io.opentelemetry-opentelemetry-exporter-prometheus-1.38.0-alpha.jar
525-
- io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.38.0.jar
526-
- io.opentelemetry-opentelemetry-sdk-1.38.0.jar
527-
- io.opentelemetry-opentelemetry-sdk-common-1.38.0.jar
528-
- io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.38.0.jar
529-
- io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.38.0.jar
530-
- io.opentelemetry-opentelemetry-sdk-logs-1.38.0.jar
531-
- io.opentelemetry-opentelemetry-sdk-metrics-1.38.0.jar
532-
- io.opentelemetry-opentelemetry-sdk-trace-1.38.0.jar
517+
- io.opentelemetry-opentelemetry-api-1.44.1.jar
518+
- io.opentelemetry-opentelemetry-api-incubator-1.44.1-alpha.jar
519+
- io.opentelemetry-opentelemetry-context-1.44.1.jar
520+
- io.opentelemetry-opentelemetry-exporter-common-1.44.1.jar
521+
- io.opentelemetry-opentelemetry-exporter-otlp-1.44.1.jar
522+
- io.opentelemetry-opentelemetry-exporter-otlp-common-1.44.1.jar
523+
- io.opentelemetry-opentelemetry-exporter-prometheus-1.44.1-alpha.jar
524+
- io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.44.1.jar
525+
- io.opentelemetry-opentelemetry-sdk-1.44.1.jar
526+
- io.opentelemetry-opentelemetry-sdk-common-1.44.1.jar
527+
- io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.44.1.jar
528+
- io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.44.1.jar
529+
- io.opentelemetry-opentelemetry-sdk-logs-1.44.1.jar
530+
- io.opentelemetry-opentelemetry-sdk-metrics-1.44.1.jar
531+
- io.opentelemetry-opentelemetry-sdk-trace-1.44.1.jar
533532
- io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.3.jar
534533
- io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.3-alpha.jar
535534
- io.opentelemetry.instrumentation-opentelemetry-resources-1.33.3-alpha.jar

‎distribution/shell/src/assemble/LICENSE.bin.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,9 @@ The Apache Software License, Version 2.0
388388
- log4j-slf4j2-impl-2.23.1.jar
389389
- log4j-web-2.23.1.jar
390390
* OpenTelemetry
391-
- opentelemetry-api-1.38.0.jar
392-
- opentelemetry-api-incubator-1.38.0-alpha.jar
393-
- opentelemetry-context-1.38.0.jar
391+
- opentelemetry-api-1.44.1.jar
392+
- opentelemetry-api-incubator-1.44.1-alpha.jar
393+
- opentelemetry-context-1.44.1.jar
394394

395395
* BookKeeper
396396
- bookkeeper-common-allocator-4.17.1.jar

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ flexible messaging model and an intuitive client API.</description>
254254
<disruptor.version>3.4.3</disruptor.version>
255255
<zstd-jni.version>1.5.2-3</zstd-jni.version>
256256
<netty-reactive-streams.version>2.0.6</netty-reactive-streams.version>
257-
<opentelemetry.version>1.38.0</opentelemetry.version>
257+
<opentelemetry.version>1.44.1</opentelemetry.version>
258258
<opentelemetry.alpha.version>${opentelemetry.version}-alpha</opentelemetry.alpha.version>
259259
<opentelemetry.instrumentation.version>1.33.3</opentelemetry.instrumentation.version>
260260
<opentelemetry.instrumentation.alpha.version>${opentelemetry.instrumentation.version}-alpha</opentelemetry.instrumentation.alpha.version>

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/BrokerOpenTelemetryTestUtil.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.pulsar.broker.stats;
2020

2121
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
22+
import io.opentelemetry.api.common.AttributeKey;
2223
import io.opentelemetry.api.common.Attributes;
2324
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdkBuilder;
2425
import io.opentelemetry.sdk.metrics.data.MetricData;
@@ -52,13 +53,14 @@ public static void disableExporters(AutoConfiguredOpenTelemetrySdkBuilder sdkBui
5253

5354
public static void assertMetricDoubleSumValue(Collection<MetricData> metrics, String metricName,
5455
Attributes attributes, Consumer<Double> valueConsumer) {
56+
Map<AttributeKey<?>, Object> attributesMap = attributes.asMap();
5557
assertThat(metrics)
5658
.anySatisfy(metric -> assertThat(metric)
5759
.hasName(metricName)
5860
.hasDoubleSumSatisfying(sum -> sum.satisfies(
5961
sumData -> assertThat(sumData.getPoints()).anySatisfy(
6062
point -> {
61-
assertThat(point.getAttributes()).isEqualTo(attributes);
63+
assertThat(point.getAttributes().asMap()).isEqualTo(attributesMap);
6264
valueConsumer.accept(point.getValue());
6365
}))));
6466
}
@@ -70,13 +72,14 @@ public static void assertMetricLongSumValue(Collection<MetricData> metrics, Stri
7072

7173
public static void assertMetricLongSumValue(Collection<MetricData> metrics, String metricName,
7274
Attributes attributes, Consumer<Long> valueConsumer) {
75+
Map<AttributeKey<?>, Object> attributesMap = attributes.asMap();
7376
assertThat(metrics)
7477
.anySatisfy(metric -> assertThat(metric)
7578
.hasName(metricName)
7679
.hasLongSumSatisfying(sum -> sum.satisfies(
7780
sumData -> assertThat(sumData.getPoints()).anySatisfy(
7881
point -> {
79-
assertThat(point.getAttributes()).isEqualTo(attributes);
82+
assertThat(point.getAttributes().asMap()).isEqualTo(attributesMap);
8083
valueConsumer.accept(point.getValue());
8184
}))));
8285
}
@@ -88,13 +91,14 @@ public static void assertMetricLongGaugeValue(Collection<MetricData> metrics, St
8891

8992
public static void assertMetricLongGaugeValue(Collection<MetricData> metrics, String metricName,
9093
Attributes attributes, Consumer<Long> valueConsumer) {
94+
Map<AttributeKey<?>, Object> attributesMap = attributes.asMap();
9195
assertThat(metrics)
9296
.anySatisfy(metric -> assertThat(metric)
9397
.hasName(metricName)
9498
.hasLongGaugeSatisfying(gauge -> gauge.satisfies(
9599
pointData -> assertThat(pointData.getPoints()).anySatisfy(
96100
point -> {
97-
assertThat(point.getAttributes()).isEqualTo(attributes);
101+
assertThat(point.getAttributes().asMap()).isEqualTo(attributesMap);
98102
valueConsumer.accept(point.getValue());
99103
}))));
100104
}

‎pulsar-broker/src/test/java/org/apache/pulsar/client/metrics/ClientMetricsTest.java‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.testng.Assert.assertEquals;
2222
import static org.testng.Assert.assertNotNull;
2323
import static org.testng.Assert.fail;
24-
import io.opentelemetry.api.OpenTelemetry;
24+
import io.opentelemetry.api.common.AttributeKey;
2525
import io.opentelemetry.api.common.Attributes;
2626
import io.opentelemetry.sdk.OpenTelemetrySdk;
2727
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
@@ -48,7 +48,7 @@
4848
public class ClientMetricsTest extends ProducerConsumerBase {
4949

5050
InMemoryMetricReader reader;
51-
OpenTelemetry otel;
51+
OpenTelemetrySdk otel;
5252

5353
@BeforeMethod
5454
@Override
@@ -67,6 +67,14 @@ protected void setup() throws Exception {
6767
@Override
6868
protected void cleanup() throws Exception {
6969
super.internalCleanup();
70+
if (otel != null) {
71+
otel.close();
72+
otel = null;
73+
}
74+
if (reader != null) {
75+
reader.close();
76+
reader = null;
77+
}
7078
}
7179

7280
private Map<String, MetricData> collectMetrics() {
@@ -88,8 +96,9 @@ private long getCounterValue(Map<String, MetricData> metrics, String name,
8896
assertNotNull(md, "metric not found: " + name);
8997
assertEquals(md.getType(), MetricDataType.LONG_SUM);
9098

99+
Map<AttributeKey<?>, Object> expectedAttributesMap = expectedAttributes.asMap();
91100
for (var ex : md.getLongSumData().getPoints()) {
92-
if (ex.getAttributes().equals(expectedAttributes)) {
101+
if (ex.getAttributes().asMap().equals(expectedAttributesMap)) {
93102
return ex.getValue();
94103
}
95104
}
@@ -109,8 +118,9 @@ private long getHistoCountValue(Map<String, MetricData> metrics, String name,
109118
assertNotNull(md, "metric not found: " + name);
110119
assertEquals(md.getType(), MetricDataType.HISTOGRAM);
111120

121+
Map<AttributeKey<?>, Object> expectedAttributesMap = expectedAttributes.asMap();
112122
for (var ex : md.getHistogramData().getPoints()) {
113-
if (ex.getAttributes().equals(expectedAttributes)) {
123+
if (ex.getAttributes().asMap().equals(expectedAttributesMap)) {
114124
return ex.getCount();
115125
}
116126
}

0 commit comments

Comments
 (0)