From dcc229d44426398102882099ad6edd385c7b14f0 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <57220027+harshachinta@users.noreply.github.com>
Date: Tue, 11 Feb 2025 12:13:34 +0530
Subject: [PATCH] Revert "fix(spanner): end spans for read-write methods
 (#3629)"

This reverts commit 4a1f99c6bb872ffc08e60d3843e4cdfc4efa2690.
---
 .../java/com/google/cloud/spanner/DatabaseClientImpl.java    | 2 --
 .../com/google/cloud/spanner/DatabaseClientImplTest.java     | 5 +----
 2 files changed, 1 insertion(+), 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
index 1be91c84f9a..92971ff320f 100644
--- 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
index bfd68f38595..87ea5c19ce9 100644
--- 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);
     }