Revert some strong+pedantic changes for async/await

Author: odeke-em

src/database.ts

@@ -1130,6 +1130,8 @@ class Database extends common.GrpcServiceObject {
       } catch (e) {
         setSpanErrorAndException(span, e as Error);
         this.emit('error', e);
+      } finally {
+        span.end();
       }
     });
   }
@@ -3086,6 +3088,11 @@ class Database extends common.GrpcServiceObject {
               // Create a new data stream and add it to the end user stream.
               dataStream = this.runStream(query, options);
               dataStream.pipe(proxyStream);
+              dataStream.on('end', () => span.end());
+              dataStream.on('error', err => {
+                setSpanError(span, err);
+                span.end();
+              });
             } else {
               proxyStream.destroy(err);
               snapshot.end();
@@ -3101,7 +3108,9 @@ class Database extends common.GrpcServiceObject {
         if (err) {
           setSpanError(span, err);
         }
-        span.end();
+        if (span.isRecording()) {
+          span.end();
+        }
       });
 
       return proxyStream as PartialResultStream;
@@ -3219,6 +3228,7 @@ class Database extends common.GrpcServiceObject {
       this.runTransaction(options, (err, txn) => {
         if (err) {
           setSpanError(span, err);
+          span.end();
           runFn!(err, null);
           return;
         }
@@ -3285,7 +3295,7 @@ class Database extends common.GrpcServiceObject {
           options
         );
 
-        runner.run().then(release, async err => {
+        runner.run().then(release, err => {
           setSpanError(span, err);
 
           if (isSessionNotFoundError(err)) {
@@ -3662,7 +3672,6 @@ class Database extends common.GrpcServiceObject {
           });
           return;
         }
-
         if (err) {
           setSpanError(span, err);
           span.end();

src/instrument.ts

@@ -119,8 +119,6 @@ function ensureInitialContextManagerSet() {
 }
 export {ensureInitialContextManagerSet};
 
-const debugTraces = process.env.SPANNER_DEBUG_TRACES === 'true';
-
 /**
  * startTrace begins an active span in the current active context
  * and passes it back to the set callback function. Each span will

src/table.ts

@@ -29,10 +29,8 @@ import {
   CommitCallback,
 } from './transaction';
 import {google as databaseAdmin} from '../protos/protos';
-import {google} from '../protos/protos';
 import {Schema, LongRunningCallback} from './common';
 import IRequestOptions = databaseAdmin.spanner.v1.IRequestOptions;
-import {grpc} from 'google-gax';
 import {
   ObservabilityOptions,
   startTrace,
@@ -1108,21 +1106,21 @@ class Table {
           requestOptions: requestOptions,
           excludeTxnFromChangeStreams: excludeTxnFromChangeStreams,
         },
-        async (err, transaction) => {
+        (err, transaction) => {
           if (err) {
             setSpanError(span, err);
             span.end();
-            await callback(err);
+            callback(err);
             return;
           }
 
           transaction![method](this.name, rows as Key[]);
-          transaction!.commit(options, async (err, resp) => {
+          transaction!.commit(options, (err, resp) => {
             if (err) {
               setSpanError(span, err);
             }
             span.end();
-            await callback(err, resp);
+            callback(err, resp);
           });
         }
       );

src/transaction.ts

@@ -470,7 +470,7 @@ export class Snapshot extends EventEmitter {
           // and doesn't invoke any other subsequent code hence it is paramount
           // to invoke span.end() before returning results to the callback.
           span.end();
-          await callback!(err, resp);
+          callback!(err, resp);
         }
       );
     });
@@ -784,7 +784,9 @@ export class Snapshot extends EventEmitter {
           if (err) {
             setSpanError(span, err);
           }
-          span.end();
+          if (span.isRecording()) {
+            span.end();
+          }
         });
       }
 
@@ -1316,8 +1318,8 @@ export class Snapshot extends EventEmitter {
           } catch (e) {
             const errorStream = new PassThrough();
             setSpanErrorAndException(span, e as Error);
-            setImmediate(() => errorStream.destroy(e as Error));
             span.end();
+            setImmediate(() => errorStream.destroy(e as Error));
             return errorStream;
           }
         }
@@ -2135,19 +2137,22 @@ export class Transaction extends Dml {
       } else if (!this._useInRunner) {
         reqOpts.singleUseTransaction = this._options;
       } else {
-        try {
-          await this.begin();
-          const resp = await this.commit(options);
-          span.end();
-          await callback(
-            null,
-            resp as spannerClient.spanner.v1.ICommitResponse
-          );
-        } catch (err) {
-          setSpanErrorAndException(span, err as Error);
-          span.end();
-          await callback(err as ServiceError, null);
-        }
+        this.begin().then(
+          () => {
+            this.commit(options, (err, resp) => {
+              if (err) {
+                setSpanError(span, err);
+              }
+              span.end();
+              callback(err, resp);
+            });
+          },
+          err => {
+            setSpanError(span, err);
+            span.end();
+            callback(err, null);
+          }
+        );
         return;
       }
 
@@ -2185,10 +2190,7 @@ export class Transaction extends Dml {
           gaxOpts: gaxOpts,
           headers: headers,
         },
-        async (
-          err: null | Error,
-          resp: spannerClient.spanner.v1.ICommitResponse
-        ) => {
+        (err: null | Error, resp: spannerClient.spanner.v1.ICommitResponse) => {
           this.end();
 
           if (err) {