@sipgate/integration-bridge 1.0.25 → 1.0.27
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.
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
import { NextFunction, Response } from 'express';
|
|
3
3
|
import { BridgeRequest } from '../models';
|
|
4
4
|
import { AsyncLocalStorage } from 'async_hooks';
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const userIdStorage: AsyncLocalStorage<string>;
|
|
6
6
|
export declare function extractHeaderMiddleware(req: BridgeRequest<any>, res: Response, next: NextFunction): void;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.extractHeaderMiddleware = exports.
|
|
3
|
+
exports.extractHeaderMiddleware = exports.userIdStorage = void 0;
|
|
4
4
|
const async_hooks_1 = require("async_hooks");
|
|
5
5
|
const DEFAULT_LOCALE = 'de-DE';
|
|
6
|
-
exports.
|
|
6
|
+
exports.userIdStorage = new async_hooks_1.AsyncLocalStorage();
|
|
7
7
|
function extractHeaderMiddleware(req, res, next) {
|
|
8
8
|
const userId = req.get('x-user-id') || '';
|
|
9
9
|
const apiKey = req.get('x-provider-key') || '';
|
|
@@ -15,7 +15,7 @@ function extractHeaderMiddleware(req, res, next) {
|
|
|
15
15
|
apiUrl,
|
|
16
16
|
locale,
|
|
17
17
|
};
|
|
18
|
-
exports.
|
|
18
|
+
exports.userIdStorage.run(userId, () => next());
|
|
19
19
|
}
|
|
20
20
|
exports.extractHeaderMiddleware = extractHeaderMiddleware;
|
|
21
21
|
//# sourceMappingURL=extract-header.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-header.middleware.js","sourceRoot":"","sources":["../../src/middlewares/extract-header.middleware.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAEhD,MAAM,cAAc,GAAG,OAAO,CAAC;AAElB,QAAA,
|
|
1
|
+
{"version":3,"file":"extract-header.middleware.js","sourceRoot":"","sources":["../../src/middlewares/extract-header.middleware.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAEhD,MAAM,cAAc,GAAG,OAAO,CAAC;AAElB,QAAA,aAAa,GAAG,IAAI,+BAAiB,EAAU,CAAC;AAE7D,SAAgB,uBAAuB,CACrC,GAAuB,EACvB,GAAa,EACb,IAAkB;IAElB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,cAAc,CAAC;IAE9D,GAAG,CAAC,cAAc,GAAG;QACnB,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;KACP,CAAC;IAEF,qBAAa,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1C,CAAC;AAlBD,0DAkBC"}
|
package/dist/util/logger.util.js
CHANGED
|
@@ -56,15 +56,26 @@ const logger = (logFn, source, message, apiKey, ...args) => {
|
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
const data = Object.assign({}, args);
|
|
59
|
-
const userId = middlewares_1.playtypusUserIdStorage.getStore();
|
|
60
|
-
if (userId) {
|
|
61
|
-
data.platypusUserId = userId;
|
|
62
|
-
}
|
|
63
59
|
const anonymizedApiKey = apiKey ? (0, anonymize_key_1.anonymizeKey)(apiKey) : undefined;
|
|
64
60
|
if (anonymizedApiKey) {
|
|
65
61
|
data.apiKey = anonymizedApiKey;
|
|
66
62
|
}
|
|
67
|
-
|
|
63
|
+
const object = {};
|
|
64
|
+
api_1.propagation.inject(api_1.context.active(), object);
|
|
65
|
+
// format tracing info for gcloud logging
|
|
66
|
+
let traceProp = {};
|
|
67
|
+
if (object.traceparent && typeof object.traceparent === 'string') {
|
|
68
|
+
const [, traceId, spanId] = object.traceparent.split('-');
|
|
69
|
+
traceProp =
|
|
70
|
+
process.env.NODE_ENV === 'production'
|
|
71
|
+
? {
|
|
72
|
+
'logging.googleapis.com/trace': `projects/clinq-services/traces/${traceId}`,
|
|
73
|
+
'logging.googleapis.com/spanId': spanId,
|
|
74
|
+
'logging.googleapis.com/sampled': false,
|
|
75
|
+
}
|
|
76
|
+
: {};
|
|
77
|
+
}
|
|
78
|
+
logFn(JSON.stringify(Object.assign(Object.assign(Object.assign({}, traceProp), { message: formatedMessage, userId: middlewares_1.userIdStorage.getStore() }), data)));
|
|
68
79
|
};
|
|
69
80
|
const constructLogMessage = (...args) => `${args
|
|
70
81
|
.flat()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.util.js","sourceRoot":"","sources":["../../src/util/logger.util.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"logger.util.js","sourceRoot":"","sources":["../../src/util/logger.util.ts"],"names":[],"mappings":"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"}
|