From c62584c861b36516410f41dd8ba426b17f27497a Mon Sep 17 00:00:00 2001
From: surbhigarg92 <surbhigarg.92@gmail.com>
Date: Thu, 11 Jan 2024 15:17:16 +0530
Subject: [PATCH 1/2] chore: integration test fix

---
 system-test/spanner.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system-test/spanner.ts b/system-test/spanner.ts
index d2bde030f..5575d5c5f 100644
--- a/system-test/spanner.ts
+++ b/system-test/spanner.ts
@@ -8731,10 +8731,10 @@ describe('Spanner', () => {
             },
             err => {
               assert.strictEqual(err?.details, expectedErrorMessage);
+              transaction!.end();
+              done();
             }
           );
-          transaction!.end();
-          done();
         });
       });
     });

From cceb81a018af7be1c620e9a418330baf6d8f3ea0 Mon Sep 17 00:00:00 2001
From: surbhigarg92 <surbhigarg.92@gmail.com>
Date: Fri, 8 Nov 2024 10:50:27 +0530
Subject: [PATCH 2/2] fix: session span events

---
 src/database.ts | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/database.ts b/src/database.ts
index 2744015be..a81c5cfd5 100644
--- a/src/database.ts
+++ b/src/database.ts
@@ -2204,11 +2204,6 @@ class Database extends common.GrpcServiceObject {
           span.addEvent('Using Session', {'session.id': session?.id});
           transaction!._observabilityOptions = this._observabilityOptions;
           this._releaseOnEnd(session!, transaction!, span);
-        } else if (isSessionNotFoundError(err as grpc.ServiceError)) {
-          span.addEvent('No session available', {
-            'session.id': session?.id,
-          });
-          setSpanError(span, err);
         } else {
           setSpanError(span, err);
         }
@@ -2486,11 +2481,7 @@ class Database extends common.GrpcServiceObject {
       pool.getSession((err, session_) => {
         const span = getActiveOrNoopSpan();
         if (err) {
-          if (isSessionNotFoundError(err as grpc.ServiceError)) {
-            span.addEvent('No session available', {
-              'session.id': session?.id,
-            });
-          }
+          setSpanError(span, err as ServiceError);
           destroyStream(err as ServiceError);
           return;
         }
@@ -3411,10 +3402,11 @@ class Database extends common.GrpcServiceObject {
               this.pool_.release(session);
             }
           } catch (e) {
-            if (!isSessionNotFoundError(e as ServiceError)) {
+            if (isSessionNotFoundError(e as ServiceError)) {
               span.addEvent('No session available', {
                 'session.id': sessionId,
               });
+            } else {
               span.end();
               throw e;
             }