Skip to content

Commit 4560d14

Browse files
deejay1AbhiPrasad
andauthored
fix(instrumentation-knex): Support better-sqlite3 errors (#2650)
Co-authored-by: Abhijeet Prasad <[email protected]>
1 parent 5ecbd03 commit 4560d14

File tree

5 files changed

+176
-111
lines changed

5 files changed

+176
-111
lines changed

package-lock.json

Lines changed: 87 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/node/opentelemetry-instrumentation-knex/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"@opentelemetry/sdk-trace-node": "^1.8.0",
4949
"@types/mocha": "7.0.2",
5050
"@types/node": "18.18.14",
51-
"knex": "0.95.9",
51+
"better-sqlite3": "11.0.0",
52+
"knex": "3.1.0",
5253
"nyc": "15.1.0",
5354
"rimraf": "5.0.10",
5455
"sqlite3": "5.1.7",

plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ export class KnexInstrumentation extends InstrumentationBase<KnexInstrumentation
185185
const formatter = utils.getFormatter(this);
186186
const fullQuery = formatter(query.sql, query.bindings || []);
187187
const message = err.message.replace(fullQuery + ' - ', '');
188-
const clonedError = utils.cloneErrorWithNewMessage(err, message);
189-
span.recordException(clonedError);
188+
const exc = utils.otelExceptionFromKnexError(err, message);
189+
span.recordException(exc);
190190
span.setStatus({ code: api.SpanStatusCode.ERROR, message });
191191
span.end();
192192
throw err;

0 commit comments

Comments
 (0)