From f32ffeeefbb6faac5512b37d0ed0ac617fd59eee Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Mon, 3 Jun 2024 11:32:26 +0300
Subject: [PATCH 1/2] [improve][misc] Upgrade opentelemetry to 1.38.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 347ef9e83c2c6..14157ebbbd9e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,9 +259,9 @@ flexible messaging model and an intuitive client API.</description>
     <disruptor.version>3.4.3</disruptor.version>
     <zstd-jni.version>1.5.2-3</zstd-jni.version>
     <netty-reactive-streams.version>2.0.6</netty-reactive-streams.version>
-    <opentelemetry.version>1.37.0</opentelemetry.version>
+    <opentelemetry.version>1.38.0</opentelemetry.version>
     <opentelemetry.alpha.version>${opentelemetry.version}-alpha</opentelemetry.alpha.version>
-    <opentelemetry.instrumentation.version>1.33.2</opentelemetry.instrumentation.version>
+    <opentelemetry.instrumentation.version>1.33.3</opentelemetry.instrumentation.version>
     <opentelemetry.instrumentation.alpha.version>${opentelemetry.instrumentation.version}-alpha</opentelemetry.instrumentation.alpha.version>
     <opentelemetry.semconv.version>1.25.0-alpha</opentelemetry.semconv.version>
     <picocli.version>4.7.5</picocli.version>

From 3723777078b9c03742fb1696330d75289bb01edf Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Mon, 3 Jun 2024 11:44:25 +0300
Subject: [PATCH 2/2] Update license files

---
 .../server/src/assemble/LICENSE.bin.txt       | 40 +++++++++----------
 .../shell/src/assemble/LICENSE.bin.txt        |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index e458200757167..a3b0d640223f5 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -522,26 +522,26 @@ 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.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.instrumentation-opentelemetry-runtime-telemetry-java17-1.33.2-alpha.jar
-    - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.2-alpha.jar
+    - io.opentelemetry-opentelemetry-api-1.38.0.jar
+    - io.opentelemetry-opentelemetry-api-incubator-1.38.0-alpha.jar
+    - io.opentelemetry-opentelemetry-context-1.38.0.jar
+    - io.opentelemetry-opentelemetry-exporter-common-1.38.0.jar
+    - io.opentelemetry-opentelemetry-exporter-otlp-1.38.0.jar
+    - io.opentelemetry-opentelemetry-exporter-otlp-common-1.38.0.jar
+    - io.opentelemetry-opentelemetry-exporter-prometheus-1.38.0-alpha.jar
+    - io.opentelemetry-opentelemetry-exporter-sender-okhttp-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-common-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-logs-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-metrics-1.38.0.jar
+    - io.opentelemetry-opentelemetry-sdk-trace-1.38.0.jar
+    - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.33.3.jar
+    - io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.33.3-alpha.jar
+    - io.opentelemetry.instrumentation-opentelemetry-resources-1.33.3-alpha.jar
+    - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java17-1.33.3-alpha.jar
+    - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.3-alpha.jar
     - io.opentelemetry.semconv-opentelemetry-semconv-1.25.0-alpha.jar
 
 BSD 3-clause "New" or "Revised" License
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt
index be1f7db63134c..c51387788e342 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.37.0.jar
-    - opentelemetry-api-incubator-1.37.0-alpha.jar
-    - opentelemetry-context-1.37.0.jar
+    - opentelemetry-api-1.38.0.jar
+    - opentelemetry-api-incubator-1.38.0-alpha.jar
+    - opentelemetry-context-1.38.0.jar
 
  * BookKeeper
     - bookkeeper-common-allocator-4.17.0.jar