From cdaea83479e89a96783db031b95927de33b8158b Mon Sep 17 00:00:00 2001 From: Siim Kallas Date: Tue, 4 Jun 2024 19:40:08 +0300 Subject: [PATCH] don't parse operation from raw queries --- .../node/instrumentation-typeorm/src/typeorm.ts | 16 +--------------- .../test/Connection.test.ts | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/plugins/node/instrumentation-typeorm/src/typeorm.ts b/plugins/node/instrumentation-typeorm/src/typeorm.ts index 1e20b00d8c..ca35c84533 100644 --- a/plugins/node/instrumentation-typeorm/src/typeorm.ts +++ b/plugins/node/instrumentation-typeorm/src/typeorm.ts @@ -334,20 +334,6 @@ export class TypeormInstrumentation extends InstrumentationBase { }; } - private getOperationName(statement: string) { - let operation = 'raw query'; - if (typeof statement === 'string') { - statement = statement.trim(); - try { - operation = statement.split(' ')[0].toUpperCase(); - } catch (e) { - /* */ - } - } - - return operation; - } - private _patchRawQuery() { const self = this; return (original: Function) => { @@ -358,7 +344,7 @@ export class TypeormInstrumentation extends InstrumentationBase { } // eslint-disable-next-line @typescript-eslint/no-explicit-any const sql = args[0] as any; - const operation = self.getOperationName(sql); + const operation = 'raw query'; // eslint-disable-next-line @typescript-eslint/no-explicit-any const connectionOptions: any = this.options; const attributes = { diff --git a/plugins/node/instrumentation-typeorm/test/Connection.test.ts b/plugins/node/instrumentation-typeorm/test/Connection.test.ts index 874668b93a..8dda4eefca 100644 --- a/plugins/node/instrumentation-typeorm/test/Connection.test.ts +++ b/plugins/node/instrumentation-typeorm/test/Connection.test.ts @@ -58,7 +58,7 @@ describe('Connection', () => { const attributes = typeOrmSpans[0].attributes; assert.strictEqual(attributes[SEMATTRS_DB_SYSTEM], options.type); assert.strictEqual(attributes[SEMATTRS_DB_NAME], options.database); - assert.strictEqual(attributes[SEMATTRS_DB_OPERATION], 'SELECT'); + assert.strictEqual(attributes[SEMATTRS_DB_OPERATION], 'raw query'); assert.strictEqual(attributes[SEMATTRS_DB_STATEMENT], query); await connection.close(); });