Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion handwritten/spanner/src/metrics/metrics-tracer-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,8 @@ export class MetricsTracerFactory {
* @param requestId The request id of the gRPC call set under 'x-goog-spanner-request-id'.
*/
public clearCurrentTracer(requestId: string) {
const operationRequest = this._extractOperationRequest(requestId);
const operationRequest =
this._extractOperationRequest(requestId) || requestId;
if (!this._currentOperationTracers.has(operationRequest)) {
return;
}
Expand Down
16 changes: 16 additions & 0 deletions handwritten/spanner/test/metrics/metrics-tracer-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,22 @@ describe('MetricsTracerFactory', () => {
assert.ok(tracer);
});

it('should clear a MetricsTracer using an extracted operation request id', () => {
const factory = MetricsTracerFactory.getInstance('project-id');
factory!.createMetricsTracer(
'some-method',
'method-name',
'1.1a2bc3d4.1.1.1.1',
);

assert.strictEqual((factory as any)._currentOperationTracers.size, 1);

factory!.clearCurrentTracer('1.1a2bc3d4.1.1.1');

assert.strictEqual((factory as any)._currentOperationTracers.size, 0);
assert.strictEqual((factory as any)._currentOperationLastUpdatedMs.size, 0);
});

it('should correctly set default attributes', () => {
const factory = MetricsTracerFactory.getInstance('project-id');
const tracer = factory!.createMetricsTracer(
Expand Down
Loading