Skip to content
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

fix(spanner): end spans for read-write methods #3629

Merged
merged 4 commits into from
Feb 10, 2025
+6 −1
Merged

fix(spanner): end spans for read-write methods #3629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97482cd
fix(spanner): end spans for read-write methods
harshachinta Feb 10, 2025
4ae8bcb
Merge branch 'main' into fix-otel-span-end-for-rw
harshachinta Feb 10, 2025
e9cda92
fix(spanner): fix tests
harshachinta Feb 10, 2025
bda2476
fix(spanner): fix tests
harshachinta Feb 10, 2025
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
2 changes: 2 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ public TransactionManager transactionManager(TransactionOption... options) {
span.setStatus(e);
span.end();
throw e;
} finally {
span.end();
}
}

Expand Down
5 changes: 4 additions & 1 deletion google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4006,7 +4006,10 @@ public void testTransactionManager_usesOptions() {
when(pool.getSession()).thenReturn(session);
TransactionOption option = mock(TransactionOption.class);

DatabaseClientImpl client = new DatabaseClientImpl(pool, mock(TraceWrapper.class));
TraceWrapper traceWrapper =
new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), false);

DatabaseClientImpl client = new DatabaseClientImpl(pool, traceWrapper);
try (TransactionManager ignore = client.transactionManager(option)) {
verify(session).transactionManager(option);
}
Expand Down
Loading