From d631bf86486818b122eb76c0be46ce6874820c42 Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <github@wendigo.pl>
Date: Tue, 17 Sep 2024 21:07:25 +0200
Subject: [PATCH] Shade opentelemetry-okhttp-instrumentation

OkHttp is shaded which requires OkHttp instrumentation to be shaded too.
---
 client/trino-jdbc/pom.xml                     | 21 +++++++++++++------
 .../test/java/io/trino/jdbc/JdbcDriverIT.java |  1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/trino-jdbc/pom.xml b/client/trino-jdbc/pom.xml
index 1332bd45ffcc3..d0d06fdffebcd 100644
--- a/client/trino-jdbc/pom.xml
+++ b/client/trino-jdbc/pom.xml
@@ -63,6 +63,17 @@
             <version>1.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-okhttp-3.0</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-client</artifactId>
@@ -92,12 +103,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-okhttp-3.0</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -432,6 +437,10 @@
                                     <pattern>io.trino.client</pattern>
                                     <shadedPattern>${shadeBase}.client</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>io.opentelemetry.instrumentation.okhttp.v3_0</pattern>
+                                    <shadedPattern>${shadeBase}.opentelemetry.okhttp.v3_0</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.fasterxml.jackson</pattern>
                                     <shadedPattern>${shadeBase}.jackson</shadedPattern>
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java
index 927cc9bc8753a..7f34418f6421a 100644
--- a/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java
+++ b/client/trino-jdbc/src/test/java/io/trino/jdbc/JdbcDriverIT.java
@@ -61,6 +61,7 @@ public void testOpenTelemetryIsNotShaded()
                     .filter(value -> !value.isDirectory())
                     .map(ZipEntry::getName)
                     .filter(name -> name.contains("io/opentelemetry"))
+                    .filter(name -> !name.contains("io/opentelemetry/instrumentation/okhttp/v3_0"))
                     .collect(toImmutableList());
 
             assertThat(openTelemetryFiles)