diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java index 999c54a83e3..35300d3877a 100644 --- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java +++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java @@ -27,6 +27,7 @@ import com.google.api.gax.rpc.UnavailableException; import com.google.auth.Credentials; import com.google.auth.oauth2.GoogleCredentials; +import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.ByteArray; import com.google.cloud.Date; import com.google.cloud.NoCredentials; @@ -888,7 +889,7 @@ private synchronized TraceServiceClient getTraceServiceClient() throws IOExcepti credentials = NoCredentials.getInstance(); } else { credentials = - GoogleCredentials.fromStream( + ServiceAccountCredentials.fromStream( new ByteArrayInputStream( FileUtils.readFileToByteArray(new File(WorkerProxy.serviceKeyFile))), HTTP_TRANSPORT_FACTORY); diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java index 2146adb1d47..0da30f82d23 100644 --- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java +++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java @@ -19,7 +19,7 @@ import com.google.api.client.http.javanet.NetHttpTransport; import com.google.auth.Credentials; import com.google.auth.http.HttpTransportFactory; -import com.google.auth.oauth2.GoogleCredentials; +import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.opentelemetry.trace.TraceConfiguration; import com.google.cloud.opentelemetry.trace.TraceExporter; import com.google.cloud.spanner.ErrorCode; @@ -87,7 +87,7 @@ public static OpenTelemetrySdk setupOpenTelemetrySdk() throws Exception { // Read credentials from the serviceKeyFile. HttpTransportFactory HTTP_TRANSPORT_FACTORY = NetHttpTransport::new; Credentials credentials = - GoogleCredentials.fromStream( + ServiceAccountCredentials.fromStream( new ByteArrayInputStream(FileUtils.readFileToByteArray(new File(serviceKeyFile))), HTTP_TRANSPORT_FACTORY);