Skip to content

Commit d71cd1e

Browse files
authored
Upgrade OpenTelemetry to 1.56.0, Otel instrumentation to 2.21.0 and Otel semconv to 1.37.0 (#4690)
* Upgrade OpenTelemetry to 1.56.0, intrumentation to 2.21.0 and semconv to 1.37.0 * Fix compatibility on Otel 1.56 * Add otel.contrib.version * Align okhttp3 and okio versions * Upgrade licenses
1 parent a369fe7 commit d71cd1e

5 files changed

Lines changed: 107 additions & 107 deletions

File tree

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -325,41 +325,38 @@ Apache Software License, Version 2.
325325
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
326326
- lib/org.hdrhistogram-HdrHistogram-2.1.10.jar [52]
327327
- lib/com.carrotsearch-hppc-0.9.1.jar [53]
328-
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [54]
329-
- lib/com.squareup.okio-okio-3.6.0.jar [54]
330-
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [54]
331-
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
332-
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
333-
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
334-
- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [55]
335-
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [55]
336-
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [55]
337-
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [55]
338-
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [55]
339-
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
340-
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
341-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [55]
342-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [55]
343-
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
344-
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
345-
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
346-
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [55]
347-
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [55]
348-
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar [59]
349-
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar [59]
350-
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar [59]
351-
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
352-
- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [60]
353-
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [60]
354-
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [60]
355-
- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [60]
356-
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [60]
357-
- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [60]
328+
- lib/com.squareup.okhttp3-okhttp-jvm-5.3.1.jar [54]
329+
- lib/com.squareup.okio-okio-jvm-3.16.3.jar [54]
330+
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [55]
331+
- lib/io.opentelemetry-opentelemetry-api-incubator-1.56.0-alpha.jar [55]
332+
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [55]
333+
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [55]
334+
- lib/io.opentelemetry-opentelemetry-exporter-common-1.56.0.jar [55]
335+
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.56.0.jar [55]
336+
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.56.0.jar [55]
337+
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.56.0-alpha.jar [55]
338+
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.56.0.jar [55]
339+
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [55]
340+
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [55]
341+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [55]
342+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [55]
343+
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [55]
344+
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [55]
345+
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [55]
346+
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [55]
347+
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar [55]
348+
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-2.21.0.jar [59]
349+
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-incubator-2.21.0-alpha.jar [59]
350+
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar [59]
351+
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [55]
352+
- lib/io.prometheus-prometheus-metrics-config-1.3.10.jar [60]
353+
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.10.jar [60]
354+
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.10.jar [60]
355+
- lib/io.prometheus-prometheus-metrics-exposition-formats-no-protobuf-1.3.10.jar [60]
356+
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.10.jar [60]
357+
- lib/io.prometheus-prometheus-metrics-model-1.3.10.jar [60]
358358
- lib/org.jetbrains-annotations-13.0.jar [56]
359-
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [56]
360-
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [56]
361-
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.21.jar [56]
362-
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.21.jar [56]
359+
- lib/org.jetbrains.kotlin-kotlin-stdlib-2.2.21.jar [56]
363360
- lib/com.lmax-disruptor-4.0.0.jar [57]
364361

365362
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
@@ -410,13 +407,13 @@ Apache Software License, Version 2.
410407
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
411408
[52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10
412409
[53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
413-
[54] Source available at https://github.com/square/okio/releases/tag/parent-3.6.0
414-
[55] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
415-
[56] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
410+
[54] Source available at https://github.com/square/okio/releases/tag/parent-3.16.3
411+
[55] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
412+
[56] Source available at https://github.com/JetBrains/kotlin/releases/tag/v2.2.21
416413
[57] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
417414
[58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
418-
[59] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
419-
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
415+
[59] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v2.21.0
416+
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
420417
[61] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
421418
[62] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
422419
------------------------------------------------------------------------------------

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -293,21 +293,21 @@ Apache Software License, Version 2.
293293
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
294294
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
295295
- lib/com.lmax-disruptor-4.0.0.jar [53]
296-
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
297-
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
298-
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [55]
299-
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
300-
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [55]
301-
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [55]
302-
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [55]
303-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [55]
304-
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [55]
305-
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [55]
306-
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [55]
307-
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [55]
308-
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [55]
309-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [55]
310-
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
296+
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [54]
297+
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [54]
298+
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [54]
299+
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [55]
300+
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [55]
301+
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [55]
302+
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [55]
303+
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [55]
304+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [55]
305+
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [55]
306+
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [55]
307+
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [55]
308+
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [55]
309+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [55]
310+
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [54]
311311

312312
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
313313
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
@@ -349,7 +349,7 @@ Apache Software License, Version 2.
349349
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
350350
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
351351
[53] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
352-
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
352+
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
353353
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
354354
[56] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
355355
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -321,41 +321,38 @@ Apache Software License, Version 2.
321321
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
322322
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
323323
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
324-
- lib/com.squareup.okhttp3-okhttp-4.12.0.jar [53]
325-
- lib/com.squareup.okio-okio-3.6.0.jar [53]
326-
- lib/com.squareup.okio-okio-jvm-3.6.0.jar [53]
327-
- lib/io.opentelemetry-opentelemetry-api-1.45.0.jar [54]
328-
- lib/io.opentelemetry-opentelemetry-api-incubator-1.45.0-alpha.jar [54]
329-
- lib/io.opentelemetry-opentelemetry-context-1.45.0.jar [54]
330-
- lib/io.opentelemetry-opentelemetry-exporter-common-1.45.0.jar [54]
331-
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.45.0.jar [54]
332-
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.45.0.jar [54]
333-
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.45.0-alpha.jar [54]
334-
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.45.0.jar [54]
335-
- lib/io.opentelemetry-opentelemetry-sdk-1.45.0.jar [54]
336-
- lib/io.opentelemetry-opentelemetry-sdk-common-1.45.0.jar [54]
337-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.45.0.jar [54]
338-
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.45.0.jar [54]
339-
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.45.0.jar [54]
340-
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.45.0.jar [54]
341-
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.45.0.jar [54]
342-
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.6.jar [58]
343-
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.6-alpha.jar [58]
344-
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar [58]
345-
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.45.0-alpha.jar [54]
346-
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.jar [54]
347-
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
348-
- lib/io.prometheus-prometheus-metrics-config-1.3.4.jar [59]
349-
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.4.jar [59]
350-
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.4.jar [59]
351-
- lib/io.prometheus-prometheus-metrics-exposition-formats-1.3.4.jar [59]
352-
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.4.jar [59]
353-
- lib/io.prometheus-prometheus-metrics-model-1.3.4.jar [59]
324+
- lib/com.squareup.okhttp3-okhttp-jvm-5.3.1.jar [53]
325+
- lib/com.squareup.okio-okio-jvm-3.16.3.jar [53]
326+
- lib/io.opentelemetry-opentelemetry-api-1.56.0.jar [54]
327+
- lib/io.opentelemetry-opentelemetry-api-incubator-1.56.0-alpha.jar [54]
328+
- lib/io.opentelemetry-opentelemetry-common-1.56.0.jar [54]
329+
- lib/io.opentelemetry-opentelemetry-context-1.56.0.jar [54]
330+
- lib/io.opentelemetry-opentelemetry-exporter-common-1.56.0.jar [54]
331+
- lib/io.opentelemetry-opentelemetry-exporter-otlp-1.56.0.jar [54]
332+
- lib/io.opentelemetry-opentelemetry-exporter-otlp-common-1.56.0.jar [54]
333+
- lib/io.opentelemetry-opentelemetry-exporter-prometheus-1.56.0-alpha.jar [54]
334+
- lib/io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.56.0.jar [54]
335+
- lib/io.opentelemetry-opentelemetry-sdk-1.56.0.jar [54]
336+
- lib/io.opentelemetry-opentelemetry-sdk-common-1.56.0.jar [54]
337+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.56.0.jar [54]
338+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.56.0.jar [54]
339+
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.56.0.jar [54]
340+
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.56.0.jar [54]
341+
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.56.0.jar [54]
342+
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-2.21.0.jar [58]
343+
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-incubator-2.21.0-alpha.jar [58]
344+
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar [58]
345+
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.52.0-alpha.jar [54]
346+
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar [54]
347+
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar [54]
348+
- lib/io.prometheus-prometheus-metrics-config-1.3.10.jar [59]
349+
- lib/io.prometheus-prometheus-metrics-exporter-common-1.3.10.jar [59]
350+
- lib/io.prometheus-prometheus-metrics-exporter-httpserver-1.3.10.jar [59]
351+
- lib/io.prometheus-prometheus-metrics-exposition-formats-no-protobuf-1.3.10.jar [59]
352+
- lib/io.prometheus-prometheus-metrics-exposition-textformats-1.3.10.jar [59]
353+
- lib/io.prometheus-prometheus-metrics-model-1.3.10.jar [59]
354354
- lib/org.jetbrains-annotations-13.0.jar [55]
355-
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [55]
356-
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [55]
357-
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.8.21.jar [55]
358-
- lib/org.jetbrains.kotlin-kotlin-stdlib-jdk8-1.8.21.jar [55]
355+
- lib/org.jetbrains.kotlin-kotlin-stdlib-2.2.21.jar [55]
359356
- lib/com.lmax-disruptor-4.0.0.jar [56]
360357

361358
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
@@ -405,13 +402,13 @@ Apache Software License, Version 2.
405402
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
406403
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
407404
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
408-
[53] Source available at https://github.com/square/okio/releases/tag/parent-3.6.0
409-
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.45.0
410-
[55] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
405+
[53] Source available at https://github.com/square/okio/releases/tag/parent-3.16.3
406+
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.56.0
407+
[55] Source available at https://github.com/JetBrains/kotlin/releases/tag/v2.2.21
411408
[56] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
412409
[57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
413-
[58] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.33.6
414-
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
410+
[58] Source available at https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v2.21.0
411+
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
415412
[60] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
416413
[61] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
417414
------------------------------------------------------------------------------------

pom.xml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,13 @@
204204
<forkCount.variable>1</forkCount.variable>
205205
<servlet-api.version>4.0.0</servlet-api.version>
206206
<rxjava.version>3.0.1</rxjava.version>
207-
<otel.version>1.45.0</otel.version>
208-
<otel.instrumentation.version>1.33.6</otel.instrumentation.version>
209-
<otel.semconv.version>1.29.0-alpha</otel.semconv.version>
207+
<otel.version>1.56.0</otel.version>
208+
<otel.instrumentation.version>2.21.0</otel.instrumentation.version>
209+
<otel.semconv.version>1.37.0</otel.semconv.version>
210+
<otel.contrib.version>1.52.0</otel.contrib.version>
211+
<okhttp3.version>5.3.1</okhttp3.version>
212+
<!-- use okio version that matches the okhttp3 version -->
213+
<okio.version>3.16.3</okio.version>
210214
<UBUNTU_MIRROR>http://archive.ubuntu.com/ubuntu/</UBUNTU_MIRROR>
211215
<UBUNTU_SECURITY_MIRROR>http://security.ubuntu.com/ubuntu/</UBUNTU_SECURITY_MIRROR>
212216
</properties>
@@ -474,21 +478,22 @@
474478
<version>${failsafe.version}</version>
475479
</dependency>
476480

477-
<!-- override otel's okhttp 4.11.0 for now, wait for otel update -->
478481
<dependency>
479482
<groupId>com.squareup.okhttp3</groupId>
480483
<artifactId>okhttp-bom</artifactId>
481-
<version>4.12.0</version>
484+
<version>${okhttp3.version}</version>
482485
<type>pom</type>
483486
<scope>import</scope>
484487
</dependency>
485-
<!-- okhttp 4.12.0 use kotlin stdlib 1.8.21 -->
486488
<dependency>
487-
<groupId>org.jetbrains.kotlin</groupId>
488-
<artifactId>kotlin-stdlib-common</artifactId>
489-
<version>1.8.21</version>
489+
<groupId>com.squareup.okio</groupId>
490+
<artifactId>okio-bom</artifactId>
491+
<version>${okio.version}</version>
492+
<type>pom</type>
493+
<scope>import</scope>
490494
</dependency>
491495

496+
492497
<!-- rocksdb dependencies -->
493498
<dependency>
494499
<groupId>org.rocksdb</groupId>
@@ -666,7 +671,7 @@
666671
<dependency>
667672
<groupId>io.opentelemetry.contrib</groupId>
668673
<artifactId>opentelemetry-gcp-resources</artifactId>
669-
<version>${otel.version}-alpha</version>
674+
<version>${otel.contrib.version}-alpha</version>
670675
</dependency>
671676
<dependency>
672677
<groupId>io.opentelemetry</groupId>

0 commit comments

Comments
 (0)