fix: pass the Span correctly (#2332)

#2320

Author: surbhigarg92

observability-test/spanner.ts

@@ -652,6 +652,7 @@ describe('ObservabilityOptions injection and propagation', async () => {
  ...cacheSessionEvents,
  'Using Session',
  'Starting stream',
+ 'Transaction Creation Done',
  ];
  assert.deepStrictEqual(
  actualEventNames,
@@ -1729,8 +1730,8 @@ describe('Traces for ExecuteStream broken stream retries', () => {
  const expectedEventNames = [
  ...batchCreateSessionsEvents,
  'Starting stream',
- ...waitingSessionsEvents,
  'Transaction Creation Done',
+ ...waitingSessionsEvents,
  ];
  assert.deepStrictEqual(
  actualEventNames,

src/transaction.ts

@@ -33,7 +33,7 @@ import {
 } from './partial-result-stream';
 import {Session} from './session';
 import {Key} from './table';
-import {getActiveOrNoopSpan} from './instrument';
+import {Span} from './instrument';
 import {google as spannerClient} from '../protos/protos';
 import {
  NormalCallback,
@@ -499,7 +499,7 @@ export class Snapshot extends EventEmitter {
  setSpanError(span, err);
  } else {
  this._updatePrecommitToken(resp);
- this._update(resp);
+ this._update(resp, span);
  }
  span.end();
  callback!(err, resp);
@@ -802,7 +802,7 @@ export class Snapshot extends EventEmitter {
  ?.on('response', response => {
  this._updatePrecommitToken(response);
  if (response.metadata && response.metadata!.transaction && !this.id) {
- this._update(response.metadata!.transaction);
+ this._update(response.metadata!.transaction, span);
  }
  })
  .on('error', err => {
@@ -1159,7 +1159,7 @@ export class Snapshot extends EventEmitter {
  if (response.metadata) {
  metadata = response.metadata;
  if (metadata.transaction && !this.id) {
- this._update(metadata.transaction);
+ this._update(metadata.transaction, span);
  }
  }
  })
@@ -1406,7 +1406,7 @@ export class Snapshot extends EventEmitter {
  .on('response', response => {
  this._updatePrecommitToken(response);
  if (response.metadata && response.metadata!.transaction && !this.id) {
- this._update(response.metadata!.transaction);
+ this._update(response.metadata!.transaction, span);
  }
  })
  .on('error', err => {
@@ -1617,13 +1617,15 @@ export class Snapshot extends EventEmitter {
  *
  * @param {spannerClient.spanner.v1.ITransaction} resp Response object.
  */
- protected _update(resp: spannerClient.spanner.v1.ITransaction): void {
+ protected _update(
+ resp: spannerClient.spanner.v1.ITransaction,
+ span: Span,
+ ): void {
  const {id, readTimestamp} = resp;
 
  this.id = id!;
  this.metadata = resp;
 
- const span = getActiveOrNoopSpan();
  span.addEvent('Transaction Creation Done', {id: this.id.toString()});
 
  if (readTimestamp) {
@@ -2071,7 +2073,7 @@ export class Transaction extends Dml {
  const {resultSets, status} = resp;
  for (const resultSet of resultSets) {
  if (!this.id && resultSet.metadata?.transaction) {
- this._update(resultSet.metadata.transaction);
+ this._update(resultSet.metadata.transaction, span);
  }
  }
  const rowCounts: number[] = resultSets.map(({stats}) => {