---

snehashah16 · web-flow · commit 69cb0e9ee038 · 2019-02-14T13:14:09.000-08:00
yaml --- r: 25921 b: refs/heads/pubsub-ordering-keys c: e195b5f h: refs/heads/master i: 25919: 0701eee
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 0aab68a4068c06fca5c582256b5c2799a8b5f497
+refs/heads/pubsub-ordering-keys: e195b5f60b793a1d85f3cdc679cfb2fc58128887
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -1291,7 +1291,6 @@ public <T> T run(TransactionCallable<T> callable) {
         // We also do this unconditionally in case a user has modified the flag when the transaction
         // was running.
         hasPendingTransaction.remove();
-        span.end();
       }
     }
 
@@ -2627,7 +2626,6 @@ public void close(@Nullable String message) {
       if (stream != null) {
         stream.close(message);
       }
-      span.end();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,6 @@ public <T> T run(TransactionCallable<T> callable) {`
`1291`	`1291`	`// We also do this unconditionally in case a user has modified the flag when the transaction`
`1292`	`1292`	`// was running.`
`1293`	`1293`	`hasPendingTransaction.remove();`
`1294`		`- span.end();`
`1295`	`1294`	`}`
`1296`	`1295`	`}`
`1297`	`1296`
`@@ -2627,7 +2626,6 @@ public void close(@Nullable String message) {`
`2627`	`2626`	`if (stream != null) {`
`2628`	`2627`	`stream.close(message);`
`2629`	`2628`	`}`
`2630`		`- span.end();`
`2631`	`2629`	`}`
`2632`	`2630`
`2633`	`2631`	`@Override`