diff --git a/java-bigquery-jdbc/pom.xml b/java-bigquery-jdbc/pom.xml index 024507f1285e..26b5081bcd83 100644 --- a/java-bigquery-jdbc/pom.xml +++ b/java-bigquery-jdbc/pom.xml @@ -87,6 +87,9 @@ io.opentelemetry.contrib:opentelemetry-gcp-auth-extension io.opentelemetry:opentelemetry-exporter-otlp + + io.opentelemetry:opentelemetry-sdk-logs + @@ -179,8 +182,8 @@ version mismatches, but this is a necessary trade-off for the OpenTelemetry integration to function correctly across different applications. --> - io.opentelemetry.api.* - io.opentelemetry.context.* + io.opentelemetry.api.** + io.opentelemetry.context.** @@ -382,6 +385,10 @@ io.opentelemetry opentelemetry-sdk-extension-autoconfigure-spi + + io.opentelemetry + opentelemetry-sdk-logs + io.opentelemetry.contrib opentelemetry-gcp-auth-extension @@ -442,11 +449,6 @@ opentelemetry-sdk-testing test - - io.opentelemetry - opentelemetry-sdk-logs - test - com.google.cloud google-cloud-trace 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 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)) {