add stream=null

@@ -922,6 +922,7 @@ public void close(@Nullable String message) {
 if (stream != null) {
 stream.close(message);
 span.end(TraceUtil.END_SPAN_OPTIONS);
+stream = null;
 }
 }
 

@@ -294,13 +294,14 @@ public <T> T run(TransactionCallable<T> callable) {
 }
 return runInternal(callable);
 } catch (RuntimeException e) {
-TraceUtil.endSpanWithFailure(span, e);
+TraceUtil.setWithFailure(span, e);
 throw e;
 } finally {
 // Remove threadLocal rather than set to FALSE to avoid a possible memory .
 // We also do this unconditionally in case a user has modified the flag when the transaction
 // was running.
 SessionImpl.hasPendingTransaction.remove();
+span.end(TraceUtil.END_SPAN_OPTIONS);
 }
 }
 

@@ -87,7 +87,7 @@ public void addLink(Link link) {}
 public void end(EndSpanOptions options) {
 synchronized (this) {
 if (ended) {
-throw new IllegalStateException("already ended");
+throw new IllegalStateException(this.spanName + " already ended");
 }
 spans.put(this.spanName, true);
 ended = true;

@@ -194,7 +194,7 @@ public Void run(TransactionContext transaction) throws Exception {
 
 Map<String, Boolean> spans = failOnOverkillTraceComponent.getSpans();
 assertThat(spans.size()).isEqualTo(6);
-assertThat(spans).containsEntry("CloudSpanner.ReadWriteTransaction", false);
+assertThat(spans).containsEntry("CloudSpanner.ReadWriteTransaction", true);
 assertThat(spans).containsEntry("CloudSpannerOperation.BatchCreateSessions", true);
 assertThat(spans).containsEntry("SessionPool.WaitForSession", true);
 assertThat(spans).containsEntry("CloudSpannerOperation.BatchCreateSessionsRequest", true);
@@ -216,7 +216,6 @@ public Void run(TransactionContext transaction) throws Exception {
 });
 fail("missing expected exception");
 } catch (SpannerException e) {
-System.out.println("herhe");
 assertThat(e.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
 }