Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

'use strict';

const tracingUtil = require('../../../../tracingUtil');

class InstanaAWSProduct {
/**
* @param {string} spanName
Expand Down Expand Up @@ -50,7 +52,7 @@ class InstanaAWSProduct {
span.ec = 1;
const spanData = span.data && span.data[this.spanName];
if (spanData) {
spanData.error = err.message || err.code || JSON.stringify(err);
spanData.error = tracingUtil.extractErrorMessage(err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

'use strict';

const tracingUtil = require('../../../../tracingUtil');

class InstanaAWSProduct {
/**
* @param {string} spanName
Expand Down Expand Up @@ -49,7 +51,7 @@ class InstanaAWSProduct {
if (err) {
span.ec = 1;
if (span.data?.[this.spanName]) {
span.data[this.spanName].error = err.message || err.code || JSON.stringify(err);
span.data[this.spanName].error = tracingUtil.extractErrorMessage(err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function addErrorToSpan(err, span) {
if (err) {
span.ec = 1;
if (span.data?.[SPAN_NAME]) {
span.data[SPAN_NAME].error = err.message || err.code || JSON.stringify(err);
span.data[SPAN_NAME].error = tracingUtil.extractErrorMessage(err);
}
}
}
17 changes: 6 additions & 11 deletions packages/core/src/tracing/instrumentation/databases/redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,18 +508,13 @@ function instrumentMultiExec(origCtx, origArgs, original, address, isAtomic, cbS
if (err) {
span.ec = 1;

if (err.message) {
span.data.redis.error = err.message;
} else if (Array.isArray(err) && err.length) {
span.data.redis.error = err[0].message;
if (Array.isArray(err) && err.length) {
span.data.redis.error = tracingUtil.extractErrorMessage(err[0]);
} else if (err.errors && err.errors.length) {
// v3 = provides sub errors
span.data.redis.error = err.errors.map(subErr => tracingUtil.extractErrorMessage(subErr)).join('\n');
} else {
span.data.redis.error = 'Unknown error';
}

// v3 = provides sub errors
if (err.errors && err.errors.length) {
// TODO: Not updating now as special case
span.data.redis.error = err.errors.map(subErr => subErr.message).join('\n');
span.data.redis.error = tracingUtil.extractErrorMessage(err);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function shimExpressHandle(realHandle) {

function wrapExpress4HandleFn(fn) {
return function wrappedHandleFn(err) {
if (err && err.message && err.stack) {
if (err && (err.message || err.cause) && err.stack) {
annotateHttpEntrySpanWithError(err);
}
return fn.apply(this, arguments);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function finishSpan(span, result) {
function finishWithException(span, err) {
span.ec = 1;
span.d = Date.now() - span.ts;
span.data.graphql.errors = err.message;
span.data.graphql.errors = tracingUtil.extractErrorMessage(err);
if (!span.postponeTransmit) {
span.transmit();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function modifyArgs(name, originalArgs, span) {
span.d = Date.now() - span.ts;

if (err) {
const errorMessage = err.details || err.message;
const errorMessage = tracingUtil.extractErrorMessage(err);
if (typeof errorMessage === 'string' && errorMessage.toLowerCase().includes('cancelled')) {
// No-op, we do not want to mark cancelled calls as erroneous.
} else {
Expand Down Expand Up @@ -420,7 +420,7 @@ function instrumentedClientMethod(

call.on('error', err => {
span.d = Date.now() - span.ts;
const errorMessage = err.details || err.message;
const errorMessage = tracingUtil.extractErrorMessage(err);
if (typeof errorMessage === 'string' && errorMessage.toLowerCase().includes('cancelled')) {
// No-op, we do not want to mark cancelled calls as erroneous.
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function instrument(coreModule, forceHttps) {
});

clientRequest.on('error', err => {
let errorMessage = err.message || err.code;
let errorMessage = tracingUtil.extractErrorMessage(err);

if (isTimeout) {
errorMessage = 'Timeout exceeded';
Expand Down