Skip to content

Commit 46d1366

Browse files
olavloitelqiu96
authored andcommitted
test: check for credentials for traces (#2128)
Add an explicit check to the test whether there are credentials available.
1 parent 916618a commit 46d1366

File tree

3 files changed

+27
-11
lines changed

3 files changed

+27
-11
lines changed

.kokoro/build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ integration)
7777
-DtrimStackTrace=false \
7878
-Dclirr.skip=true \
7979
-Denforcer.skip=true \
80-
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-test \
81-
-Dspanner.gce.config.project_id=span-cloud-testing \
8280
-fae \
8381
verify
8482
RETURN_CODE=$?

.kokoro/presubmit/integration.cfg

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,24 @@ env_vars: {
1111
value: "integration"
1212
}
1313

14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
1425
env_vars: {
1526
key: "GOOGLE_APPLICATION_CREDENTIALS"
16-
value: "secret_manager/java-client-testing"
27+
value: "secret_manager/java-it-service-account"
1728
}
1829

1930
env_vars: {
2031
key: "SECRET_MANAGER_KEYS"
21-
value: "java-client-testing"
32+
value: "java-it-service-account"
2233
}
2334

src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import com.google.api.gax.core.FixedCredentialsProvider;
2525
import com.google.api.gax.rpc.ResourceExhaustedException;
26+
import com.google.auth.Credentials;
27+
import com.google.auth.oauth2.GoogleCredentials;
2628
import com.google.cloud.opentelemetry.trace.TraceConfiguration;
2729
import com.google.cloud.opentelemetry.trace.TraceExporter;
2830
import com.google.cloud.spanner.Database;
@@ -282,14 +284,19 @@ private void assertUpdateResult(long updateCount, String sql)
282284
}
283285

284286
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+
}
285296
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();
293300
try (TraceServiceClient client = TraceServiceClient.create(settings)) {
294301
// It can take a few seconds before the trace is visible.
295302
Thread.sleep(5000L);

0 commit comments

Comments
 (0)