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

harshachinta · web-flow · commit 4a1f99c6bb87 · 2025-02-10T13:12:22.000Z
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java
@@ -294,6 +294,8 @@ public TransactionManager transactionManager(TransactionOption... options) {
       span.setStatus(e);
       span.end();
       throw e;
+    } finally {
+      span.end();
     }
   }
 
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -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);
     }

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ public TransactionManager transactionManager(TransactionOption... options) {`
`294`	`294`	`span.setStatus(e);`
`295`	`295`	`span.end();`
`296`	`296`	`throw e;`
	`297`	`+ } finally {`
	`298`	`+ span.end();`
`297`	`299`	`}`
`298`	`300`	`}`
`299`	`301`