@dxos/observability 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/chunk-5ICT2XF2.mjs +1 -0
- package/dist/lib/browser/{chunk-MWTIKIBZ.mjs → chunk-ICKR6U3G.mjs} +44 -30
- package/dist/lib/browser/chunk-ICKR6U3G.mjs.map +7 -0
- package/dist/lib/browser/{chunk-YEPQFAES.mjs → chunk-LJO63BXO.mjs} +2 -2
- package/dist/lib/browser/{chunk-YEPQFAES.mjs.map → chunk-LJO63BXO.mjs.map} +3 -3
- package/dist/lib/browser/{chunk-33TCMAUB.mjs → chunk-YTRUOREY.mjs} +75 -46
- package/dist/lib/browser/chunk-YTRUOREY.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/observability-CQGG3MID.mjs +10 -0
- package/dist/lib/browser/{otel-IRDZ7PES.mjs → otel-6FVBNA5F.mjs} +131 -81
- package/dist/lib/browser/otel-6FVBNA5F.mjs.map +7 -0
- package/dist/lib/browser/segment/index.mjs +3 -3
- package/dist/lib/browser/sentry/index.mjs +2 -2
- package/dist/lib/browser/{sentry-log-processor-3F3SBJXM.mjs → sentry-log-processor-RG4CFVGL.mjs} +59 -43
- package/dist/lib/browser/sentry-log-processor-RG4CFVGL.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-552KLA6Z.mjs → chunk-24NMRR4E.mjs} +67 -40
- package/dist/lib/node-esm/chunk-24NMRR4E.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-EYW4X3O6.mjs → chunk-4EWQFQ2F.mjs} +75 -46
- package/dist/lib/{browser/chunk-33TCMAUB.mjs.map → node-esm/chunk-4EWQFQ2F.mjs.map} +3 -3
- package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs → chunk-QK5IUYVA.mjs} +2 -2
- package/dist/lib/node-esm/{chunk-TEH6VIKV.mjs.map → chunk-QK5IUYVA.mjs.map} +3 -3
- package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs → chunk-QUZL7LKE.mjs} +1 -1
- package/dist/lib/node-esm/index.mjs +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/observability-DHNVVRC7.mjs +11 -0
- package/dist/lib/node-esm/{otel-62HYJETM.mjs → otel-KHSGBROB.mjs} +127 -77
- package/dist/lib/node-esm/otel-KHSGBROB.mjs.map +7 -0
- package/dist/lib/node-esm/segment/index.mjs +3 -3
- package/dist/lib/node-esm/sentry/index.mjs +2 -2
- package/dist/lib/node-esm/{sentry-log-processor-JAYRA23C.mjs → sentry-log-processor-3BDS4BB4.mjs} +59 -43
- package/dist/lib/node-esm/sentry-log-processor-3BDS4BB4.mjs.map +7 -0
- package/dist/types/src/helpers/browser-observability.d.ts.map +1 -1
- package/dist/types/src/helpers/browser-observability.js +4 -6
- package/dist/types/src/helpers/browser-observability.js.map +1 -1
- package/dist/types/src/helpers/common.js +1 -1
- package/dist/types/src/helpers/common.js.map +1 -1
- package/dist/types/src/helpers/map-spaces.js +5 -6
- package/dist/types/src/helpers/map-spaces.js.map +1 -1
- package/dist/types/src/helpers/node-observability.d.ts +1 -1
- package/dist/types/src/helpers/node-observability.d.ts.map +1 -1
- package/dist/types/src/helpers/node-observability.js +7 -11
- package/dist/types/src/helpers/node-observability.js.map +1 -1
- package/dist/types/src/helpers/setup-telemetry-listeners.d.ts.map +1 -1
- package/dist/types/src/helpers/setup-telemetry-listeners.js +4 -7
- package/dist/types/src/helpers/setup-telemetry-listeners.js.map +1 -1
- package/dist/types/src/observability.d.ts +1 -1
- package/dist/types/src/observability.d.ts.map +1 -1
- package/dist/types/src/observability.js +68 -59
- package/dist/types/src/observability.js.map +1 -1
- package/dist/types/src/otel/logs.d.ts.map +1 -1
- package/dist/types/src/otel/logs.js +26 -23
- package/dist/types/src/otel/logs.js.map +1 -1
- package/dist/types/src/otel/metrics.d.ts +0 -1
- package/dist/types/src/otel/metrics.d.ts.map +1 -1
- package/dist/types/src/otel/metrics.js +6 -4
- package/dist/types/src/otel/metrics.js.map +1 -1
- package/dist/types/src/otel/otel.js +1 -1
- package/dist/types/src/otel/otel.js.map +1 -1
- package/dist/types/src/otel/traces-browser.d.ts.map +1 -1
- package/dist/types/src/otel/traces-browser.js +19 -13
- package/dist/types/src/otel/traces-browser.js.map +1 -1
- package/dist/types/src/otel/traces.d.ts.map +1 -1
- package/dist/types/src/otel/traces.js +18 -12
- package/dist/types/src/otel/traces.js.map +1 -1
- package/dist/types/src/segment/base.d.ts +1 -1
- package/dist/types/src/segment/base.d.ts.map +1 -1
- package/dist/types/src/segment/base.js +2 -1
- package/dist/types/src/segment/base.js.map +1 -1
- package/dist/types/src/segment/browser.d.ts +1 -1
- package/dist/types/src/segment/browser.d.ts.map +1 -1
- package/dist/types/src/segment/browser.js +6 -10
- package/dist/types/src/segment/browser.js.map +1 -1
- package/dist/types/src/segment/node.d.ts +1 -1
- package/dist/types/src/segment/node.d.ts.map +1 -1
- package/dist/types/src/segment/node.js +2 -1
- package/dist/types/src/segment/node.js.map +1 -1
- package/dist/types/src/sentry/browser.d.ts.map +1 -1
- package/dist/types/src/sentry/browser.js +4 -6
- package/dist/types/src/sentry/browser.js.map +1 -1
- package/dist/types/src/sentry/index.d.ts +1 -1
- package/dist/types/src/sentry/index.d.ts.map +1 -1
- package/dist/types/src/sentry/index.js +0 -1
- package/dist/types/src/sentry/index.js.map +1 -1
- package/dist/types/src/sentry/node.d.ts.map +1 -1
- package/dist/types/src/sentry/node.js +8 -13
- package/dist/types/src/sentry/node.js.map +1 -1
- package/dist/types/src/sentry/node.node.test.js +3 -5
- package/dist/types/src/sentry/node.node.test.js.map +1 -1
- package/dist/types/src/sentry/sentry-log-processor.d.ts.map +1 -1
- package/dist/types/src/sentry/sentry-log-processor.js +58 -63
- package/dist/types/src/sentry/sentry-log-processor.js.map +1 -1
- package/dist/types/src/sentry/sentry.node.test.js +1 -1
- package/dist/types/src/sentry/sentry.node.test.js.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +30 -27
- package/src/helpers/browser-observability.ts +2 -1
- package/src/helpers/node-observability.ts +5 -4
- package/src/helpers/setup-telemetry-listeners.ts +2 -1
- package/src/observability.ts +4 -4
- package/src/otel/logs.ts +9 -7
- package/src/otel/metrics.ts +5 -12
- package/src/otel/otel.ts +1 -1
- package/src/otel/traces-browser.ts +23 -20
- package/src/otel/traces.ts +22 -19
- package/src/segment/base.ts +1 -1
- package/src/segment/browser.ts +3 -2
- package/src/segment/node.ts +3 -2
- package/src/sentry/browser.ts +7 -7
- package/src/sentry/index.ts +1 -1
- package/src/sentry/node.node.test.ts +2 -1
- package/src/sentry/node.ts +3 -3
- package/src/sentry/sentry-log-processor.ts +15 -7
- package/src/sentry/sentry.node.test.ts +2 -1
- package/dist/lib/browser/chunk-5OQYI27L.mjs +0 -1
- package/dist/lib/browser/chunk-MWTIKIBZ.mjs.map +0 -7
- package/dist/lib/browser/observability-EEM6BEY6.mjs +0 -10
- package/dist/lib/browser/otel-IRDZ7PES.mjs.map +0 -7
- package/dist/lib/browser/sentry-log-processor-3F3SBJXM.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-552KLA6Z.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-EYW4X3O6.mjs.map +0 -7
- package/dist/lib/node-esm/observability-DAXZGOBS.mjs +0 -11
- package/dist/lib/node-esm/otel-62HYJETM.mjs.map +0 -7
- package/dist/lib/node-esm/sentry-log-processor-JAYRA23C.mjs.map +0 -7
- /package/dist/lib/browser/{chunk-5OQYI27L.mjs.map → chunk-5ICT2XF2.mjs.map} +0 -0
- /package/dist/lib/browser/{observability-EEM6BEY6.mjs.map → observability-CQGG3MID.mjs.map} +0 -0
- /package/dist/lib/node-esm/{chunk-MRAK2H7O.mjs.map → chunk-QUZL7LKE.mjs.map} +0 -0
- /package/dist/lib/node-esm/{observability-DAXZGOBS.mjs.map → observability-DHNVVRC7.mjs.map} +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
import {
|
|
4
|
+
import { breadcrumbsIntegration, browserTracingIntegration, feedbackIntegration, httpClientIntegration, metrics, addBreadcrumb as naturalAddBreadcrumb, captureException as naturalCaptureException, captureMessage as naturalCaptureMessage, init as naturalInit, sendFeedback as naturalSendFeedback, withScope as naturalWithScope, replayIntegration, setTag, startInactiveSpan, } from '@sentry/browser';
|
|
5
5
|
import { log } from '@dxos/log';
|
|
6
6
|
import { TRACE_PROCESSOR } from '@dxos/tracing';
|
|
7
7
|
// Polyfill export.
|
|
@@ -13,11 +13,10 @@ export { setTag, setTags, setUser } from '@sentry/browser';
|
|
|
13
13
|
* @param options {InitOptions}
|
|
14
14
|
*/
|
|
15
15
|
export const init = (options) => {
|
|
16
|
-
var _a, _b;
|
|
17
16
|
try {
|
|
18
17
|
log('sentry init', options);
|
|
19
18
|
naturalInit({
|
|
20
|
-
enabled:
|
|
19
|
+
enabled: options.enable ?? true,
|
|
21
20
|
dsn: options.destination,
|
|
22
21
|
release: options.release,
|
|
23
22
|
environment: options.environment,
|
|
@@ -39,8 +38,7 @@ export const init = (options) => {
|
|
|
39
38
|
tracesSampleRate: options.sampleRate,
|
|
40
39
|
transport: options.transport,
|
|
41
40
|
beforeSend: (event) => {
|
|
42
|
-
|
|
43
|
-
(_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, event);
|
|
41
|
+
options.onError?.(event);
|
|
44
42
|
return event;
|
|
45
43
|
},
|
|
46
44
|
});
|
|
@@ -50,7 +48,7 @@ export const init = (options) => {
|
|
|
50
48
|
startSpan: startInactiveSpan,
|
|
51
49
|
});
|
|
52
50
|
}
|
|
53
|
-
Object.entries(
|
|
51
|
+
Object.entries(options.properties ?? {}).forEach(([key, value]) => {
|
|
54
52
|
setTag(key, value);
|
|
55
53
|
});
|
|
56
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/sentry/browser.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/sentry/browser.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,EACrB,OAAO,EACP,aAAa,IAAI,oBAAoB,EACrC,gBAAgB,IAAI,uBAAuB,EAC3C,cAAc,IAAI,qBAAqB,EACvC,IAAI,IAAI,WAAW,EACnB,YAAY,IAAI,mBAAmB,EACnC,SAAS,IAAI,gBAAgB,EAC7B,iBAAiB,EACjB,MAAM,EACN,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIhD,mBAAmB;AACnB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAoB,EAAE,EAAE;IAC3C,IAAI,CAAC;QACH,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC5B,WAAW,CAAC;YACV,OAAO,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI;YAC/B,GAAG,EAAE,OAAO,CAAC,WAAW;YACxB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE;gBACZ,sBAAsB,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBACxD,qBAAqB,CAAC;oBACpB,wBAAwB,EAAE;wBACxB,mFAAmF;wBACnF,CAAC,GAAG,EAAE,GAAG,CAAC;wBACV,CAAC,GAAG,EAAE,GAAG,CAAC;qBACX;iBACF,CAAC;gBACF,mBAAmB,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;gBAC1C,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3F;YACD,wBAAwB,EAAE,OAAO,CAAC,gBAAgB;YAClD,wBAAwB,EAAE,OAAO,CAAC,uBAAuB;YACzD,gBAAgB,EAAE,OAAO,CAAC,UAAU;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpB,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;gBACzB,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,eAAe,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACzD,eAAe,CAAC,aAAa,CAAC,iBAAiB,CAAC;gBAC9C,SAAS,EAAE,iBAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAChE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,aAAa,GAAgC,CAAC,UAAU,EAAE,EAAE;IACvE,IAAI,CAAC;QACH,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACjC,GAAG,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAmC,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE;IAC5F,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACnE,GAAG,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAC9C,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAiC,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE;IACxF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,qBAAqB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACjE,GAAG,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;QAC/D,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;QAC5C,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE;IACrD,OAAO,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sentry/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/sentry/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,mBAAmB,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sentry/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/sentry/index.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,cAAc,QAAQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../../src/sentry/node.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../../src/sentry/node.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,aAAa,IAAI,oBAAoB,EACrC,gBAAgB,IAAI,uBAAuB,EAC3C,cAAc,IAAI,qBAAqB,EAEvC,SAAS,IAAI,gBAAgB,EAG9B,MAAM,cAAc,CAAC;AAKtB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAG3C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAExD;;;;;GAKG;AACH,eAAO,MAAM,IAAI,GAAI,SAAS,WAAW,SAgCxC,CAAC;AAWF;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,oBAOlC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,EAAE,OAAO,uBASrC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAAO,qBASnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,OAAO,CAAC,IAAI,CAGjE,CAAC;AAEF,eAAO,MAAM,SAAS,yBAAmB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
|
-
import {
|
|
4
|
+
import { metrics, addBreadcrumb as naturalAddBreadcrumb, captureException as naturalCaptureException, captureMessage as naturalCaptureMessage, init as naturalInit, withScope as naturalWithScope, setTag, startInactiveSpan, } from '@sentry/node';
|
|
5
5
|
import { log } from '@dxos/log';
|
|
6
6
|
import { TRACE_PROCESSOR } from '@dxos/tracing';
|
|
7
7
|
// Polyfill export.
|
|
@@ -13,21 +13,19 @@ export { setTag, setTags, setUser } from '@sentry/node';
|
|
|
13
13
|
* @param options {InitOptions}
|
|
14
14
|
*/
|
|
15
15
|
export const init = (options) => {
|
|
16
|
-
var _a, _b, _c;
|
|
17
16
|
try {
|
|
18
17
|
naturalInit({
|
|
19
|
-
enabled:
|
|
18
|
+
enabled: options.enable ?? true,
|
|
20
19
|
dsn: options.destination,
|
|
21
20
|
serverName: options.installationId,
|
|
22
21
|
release: options.release,
|
|
23
|
-
environment:
|
|
22
|
+
environment: options.environment ?? process.env.DX_ENVIRONMENT,
|
|
24
23
|
integrations: [],
|
|
25
24
|
tracesSampleRate: options.sampleRate,
|
|
26
25
|
transport: options.transport,
|
|
27
26
|
beforeSend: (event) => {
|
|
28
|
-
var _a;
|
|
29
27
|
options.scrubFilenames && scrub(event);
|
|
30
|
-
|
|
28
|
+
options.onError?.(event);
|
|
31
29
|
return event;
|
|
32
30
|
},
|
|
33
31
|
});
|
|
@@ -37,7 +35,7 @@ export const init = (options) => {
|
|
|
37
35
|
startSpan: startInactiveSpan,
|
|
38
36
|
});
|
|
39
37
|
}
|
|
40
|
-
Object.entries(
|
|
38
|
+
Object.entries(options.properties ?? {}).forEach(([key, value]) => {
|
|
41
39
|
setTag(key, value);
|
|
42
40
|
});
|
|
43
41
|
}
|
|
@@ -46,12 +44,9 @@ export const init = (options) => {
|
|
|
46
44
|
}
|
|
47
45
|
};
|
|
48
46
|
const scrub = (event) => {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
(_b = (_a = value.stacktrace) === null || _a === void 0 ? void 0 : _a.frames) === null || _b === void 0 ? void 0 : _b.forEach((frame) => {
|
|
53
|
-
var _a;
|
|
54
|
-
const filename = (_a = frame.filename) === null || _a === void 0 ? void 0 : _a.split('/');
|
|
47
|
+
event.exception?.values?.forEach((value) => {
|
|
48
|
+
value.stacktrace?.frames?.forEach((frame) => {
|
|
49
|
+
const filename = frame.filename?.split('/');
|
|
55
50
|
frame.filename = filename && filename[filename.length - 1];
|
|
56
51
|
});
|
|
57
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../../src/sentry/node.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAEL,
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../../src/sentry/node.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
|
|
5
|
-
import * as Sentry from './node';
|
|
6
5
|
import { sentryTestkit } from '../testing';
|
|
6
|
+
import * as Sentry from './node';
|
|
7
7
|
const { testkit, sentryTransport } = sentryTestkit();
|
|
8
8
|
// TODO(burdon): https://example.com?
|
|
9
9
|
const MOCK_DESTINATION = 'https://acacaeaccacacacabcaacdacdacadaca@sentry.io/000001';
|
|
@@ -20,14 +20,12 @@ describe('Node error reporting', () => {
|
|
|
20
20
|
testkit.reset();
|
|
21
21
|
});
|
|
22
22
|
test('should scrub stacktraces', async () => {
|
|
23
|
-
var _a, _b;
|
|
24
23
|
const err = new Error('error to look for');
|
|
25
24
|
Sentry.captureException(err);
|
|
26
25
|
await expect.poll(() => testkit.reports()).toHaveLength(1);
|
|
27
26
|
const report = testkit.findReport(err);
|
|
28
|
-
(
|
|
29
|
-
|
|
30
|
-
expect((_a = frame.filename) === null || _a === void 0 ? void 0 : _a.includes('/')).to.be.false;
|
|
27
|
+
(report?.error?.stacktrace).frames?.forEach((frame) => {
|
|
28
|
+
expect(frame.filename?.includes('/')).to.be.false;
|
|
31
29
|
});
|
|
32
30
|
});
|
|
33
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.node.test.js","sourceRoot":"","sources":["../../../../src/sentry/node.node.test.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAGF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvE,OAAO,
|
|
1
|
+
{"version":3,"file":"node.node.test.js","sourceRoot":"","sources":["../../../../src/sentry/node.node.test.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAGF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,aAAa,EAAE,CAAC;AAErD,qCAAqC;AACrC,MAAM,gBAAgB,GAAG,2DAA2D,CAAC;AAErF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,IAAI,CAAC;YACV,WAAW,EAAE,gBAAgB;YAC7B,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,eAAe;YAC1B,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3C,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC,MAAM,EAAE,KAAK,EAAE,UAAyB,CAAA,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry-log-processor.d.ts","sourceRoot":"","sources":["../../../../src/sentry/sentry-log-processor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"sentry-log-processor.d.ts","sourceRoot":"","sources":["../../../../src/sentry/sentry-log-processor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAc,KAAK,EAAiB,MAAM,eAAe,CAAC;AAGtE,OAAO,EAA2C,KAAK,YAAY,EAAa,MAAM,WAAW,CAAC;AAOlG,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,YAAY,CAAuD;IAE3E,SAAgB,YAAY,EAAE,YAAY,CA6DxC;IAEK,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAa9C,OAAO,CAAC,cAAc;CA8BvB"}
|
|
@@ -4,68 +4,64 @@
|
|
|
4
4
|
import { InvariantViolation } from '@dxos/invariant';
|
|
5
5
|
import { LogLevel, shouldLog } from '@dxos/log';
|
|
6
6
|
import { CircularBuffer, getDebugName } from '@dxos/util';
|
|
7
|
-
import {
|
|
7
|
+
import { captureException, captureMessage, withScope } from './node';
|
|
8
8
|
const MAX_LOG_BREADCRUMBS = 150;
|
|
9
9
|
export class SentryLogProcessor {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
10
|
+
_breadcrumbs = new CircularBuffer(MAX_LOG_BREADCRUMBS);
|
|
11
|
+
logProcessor = (config, entry) => {
|
|
12
|
+
const { level, meta, error } = entry;
|
|
13
|
+
// Don't forward logs from remote sessions.
|
|
14
|
+
if (!shouldLog(entry, config.captureFilters) || meta?.S?.remoteSessionId) {
|
|
15
|
+
if (entry.level > LogLevel.DEBUG) {
|
|
16
|
+
this._addBreadcrumb(undefined, entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : ''), convertLevel(entry.level), undefined);
|
|
17
|
+
}
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
if (entry.level !== LogLevel.WARN && entry.level !== LogLevel.ERROR) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
// TODO(nf): add rate limiting to avoid spamming Sentry/consuming excessive quota.
|
|
24
|
+
withScope((scope) => {
|
|
25
|
+
const severity = convertLevel(level);
|
|
26
|
+
scope.setLevel(severity);
|
|
27
|
+
scope.setContext('dxoslog', entry.context ?? null);
|
|
28
|
+
if (meta) {
|
|
29
|
+
scope.setTag('transaction', `${getRelativeFilename(meta.F)}:${meta.L}`);
|
|
30
|
+
if (meta.S?.hostSessionId) {
|
|
31
|
+
scope.setTags({
|
|
32
|
+
service_host_issue: true,
|
|
33
|
+
service_host_session: meta.S?.hostSessionId,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
if (!Number.isNaN(meta.S?.uptimeSeconds)) {
|
|
37
|
+
scope.setExtra('uptime_seconds', meta.S?.uptimeSeconds);
|
|
19
38
|
}
|
|
20
|
-
return;
|
|
21
39
|
}
|
|
22
|
-
|
|
23
|
-
|
|
40
|
+
const extendedMessage = formatMessageForSentry(entry);
|
|
41
|
+
let capturedError = error;
|
|
42
|
+
if (capturedError == null && entry.level === LogLevel.ERROR) {
|
|
43
|
+
capturedError = Object.values(entry.context ?? {}).find((v) => v instanceof Error);
|
|
24
44
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const severity = convertLevel(level);
|
|
29
|
-
scope.setLevel(severity);
|
|
30
|
-
scope.setContext('dxoslog', (_a = entry.context) !== null && _a !== void 0 ? _a : null);
|
|
31
|
-
if (meta) {
|
|
32
|
-
scope.setTag('transaction', `${getRelativeFilename(meta.F)}:${meta.L}`);
|
|
33
|
-
if ((_b = meta.S) === null || _b === void 0 ? void 0 : _b.hostSessionId) {
|
|
34
|
-
scope.setTags({
|
|
35
|
-
service_host_issue: true,
|
|
36
|
-
service_host_session: (_c = meta.S) === null || _c === void 0 ? void 0 : _c.hostSessionId,
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
if (!Number.isNaN((_d = meta.S) === null || _d === void 0 ? void 0 : _d.uptimeSeconds)) {
|
|
40
|
-
scope.setExtra('uptime_seconds', (_e = meta.S) === null || _e === void 0 ? void 0 : _e.uptimeSeconds);
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
const extendedMessage = formatMessageForSentry(entry);
|
|
44
|
-
let capturedError = error;
|
|
45
|
-
if (capturedError == null && entry.level === LogLevel.ERROR) {
|
|
46
|
-
capturedError = Object.values((_f = entry.context) !== null && _f !== void 0 ? _f : {}).find((v) => v instanceof Error);
|
|
45
|
+
if (capturedError) {
|
|
46
|
+
if (capturedError instanceof InvariantViolation) {
|
|
47
|
+
scope.setExtra('invariant_violation', true);
|
|
47
48
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
52
|
-
const isMessageDifferentFromStackTrace = error == null;
|
|
53
|
-
if (isMessageDifferentFromStackTrace) {
|
|
54
|
-
scope.setExtra('message', extendedMessage);
|
|
55
|
-
}
|
|
56
|
-
const eventId = captureException(capturedError);
|
|
57
|
-
this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
|
|
58
|
-
return;
|
|
49
|
+
const isMessageDifferentFromStackTrace = error == null;
|
|
50
|
+
if (isMessageDifferentFromStackTrace) {
|
|
51
|
+
scope.setExtra('message', extendedMessage);
|
|
59
52
|
}
|
|
60
|
-
|
|
61
|
-
const eventId = captureMessage(extendedMessage);
|
|
53
|
+
const eventId = captureException(capturedError);
|
|
62
54
|
this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
|
|
58
|
+
scope.setFingerprint([message]);
|
|
59
|
+
const eventId = captureMessage(extendedMessage);
|
|
60
|
+
this._addBreadcrumb(eventId, extendedMessage, severity, entry.context);
|
|
61
|
+
});
|
|
62
|
+
};
|
|
66
63
|
addLogBreadcrumbsTo(event) {
|
|
67
|
-
|
|
68
|
-
(_a = event.breadcrumbs) !== null && _a !== void 0 ? _a : (event.breadcrumbs = []);
|
|
64
|
+
event.breadcrumbs ??= [];
|
|
69
65
|
for (const breadcrumb of this._breadcrumbs) {
|
|
70
66
|
event.breadcrumbs.push(breadcrumb);
|
|
71
67
|
}
|
|
@@ -77,7 +73,6 @@ export class SentryLogProcessor {
|
|
|
77
73
|
});
|
|
78
74
|
}
|
|
79
75
|
_addBreadcrumb(eventId, message, severity, context) {
|
|
80
|
-
var _a, _b, _c, _d, _e;
|
|
81
76
|
const breadcrumb = {
|
|
82
77
|
type: 'console',
|
|
83
78
|
level: severity,
|
|
@@ -89,10 +84,10 @@ export class SentryLogProcessor {
|
|
|
89
84
|
};
|
|
90
85
|
const lastRecorded = this._breadcrumbs.getLast();
|
|
91
86
|
if (lastRecorded && lastRecorded.message === breadcrumb.message) {
|
|
92
|
-
const firstBreadcrumbData =
|
|
93
|
-
const mergedBreadcrumbCount = Number.isNaN(
|
|
87
|
+
const firstBreadcrumbData = lastRecorded.data?.firstBreadcrumbData ?? lastRecorded.data ?? {};
|
|
88
|
+
const mergedBreadcrumbCount = Number.isNaN(lastRecorded.data?.mergedBreadcrumbCount)
|
|
94
89
|
? 1
|
|
95
|
-
: Number(
|
|
90
|
+
: Number(lastRecorded.data?.mergedBreadcrumbCount);
|
|
96
91
|
lastRecorded.data = {
|
|
97
92
|
mergedBreadcrumbCount: mergedBreadcrumbCount + 1,
|
|
98
93
|
firstBreadcrumbData,
|
|
@@ -104,17 +99,17 @@ export class SentryLogProcessor {
|
|
|
104
99
|
}
|
|
105
100
|
}
|
|
106
101
|
const formatMessageForSentry = (entry) => {
|
|
107
|
-
|
|
102
|
+
const message = entry.message ?? (entry.error ? (entry.error.message ?? String(entry.error)) : '');
|
|
108
103
|
let scopePrefix;
|
|
109
|
-
if (
|
|
110
|
-
const scope =
|
|
104
|
+
if (entry.meta?.S) {
|
|
105
|
+
const scope = entry.meta?.S;
|
|
111
106
|
scopePrefix = scope.name || getDebugName(scope);
|
|
112
107
|
}
|
|
113
108
|
if (scopePrefix == null) {
|
|
114
|
-
return
|
|
109
|
+
return message;
|
|
115
110
|
}
|
|
116
|
-
const workerPrefix =
|
|
117
|
-
return `${workerPrefix}${scopePrefix} ${
|
|
111
|
+
const workerPrefix = entry.meta?.S?.hostSessionId ? '[worker] ' : '';
|
|
112
|
+
return `${workerPrefix}${scopePrefix} ${message}`;
|
|
118
113
|
};
|
|
119
114
|
const convertLevel = (level) => {
|
|
120
115
|
switch (level) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry-log-processor.js","sourceRoot":"","sources":["../../../../src/sentry/sentry-log-processor.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAIF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAiC,QAAQ,EAAqB,SAAS,EAAE,MAAM,WAAW,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sentry-log-processor.js","sourceRoot":"","sources":["../../../../src/sentry/sentry-log-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
import { beforeAll, beforeEach, describe, expect, test } from 'vitest';
|
|
5
|
-
import * as Sentry from './node';
|
|
6
5
|
import { sentryTestkit } from '../testing';
|
|
6
|
+
import * as Sentry from './node';
|
|
7
7
|
const { testkit, sentryTransport } = sentryTestkit();
|
|
8
8
|
const MOCK_DESTINATION = 'https://acacaeaccacacacabcaacdacdacadaca@sentry.io/000001';
|
|
9
9
|
describe('Error reporting', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry.node.test.js","sourceRoot":"","sources":["../../../../src/sentry/sentry.node.test.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvE,OAAO,
|
|
1
|
+
{"version":3,"file":"sentry.node.test.js","sourceRoot":"","sources":["../../../../src/sentry/sentry.node.test.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,aAAa,EAAE,CAAC;AAErD,MAAM,gBAAgB,GAAG,2DAA2D,CAAC;AAErF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,IAAI,CAAC;YACV,WAAW,EAAE,gBAAgB;YAC7B,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,eAAe;SAC3B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3C,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|