@interopio/log4js-otel 0.0.6 → 0.0.8
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/index.js +12 -10
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +8 -2
package/dist/index.js
CHANGED
|
@@ -16,23 +16,25 @@ function configure(config, layouts) {
|
|
|
16
16
|
const recordsBeforeOTELActive = [];
|
|
17
17
|
const startTime = new Date().getTime();
|
|
18
18
|
return (loggingEvent) => {
|
|
19
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
|
|
19
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
|
|
20
20
|
try {
|
|
21
21
|
const attributes = Object.assign(Object.assign({ level: (_a = loggingEvent.level) === null || _a === void 0 ? void 0 : _a.levelStr, startTime: loggingEvent.startTime.getTime(), categoryName: loggingEvent.categoryName, callStack: loggingEvent.callStack, columnNumber: loggingEvent.columnNumber, error: (_b = loggingEvent.error) === null || _b === void 0 ? void 0 : _b.message, errorStack: (_c = loggingEvent.error) === null || _c === void 0 ? void 0 : _c.stack, errorName: (_d = loggingEvent.error) === null || _d === void 0 ? void 0 : _d.name, lineNumber: loggingEvent.lineNumber, pid: loggingEvent.pid, fileName: loggingEvent.fileName, functionName: loggingEvent.functionName, clusterWorkerId: (_e = loggingEvent.cluster) === null || _e === void 0 ? void 0 : _e.workerId, clusterWorker: (_f = loggingEvent.cluster) === null || _f === void 0 ? void 0 : _f.worker }, (_g = otel_1.Container.instance) === null || _g === void 0 ? void 0 : _g.settings.additionalAttributes), (_h = otel_1.Logs.instance) === null || _h === void 0 ? void 0 : _h.settings.additionalAttributes);
|
|
22
|
-
loggingEvent.context = Object.assign(Object.assign({},
|
|
23
|
-
loggingEvent.context["loggerName"] = (
|
|
24
|
-
loggingEvent.context["
|
|
25
|
-
loggingEvent.context["
|
|
22
|
+
loggingEvent.context = Object.assign(Object.assign(Object.assign({}, (_j = otel_1.Logs.instance) === null || _j === void 0 ? void 0 : _j.settings.additionalResourceAttributes), (_k = otel_1.Logs.instance) === null || _k === void 0 ? void 0 : _k.settings.additionalAttributes), loggingEvent.context);
|
|
23
|
+
loggingEvent.context["loggerName"] = (_l = loggingEvent.context["loggerName"]) !== null && _l !== void 0 ? _l : "default";
|
|
24
|
+
loggingEvent.context["serviceId"] = (_m = loggingEvent.context["serviceId"]) !== null && _m !== void 0 ? _m : (_p = (_o = otel_1.Container.instance) === null || _o === void 0 ? void 0 : _o.settings) === null || _p === void 0 ? void 0 : _p.serviceId;
|
|
25
|
+
loggingEvent.context["instanceId"] = (_q = loggingEvent.context["instanceId"]) !== null && _q !== void 0 ? _q : (loggingEvent.pid + "");
|
|
26
|
+
loggingEvent.context["applicationName"] = (_u = (_r = loggingEvent.context["applicationName"]) !== null && _r !== void 0 ? _r : (_t = (_s = otel_1.Container.instance) === null || _s === void 0 ? void 0 : _s.settings) === null || _t === void 0 ? void 0 : _t.serviceName) !== null && _u !== void 0 ? _u : "unknown-app";
|
|
26
27
|
const record = {
|
|
27
28
|
body: layout(loggingEvent),
|
|
28
29
|
severityText: mapLogJsLevelString(loggingEvent.level.levelStr),
|
|
29
30
|
severityNumber: mapLogJsLevelNumber(loggingEvent.level.level),
|
|
30
31
|
observedTimestamp: loggingEvent.startTime,
|
|
31
32
|
timestamp: loggingEvent.startTime,
|
|
32
|
-
|
|
33
|
+
// this is the captured OTEL context
|
|
34
|
+
context: (_v = otel_1.Traces.currentTracingState) === null || _v === void 0 ? void 0 : _v.context,
|
|
33
35
|
attributes
|
|
34
36
|
};
|
|
35
|
-
if (!((
|
|
37
|
+
if (!((_w = otel_1.Logs.instance) === null || _w === void 0 ? void 0 : _w.started)) {
|
|
36
38
|
if (maxRecordsBeforeOTELActive !== -1 &&
|
|
37
39
|
recordsBeforeOTELActive.length >= maxRecordsBeforeOTELActive) {
|
|
38
40
|
recordsBeforeOTELActive.length = 0;
|
|
@@ -51,7 +53,7 @@ function configure(config, layouts) {
|
|
|
51
53
|
otel_1.Logs.emit(recordBeforeOTELActive);
|
|
52
54
|
}
|
|
53
55
|
catch (err) {
|
|
54
|
-
if ((
|
|
56
|
+
if ((_x = config.logErrorsInConsole) !== null && _x !== void 0 ? _x : true) {
|
|
55
57
|
console.error(err);
|
|
56
58
|
}
|
|
57
59
|
}
|
|
@@ -61,13 +63,13 @@ function configure(config, layouts) {
|
|
|
61
63
|
otel_1.Logs.emit(record);
|
|
62
64
|
}
|
|
63
65
|
catch (err) {
|
|
64
|
-
if ((
|
|
66
|
+
if ((_y = config.logErrorsInConsole) !== null && _y !== void 0 ? _y : true) {
|
|
65
67
|
console.error(err);
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
catch (err) {
|
|
70
|
-
if ((
|
|
72
|
+
if ((_z = config.logErrorsInConsole) !== null && _z !== void 0 ? _z : true) {
|
|
71
73
|
console.error(err);
|
|
72
74
|
}
|
|
73
75
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,mEAAmE;;AAenE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -47,8 +47,13 @@ export function configure(config: Log4JSToOTELAppenderConfig, layouts: LayoutsPa
|
|
|
47
47
|
...Logs.instance?.settings.additionalAttributes,
|
|
48
48
|
// data: loggingEvent.data?.length ? flattenOtelAtributes({ data: loggingEvent.data }, Logs.instance.settings.maxAttributeDepth ?? 5) : undefined
|
|
49
49
|
};
|
|
50
|
-
loggingEvent.context = {
|
|
50
|
+
loggingEvent.context = {
|
|
51
|
+
...Logs.instance?.settings.additionalResourceAttributes,
|
|
52
|
+
...Logs.instance?.settings.additionalAttributes,
|
|
53
|
+
...loggingEvent.context
|
|
54
|
+
};
|
|
51
55
|
loggingEvent.context["loggerName"] = loggingEvent.context["loggerName"] ?? "default";
|
|
56
|
+
loggingEvent.context["serviceId"] = loggingEvent.context["serviceId"] ?? Container.instance?.settings?.serviceId;
|
|
52
57
|
loggingEvent.context["instanceId"] = loggingEvent.context["instanceId"] ?? (loggingEvent.pid + "");
|
|
53
58
|
loggingEvent.context["applicationName"] = loggingEvent.context["applicationName"] ?? Container.instance?.settings?.serviceName ?? "unknown-app";
|
|
54
59
|
const record = {
|
|
@@ -57,7 +62,8 @@ export function configure(config: Log4JSToOTELAppenderConfig, layouts: LayoutsPa
|
|
|
57
62
|
severityNumber: mapLogJsLevelNumber(loggingEvent.level.level),
|
|
58
63
|
observedTimestamp: loggingEvent.startTime,
|
|
59
64
|
timestamp: loggingEvent.startTime,
|
|
60
|
-
|
|
65
|
+
// this is the captured OTEL context
|
|
66
|
+
context: Traces.currentTracingState?.context,
|
|
61
67
|
attributes
|
|
62
68
|
};
|
|
63
69
|
if (!Logs.instance?.started) {
|