|
23 | 23 |
|
24 | 24 | import com.google.api.gax.core.FixedCredentialsProvider; |
25 | 25 | import com.google.api.gax.rpc.ResourceExhaustedException; |
| 26 | +import com.google.auth.Credentials; |
| 27 | +import com.google.auth.oauth2.GoogleCredentials; |
26 | 28 | import com.google.cloud.opentelemetry.trace.TraceConfiguration; |
27 | 29 | import com.google.cloud.opentelemetry.trace.TraceExporter; |
28 | 30 | import com.google.cloud.spanner.Database; |
@@ -282,14 +284,19 @@ private void assertUpdateResult(long updateCount, String sql) |
282 | 284 | } |
283 | 285 |
|
284 | 286 | private void assertTrace(String sql) throws IOException, InterruptedException { |
| 287 | + Credentials credentials; |
| 288 | + if (env.getTestHelper().getOptions().getCredentials() != null) { |
| 289 | + credentials = env.getTestHelper().getOptions().getCredentials(); |
| 290 | + } else { |
| 291 | + credentials = GoogleCredentials.getApplicationDefault(); |
| 292 | + } |
| 293 | + if (credentials == null) { |
| 294 | + throw new IllegalStateException("No credentials found"); |
| 295 | + } |
285 | 296 | TraceServiceSettings settings = |
286 | | - env.getTestHelper().getOptions().getCredentials() == null |
287 | | - ? TraceServiceSettings.newBuilder().build() |
288 | | - : TraceServiceSettings.newBuilder() |
289 | | - .setCredentialsProvider( |
290 | | - FixedCredentialsProvider.create( |
291 | | - env.getTestHelper().getOptions().getCredentials())) |
292 | | - .build(); |
| 297 | + TraceServiceSettings.newBuilder() |
| 298 | + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) |
| 299 | + .build(); |
293 | 300 | try (TraceServiceClient client = TraceServiceClient.create(settings)) { |
294 | 301 | // It can take a few seconds before the trace is visible. |
295 | 302 | Thread.sleep(5000L); |
|
0 commit comments