Shade opentelemetry-okhttp-instrumentation

OkHttp is shaded which requires OkHttp instrumentation to be shaded too.
trinodb · Sep 17, 2024 · d631bf8 · d631bf8
1 parent e4865d3
commit d631bf8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git 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
@@ -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)