From c90e2ea38f234d97d0938dee302386932f004163 Mon Sep 17 00:00:00 2001
From: Keshav Dandeva <keshavdandeva@google.com>
Date: Thu, 18 Jun 2026 13:03:46 +0000
Subject: [PATCH 1/2] fix(bigquery-jdbc): fix shading exclusions and telemetry
 credentials resolution

---
 java-bigquery-jdbc/pom.xml                          | 13 ++++++-------
 .../bigquery/jdbc/BigQueryJdbcOpenTelemetry.java    |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java-bigquery-jdbc/pom.xml b/java-bigquery-jdbc/pom.xml
index 024507f1285e..4c0762ea1da7 100644
--- a/java-bigquery-jdbc/pom.xml
+++ b/java-bigquery-jdbc/pom.xml
@@ -179,8 +179,8 @@
                           version mismatches, but this is a necessary trade-off for the OpenTelemetry 
                           integration to function correctly across different applications.
                         -->
-                        <exclude>io.opentelemetry.api.*</exclude>
-                        <exclude>io.opentelemetry.context.*</exclude>
+                        <exclude>io.opentelemetry.api.**</exclude>
+                        <exclude>io.opentelemetry.context.**</exclude>
                       </excludes>
                     </relocation>
                     <relocation>
@@ -382,6 +382,10 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk-logs</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.opentelemetry.contrib</groupId>
       <artifactId>opentelemetry-gcp-auth-extension</artifactId>
@@ -442,11 +446,6 @@
       <artifactId>opentelemetry-sdk-testing</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.opentelemetry</groupId>
-      <artifactId>opentelemetry-sdk-logs</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
diff --git a/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOpenTelemetry.java b/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOpenTelemetry.java
index 40d35c880263..251b66711abf 100644
--- a/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOpenTelemetry.java
+++ b/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOpenTelemetry.java
@@ -209,7 +209,9 @@ public static Logging createLoggingClient(
 
   private static Credentials resolveCredentialsFromString(String credsString) {
     Map<String, String> authProperties = new java.util.HashMap<>();
-    authProperties.put(BigQueryJdbcUrlUtility.OAUTH_TYPE_PROPERTY_NAME, "0"); // Service Account
+    authProperties.put(
+        BigQueryJdbcUrlUtility.OAUTH_TYPE_PROPERTY_NAME,
+        BigQueryJdbcOAuthUtility.AuthType.GOOGLE_SERVICE_ACCOUNT.name()); // Service Account
 
     byte[] credsBytes = credsString.getBytes(StandardCharsets.UTF_8);
     if (BigQueryJdbcOAuthUtility.isJson(credsBytes)) {

From 3042a0022119d81b5f66c5fa40a85b03c1d30bd2 Mon Sep 17 00:00:00 2001
From: Keshav Dandeva <keshavdandeva@google.com>
Date: Thu, 18 Jun 2026 14:32:14 +0000
Subject: [PATCH 2/2] ignore opentelemetry-sdk-logs in dependency analysis

---
 java-bigquery-jdbc/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java-bigquery-jdbc/pom.xml b/java-bigquery-jdbc/pom.xml
index 4c0762ea1da7..26b5081bcd83 100644
--- a/java-bigquery-jdbc/pom.xml
+++ b/java-bigquery-jdbc/pom.xml
@@ -87,6 +87,9 @@
                 <ignoredUnusedDeclaredDependency>io.opentelemetry.contrib:opentelemetry-gcp-auth-extension</ignoredUnusedDeclaredDependency>
                 <ignoredUnusedDeclaredDependency>io.opentelemetry:opentelemetry-exporter-otlp</ignoredUnusedDeclaredDependency>
             </ignoredUnusedDeclaredDependencies>
+            <ignoredDependencies>
+                <ignoredDependency>io.opentelemetry:opentelemetry-sdk-logs</ignoredDependency>
+            </ignoredDependencies>
         </configuration>
       </plugin>
       <plugin>