Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use SQL verb for mysql2 span name when query object is used #923

Merged
merged 4 commits into from
Mar 2, 2022
Merged

fix: use SQL verb for mysql2 span name when query object is used #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38a18b6
fix mysql2 span name
nozik Feb 24, 2022
f663a96
Merge branch 'main' into fix_mysql2_span_name
nozik Feb 28, 2022
c54657c
Merge branch 'main' into fix_mysql2_span_name
nozik Feb 28, 2022
2389b76
Merge branch 'main' into fix_mysql2_span_name
nozik Mar 2, 2022
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
7 changes: 3 additions & 4 deletions plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,9 @@ export function getDbStatement(
* @returns SQL statement without variable arguments or SQL verb
*/
export function getSpanName(query: string | Query | QueryOptions): string {
if (typeof query === 'object') {
return query.sql;
}
return query.split(' ')[0];
const rawQuery = typeof query === 'object' ? query.sql : query;
// Extract the SQL verb
return rawQuery?.split(' ')?.[0];
}

export const once = (fn: Function) => {
Expand Down
10 changes: 9 additions & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ describe('mysql@2.x', () => {
query.on('end', () => {
const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans[0].name, 'SELECT');
assert.strictEqual(
spans[0].attributes[SemanticAttributes.DB_STATEMENT],
sql
);
done();
});
});
Expand All @@ -161,7 +165,11 @@ describe('mysql@2.x', () => {

query.on('end', () => {
const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans[0].name, sql);
assert.strictEqual(spans[0].name, 'SELECT');
assert.strictEqual(
spans[0].attributes[SemanticAttributes.DB_STATEMENT],
query.sql
);
done();
});
});
Expand Down