Skip to content

fix(instrumentation-pg): normalize leading/trailing spaces in database operation name #3270

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

Merged
pichlermarc merged 2 commits into from
Dec 4, 2025
Merged

fix(instrumentation-pg): normalize leading/trailing spaces in database operation name #3270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
822b33a
fix(instrumentation-pg): normalize trailing spaces in database operat…
ecarrizo2 Dec 3, 2025
ab347fa
Merge branch 'main' into fix/instrumentation-pg/normalize_command_name
pichlermarc Dec 4, 2025
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
8 changes: 5 additions & 3 deletions packages/instrumentation-pg/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,13 @@ export function getQuerySpanName(
}

export function parseNormalizedOperationName(queryText: string) {
const indexOfFirstSpace = queryText.indexOf(' ');
// Trim the query text to handle leading/trailing whitespace
const trimmedQuery = queryText.trim();
const indexOfFirstSpace = trimmedQuery.indexOf(' ');
let sqlCommand =
indexOfFirstSpace === -1
? queryText
: queryText.slice(0, indexOfFirstSpace);
? trimmedQuery
: trimmedQuery.slice(0, indexOfFirstSpace);
sqlCommand = sqlCommand.toUpperCase();

// Handle query text being "COMMIT;", which has an extra semicolon before the space.
Expand Down
21 changes: 21 additions & 0 deletions packages/instrumentation-pg/test/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,27 @@ describe('utils.ts', () => {
);
});

it('remove leading whitespaces when parsing operation names', () => {
assert.strictEqual(
utils.getQuerySpanName('dbName', { text: ' SELECT $1' }),
'pg.query:SELECT dbName'
);
});

it('remove trailing whitespaces when parsing operation names', () => {
assert.strictEqual(
utils.getQuerySpanName('dbName', { text: 'SELECT $1 ' }),
'pg.query:SELECT dbName'
);
});

it('remove leading and trailing whitespace when parsing operation names', () => {
assert.strictEqual(
utils.getQuerySpanName('dbName', { text: ' SELECT $1 ' }),
'pg.query:SELECT dbName'
);
});

it('omits db name if missing', () => {
assert.strictEqual(
utils.getQuerySpanName(undefined, dummyQuery),
Expand Down
Loading