Revert "fix(spanner): end spans for read-write methods" (#3632)

Reverts #3629 Reverting to further debug where the sapns are ending. Will reopen if I feel this change is needed.
googleapis · Feb 11, 2025 · 2373e34 · 2373e34
1 parent a5ebcd3
commit 2373e34
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
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,8 +294,6 @@ 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,10 +4006,7 @@ public void testTransactionManager_usesOptions() {
     when(pool.getSession()).thenReturn(session);
     TransactionOption option = mock(TransactionOption.class);
 
-    TraceWrapper traceWrapper =
-        new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), false);
-
-    DatabaseClientImpl client = new DatabaseClientImpl(pool, traceWrapper);
+    DatabaseClientImpl client = new DatabaseClientImpl(pool, mock(TraceWrapper.class));
     try (TransactionManager ignore = client.transactionManager(option)) {
       verify(session).transactionManager(option);
     }