Skip to content

fix(datastore): Configure TraceExporter with Datastore credentials in E2E tests #13627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lqiu96 merged 5 commits into from
Jul 1, 2026
Merged

fix(datastore): Configure TraceExporter with Datastore credentials in E2E tests #13627

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
729454e
fix(datastore): Configure TraceExporter with Datastore credentials in…
lqiu96 Jul 1, 2026
c26d1f5
refactor(datastore): Rename traceClient_v1 to traceClientV1 to use ca…
lqiu96 Jul 1, 2026
6d7902c
refactor(datastore): Rename traceClientV1 to traceClient
lqiu96 Jul 1, 2026
478883c
refactor(datastore): Initialize TraceConfiguration.Builder with proje…
lqiu96 Jul 1, 2026
3384395
test(datastore): fix transaction query tracing test
lqiu96 Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions .../google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITE2ETracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.rpc.DeadlineExceededException;
import com.google.api.gax.rpc.NotFoundException;
import com.google.auth.Credentials;
import com.google.cloud.datastore.AggregationQuery;
import com.google.cloud.datastore.AggregationResult;
import com.google.cloud.datastore.AggregationResults;
Expand All @@ -58,6 +60,7 @@
import com.google.cloud.opentelemetry.trace.TraceConfiguration;
import com.google.cloud.opentelemetry.trace.TraceExporter;
import com.google.cloud.trace.v1.TraceServiceClient;
import com.google.cloud.trace.v1.TraceServiceSettings;
import com.google.common.base.Preconditions;
import com.google.devtools.cloudtrace.v1.Trace;
import com.google.devtools.cloudtrace.v1.TraceSpan;
Expand Down Expand Up @@ -246,12 +249,12 @@ private boolean dfsContainsCallStack(long spanId, List<String> expectedCallStack
private static TraceExporter traceExporter;

// Required for reading back traces from Cloud Trace for validation
private static TraceServiceClient traceClient_v1;
private static TraceServiceClient traceClient;

// Custom SpanContext for each test, required for TraceID injection
private static SpanContext customSpanContext;

// Trace read back from Cloud Trace using traceClient_v1 for verification
// Trace read back from Cloud Trace using traceClient for verification
private static Trace retrievedTrace;

private static String rootSpanName;
Expand Down Expand Up @@ -280,10 +283,24 @@ private boolean dfsContainsCallStack(long spanId, List<String> expectedCallStack
@BeforeClass
public static void setup() throws IOException {
projectId = DatastoreOptions.getDefaultProjectId();
traceExporter =
TraceExporter.createWithConfiguration(
TraceConfiguration.builder().setProjectId(projectId).build());
traceClient_v1 = TraceServiceClient.create();

// Share the same credentials used by Datastore client with the TraceExporter and
// TraceServiceClient to ensure consistency and avoid auth issues in environments
// where default ADC resolution might fail for the exporter.
Credentials credentials = DatastoreOptions.getDefaultInstance().getCredentials();

TraceConfiguration.Builder traceConfigurationBuilder =
TraceConfiguration.builder().setProjectId(projectId);
if (credentials != null) {
traceConfigurationBuilder.setCredentials(credentials);
}
traceExporter = TraceExporter.createWithConfiguration(traceConfigurationBuilder.build());

TraceServiceSettings.Builder clientBuilder = TraceServiceSettings.newBuilder();
if (credentials != null) {
clientBuilder.setCredentialsProvider(FixedCredentialsProvider.create(credentials));
}
traceClient = TraceServiceClient.create(clientBuilder.build());
random = new Random();
}

Expand Down Expand Up @@ -381,7 +398,7 @@ public void after() throws Exception {

@AfterClass
public static void teardown() throws Exception {
traceClient_v1.close();
traceClient.close();
}

// Generates a random hex string of length `numBytes`
Expand Down Expand Up @@ -443,7 +460,7 @@ protected void fetchAndValidateTrace(
// Fetch traces
do {
try {
retrievedTrace = traceClient_v1.getTrace(projectId, traceId);
retrievedTrace = traceClient.getTrace(projectId, traceId);
assertEquals(traceId, retrievedTrace.getTraceId());

logger.info(
Expand Down Expand Up @@ -530,7 +547,7 @@ public void traceContainerTest() throws Exception {
int numRetries = GET_TRACE_RETRY_COUNT;
do {
try {
traceResp = traceClient_v1.getTrace(projectId, customSpanContext.getTraceId());
traceResp = traceClient.getTrace(projectId, customSpanContext.getTraceId());
if (traceResp.getSpansCount() == expectedSpanCount) {
logger.info("Success: Got " + expectedSpanCount + " spans.");
break;
Expand Down Expand Up @@ -990,7 +1007,7 @@ public void runInTransactionQueryTest() throws Exception {
Query.newEntityQueryBuilder().setKind(KEY1.getKind()).setFilter(filter).build();
Datastore.TransactionCallable<Boolean> callable =
transaction -> {
QueryResults<Entity> queryResults = datastore.run(query);
QueryResults<Entity> queryResults = transaction.run(query);
assertTrue(queryResults.hasNext());
assertEquals(entity1, queryResults.next());
assertFalse(queryResults.hasNext());
Expand All @@ -1007,7 +1024,7 @@ public void runInTransactionQueryTest() throws Exception {
/* numExpectedSpans= */ 4,
Arrays.asList(
Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_BEGIN_TRANSACTION),
Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_RUN_QUERY),
Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_RUN_QUERY),
Arrays.asList(SPAN_NAME_TRANSACTION_RUN, SPAN_NAME_TRANSACTION_COMMIT)));
}
}
Loading