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

fix(instrumentation-knex): Support better-sqlite3 errors #2650

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+176 −111
Open

fix(instrumentation-knex): Support better-sqlite3 errors #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2eb363
fix(instrumentation-knex): Support better-sqlite3 errors
AbhiPrasad Jun 25, 2024
6dd3912
Merge remote-tracking branch 'sentry/abhi-knex-sqlite3-error' into kn…
deejay1 Jan 16, 2025
107bff8
chore(instrumentation-knex): Simplify exception parsing
deejay1 Jan 16, 2025
1c01313
chore: Another take on the lockfile
deejay1 Jan 16, 2025
9d35242
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 18, 2025
2ca5c7d
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 20, 2025
5efd58e
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 20, 2025
3e5fdea
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 22, 2025
5418f2d
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 22, 2025
682726b
Merge branch 'main' into knex-sqlite3-v2
deejay1 Jan 23, 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
179 changes: 87 additions & 92 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion plugins/node/opentelemetry-instrumentation-knex/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/mocha": "7.0.2",
"@types/node": "18.18.14",
"knex": "0.95.9",
"better-sqlite3": "11.0.0",
"knex": "3.1.0",
"nyc": "15.1.0",
"rimraf": "5.0.10",
"sqlite3": "5.1.7",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ export class KnexInstrumentation extends InstrumentationBase<KnexInstrumentation
const formatter = utils.getFormatter(this);
const fullQuery = formatter(query.sql, query.bindings || []);
const message = err.message.replace(fullQuery + ' - ', '');
const clonedError = utils.cloneErrorWithNewMessage(err, message);
span.recordException(clonedError);
const exc = utils.otelExceptionFromKnexError(err, message);
span.recordException(exc);
span.setStatus({ code: api.SpanStatusCode.ERROR, message });
span.end();
throw err;
Expand Down
Loading
Loading