@balena/open-balena-api 34.3.20 → 34.4.0-build-trace-ids-7b572ae991370fd35174b2feb86da8f43d9a1c90-1
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.
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import morgan from 'morgan';
|
|
2
2
|
import { getServiceFromRequest } from '../../lib/auth.js';
|
|
3
3
|
import { getIP } from '../../lib/utils.js';
|
|
4
|
+
import { trace } from '@opentelemetry/api';
|
|
4
5
|
export const skipLogging = (req, _res, next) => {
|
|
5
6
|
req.skipLogging = true;
|
|
6
7
|
next();
|
|
@@ -55,7 +56,8 @@ export const setupRequestLogging = (app, getUrl) => {
|
|
|
55
56
|
const responseTime = tokens['response-time'](req, res) ?? '-';
|
|
56
57
|
const balenaClient = req.headers['x-balena-client'] ?? '-';
|
|
57
58
|
const callerId = getCallerId(req);
|
|
58
|
-
|
|
59
|
+
const traceId = trace.getActiveSpan()?.spanContext().traceId ?? '-';
|
|
60
|
+
return `${date} ${getIP(req)} ${traceId} ${callerId} ${req.method} ${url} ${statusCode} ${responseTime}ms ${balenaClient}`;
|
|
59
61
|
}, {
|
|
60
62
|
skip: (req) => req.skipLogging,
|
|
61
63
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/request-logging/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/features/request-logging/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import _ from 'lodash';
|
|
|
2
2
|
import * as Sentry from '@sentry/node';
|
|
3
3
|
import escapeHtml from 'escape-html';
|
|
4
4
|
import { errors, sbvrUtils } from '@balena/pinejs';
|
|
5
|
+
import { trace } from '@opentelemetry/api';
|
|
5
6
|
const { InternalRequestError, HttpError } = errors;
|
|
6
7
|
export const translateError = (err) => {
|
|
7
8
|
if (err instanceof InternalRequestError) {
|
|
@@ -21,12 +22,13 @@ export const translateError = (err) => {
|
|
|
21
22
|
return escapeHtml(message);
|
|
22
23
|
};
|
|
23
24
|
export function captureException(err, message, options) {
|
|
25
|
+
const traceId = trace.getActiveSpan()?.spanContext().traceId ?? '';
|
|
24
26
|
// if err does not have a message or a stack, we have no information about that error
|
|
25
27
|
if (_.isObject(err) && err.message == null) {
|
|
26
|
-
console.error(message, err);
|
|
28
|
+
console.error(traceId, message, err);
|
|
27
29
|
}
|
|
28
30
|
else {
|
|
29
|
-
console.error(message, err.message, err.stack);
|
|
31
|
+
console.error(traceId, message, err.message, err.stack);
|
|
30
32
|
}
|
|
31
33
|
Sentry.withScope((scope) => {
|
|
32
34
|
if (options != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/error-handling/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/infra/error-handling/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "34.
|
|
4
|
+
"version": "34.4.0-build-trace-ids-7b572ae991370fd35174b2feb86da8f43d9a1c90-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -52,7 +52,12 @@
|
|
|
52
52
|
"@balena/pinejs": "^20.0.0",
|
|
53
53
|
"@balena/pinejs-webresource-cloudfront": "^1.0.2",
|
|
54
54
|
"@balena/pinejs-webresource-s3": "^1.0.2",
|
|
55
|
+
"@opentelemetry/api": "^1.9.0",
|
|
56
|
+
"@opentelemetry/instrumentation-express": "^0.47.0",
|
|
57
|
+
"@opentelemetry/instrumentation-http": "^0.57.1",
|
|
58
|
+
"@opentelemetry/sdk-node": "^0.57.1",
|
|
55
59
|
"@sentry/node": "^8.48.0",
|
|
60
|
+
"@swc-node/register": "^1.10.9",
|
|
56
61
|
"@types/basic-auth": "^1.1.8",
|
|
57
62
|
"@types/bluebird": "^3.5.42",
|
|
58
63
|
"@types/cache-manager": "^4.0.6",
|
|
@@ -127,7 +132,6 @@
|
|
|
127
132
|
"supervisor": "^0.12.0",
|
|
128
133
|
"tar": "^7.4.3",
|
|
129
134
|
"thirty-two": "^1.0.2",
|
|
130
|
-
"ts-node": "^10.9.2",
|
|
131
135
|
"typed-error": "^3.2.2",
|
|
132
136
|
"typescript": "^5.7.3",
|
|
133
137
|
"uuid": "^11.0.5",
|
|
@@ -163,9 +167,9 @@
|
|
|
163
167
|
"delay": true,
|
|
164
168
|
"exit": true,
|
|
165
169
|
"_": "index.js",
|
|
166
|
-
"
|
|
170
|
+
"import": "@swc-node/register/esm-register"
|
|
167
171
|
},
|
|
168
172
|
"versionist": {
|
|
169
|
-
"publishedAt": "2025-01-
|
|
173
|
+
"publishedAt": "2025-01-17T16:37:05.294Z"
|
|
170
174
|
}
|
|
171
175
|
}
|