@interopio/otel 0.0.47 → 0.0.48
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/logs/logs.d.ts +1 -1
- package/dist/logs/manager.d.ts +2 -1
- package/dist/logs/manager.js +56 -0
- package/dist/logs/manager.js.map +1 -1
- package/dist/logs/nullManager.d.ts +1 -1
- package/dist/logs/nullManager.js +1 -1
- package/dist/logs/nullManager.js.map +1 -1
- package/dist/logs/types.d.ts +13 -1
- package/dist/logs/types.js +1 -0
- package/dist/logs/types.js.map +1 -1
- package/package.json +1 -1
package/dist/logs/logs.d.ts
CHANGED
package/dist/logs/manager.d.ts
CHANGED
|
@@ -7,7 +7,8 @@ export declare class LogsManager implements ILogsManager {
|
|
|
7
7
|
settings: LogsSettings;
|
|
8
8
|
loggerOtel: Logger;
|
|
9
9
|
constructor(logsSettings: LogsSettings, settings: Settings);
|
|
10
|
-
emit(logRecord: LogRecord): Promise<void
|
|
10
|
+
emit(logRecord: LogRecord): Promise<void> | null;
|
|
11
|
+
applyFilters(logRecord: LogRecord): boolean;
|
|
11
12
|
start(): Promise<void>;
|
|
12
13
|
stop(): Promise<void>;
|
|
13
14
|
waitForFinalExport(timeoutMs?: number | undefined): Promise<void>;
|
package/dist/logs/manager.js
CHANGED
|
@@ -31,6 +31,9 @@ class LogsManager {
|
|
|
31
31
|
}
|
|
32
32
|
emit(logRecord) {
|
|
33
33
|
if (this.started) {
|
|
34
|
+
if (!this.applyFilters(logRecord)) {
|
|
35
|
+
return Promise.resolve();
|
|
36
|
+
}
|
|
34
37
|
this.loggerOtel.emit(logRecord);
|
|
35
38
|
// {
|
|
36
39
|
// severityNumber: SeverityNumber.INFO,
|
|
@@ -41,6 +44,47 @@ class LogsManager {
|
|
|
41
44
|
}
|
|
42
45
|
return Promise.resolve();
|
|
43
46
|
}
|
|
47
|
+
applyFilters(logRecord) {
|
|
48
|
+
var _a, _b, _c, _d;
|
|
49
|
+
if (!((_a = this.settings.filters) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
50
|
+
!this.settings.defaults) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
const filter = (_c = (_b = this.settings.filters) === null || _b === void 0 ? void 0 : _b.find(x => {
|
|
54
|
+
var _a;
|
|
55
|
+
if (x.categoryName) {
|
|
56
|
+
if (((_a = logRecord.attributes) === null || _a === void 0 ? void 0 : _a.categoryName) !== x.categoryName) {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (x.severity) {
|
|
61
|
+
if (!logRecord.severityText ||
|
|
62
|
+
!asSevereOrMore(logRecord.severityText, x.severity)) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
if (x.bodyRegex) {
|
|
67
|
+
if (!new RegExp(x.bodyRegex).test(logRecord.body + "")) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return true;
|
|
72
|
+
})) !== null && _c !== void 0 ? _c : this.settings.defaults;
|
|
73
|
+
if (!filter) {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
if ((_d = filter === null || filter === void 0 ? void 0 : filter.allowedAttributes) === null || _d === void 0 ? void 0 : _d.length) {
|
|
77
|
+
for (const attribute of Object.keys(logRecord.attributes)) {
|
|
78
|
+
if (!~filter.allowedAttributes.indexOf(attribute)) {
|
|
79
|
+
delete logRecord.attributes[attribute];
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (filter.hideRegex) {
|
|
84
|
+
logRecord.body = (logRecord.body + "").replace(new RegExp(filter.hideRegex), "*****");
|
|
85
|
+
}
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
44
88
|
start() {
|
|
45
89
|
this.started = true;
|
|
46
90
|
return Promise.resolve();
|
|
@@ -54,4 +98,16 @@ class LogsManager {
|
|
|
54
98
|
}
|
|
55
99
|
}
|
|
56
100
|
exports.LogsManager = LogsManager;
|
|
101
|
+
const severityHierarchy = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL"];
|
|
102
|
+
function asSevereOrMore(left, right) {
|
|
103
|
+
const leftIndex = severityHierarchy.indexOf(left.toUpperCase());
|
|
104
|
+
if (leftIndex < 0) {
|
|
105
|
+
return false;
|
|
106
|
+
}
|
|
107
|
+
const rightIndex = severityHierarchy.indexOf(right.toUpperCase());
|
|
108
|
+
if (rightIndex < 0) {
|
|
109
|
+
return false;
|
|
110
|
+
}
|
|
111
|
+
return leftIndex >= rightIndex;
|
|
112
|
+
}
|
|
57
113
|
//# sourceMappingURL=manager.js.map
|
package/dist/logs/manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/logs/manager.ts"],"names":[],"mappings":";AAAA,iGAAiG;;;AAIjG,oFAAyE;AACzE,sDAAuH;AAEvH,wDAAkE;AAClE,iCAA8B;AAE9B,MAAa,WAAW;IAKpB,YAAmB,YAA0B,EAAE,QAAkB;;QAE7D,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,MAAM,QAAQ,GAAG,IAAA,kCAAsB,kBACnC,cAAc,EAAE,GAAG,QAAQ,CAAC,WAAW,EAAE,EACzC,qBAAqB,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,EAC9C,iBAAiB,EAAE,GAAG,QAAQ,CAAC,cAAc,EAAE,EAC/C,SAAS,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,IAC5B,QAAQ,CAAC,4BAA4B,EAC1C,CAAC;QAEH,MAAM,cAAc,GAAG,MAAA,YAAY,CAAC,cAAc,mCAAI,IAAI,yBAAc,iBACpE,QAAQ,IACL,YAAY,CAAC,gBAAgB,EAClC,CAAC;QAEH,IAAI,MAAA,YAAY,CAAC,YAAY,0CAAE,MAAM,EAAE;YACnC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,YAAY,EAAE;gBAC9C,cAAc,CAAC,qBAAqB,CAChC,IAAI,kCAAuB,CACvB,QAAQ,EACR,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;aACxC;SACJ;QAED,IAAI,MAAA,YAAY,CAAC,aAAa,0CAAE,MAAM,EAAE;YACpC,KAAK,MAAM,SAAS,IAAI,YAAY,CAAC,aAAa,EAAE;gBAChD,cAAc,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;aACnD;SACJ;QAED,IAAI,YAAY,CAAC,GAAG,EAAE;YAClB,cAAc,CAAC,qBAAqB,CAChC,IAAI,kCAAuB,CACvB,IAAI,yCAAe,iBACf,GAAG,EAAE,YAAY,CAAC,GAAG,EACrB,SAAS,EAAE,YAAY,CAAC,SAAS,IAC9B,YAAY,CAAC,gBAAgB,EAClC,EACF,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEtD,WAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAEM,IAAI,CAAC,SAAoB;QAC5B,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAChC,IAAI;YACJ,2CAA2C;YAC3C,4BAA4B;YAC5B,oBAAoB;YACpB,+CAA+C;YAC/C,MAAM;SACT;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAGD,KAAK;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI;QACA,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,kBAAkB,CAAC,SAA8B;QAC7C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/logs/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { LogsSettings } from './types';
|
|
|
2
2
|
import { LogRecord } from "@opentelemetry/sdk-logs";
|
|
3
3
|
import { NullManager } from '../utils/nullManager';
|
|
4
4
|
export declare class NullLogsManager extends NullManager<LogsSettings> {
|
|
5
|
-
emit(logRecord: LogRecord): Promise<void
|
|
5
|
+
emit(logRecord: LogRecord): Promise<void> | null;
|
|
6
6
|
}
|
package/dist/logs/nullManager.js
CHANGED
|
@@ -5,7 +5,7 @@ exports.NullLogsManager = void 0;
|
|
|
5
5
|
const nullManager_1 = require("../utils/nullManager");
|
|
6
6
|
class NullLogsManager extends nullManager_1.NullManager {
|
|
7
7
|
emit(logRecord) {
|
|
8
|
-
return
|
|
8
|
+
return null;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
exports.NullLogsManager = NullLogsManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullManager.js","sourceRoot":"","sources":["../../src/logs/nullManager.ts"],"names":[],"mappings":";AAAA,iGAAiG;;;AAIjG,sDAAmD;AAEnD,MAAa,eAAgB,SAAQ,yBAAyB;IACnD,IAAI,CAAC,SAAoB;QAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"nullManager.js","sourceRoot":"","sources":["../../src/logs/nullManager.ts"],"names":[],"mappings":";AAAA,iGAAiG;;;AAIjG,sDAAmD;AAEnD,MAAa,eAAgB,SAAQ,yBAAyB;IACnD,IAAI,CAAC,SAAoB;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAJD,0CAIC"}
|
package/dist/logs/types.d.ts
CHANGED
|
@@ -3,7 +3,17 @@ import { Manager } from "../types";
|
|
|
3
3
|
import { OTLPExporterConfigBase } from "@opentelemetry/otlp-exporter-base";
|
|
4
4
|
import { LogRecord } from "@opentelemetry/api-logs";
|
|
5
5
|
export interface LogsManager extends Manager<LogsSettings> {
|
|
6
|
-
emit(logRecord: LogRecord): Promise<void
|
|
6
|
+
emit(logRecord: LogRecord): Promise<void> | null;
|
|
7
|
+
}
|
|
8
|
+
export interface LogOptions {
|
|
9
|
+
allowedAttributes?: string[];
|
|
10
|
+
hideRegex?: string;
|
|
11
|
+
enabled?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export interface LogFilter extends LogOptions {
|
|
14
|
+
categoryName?: string;
|
|
15
|
+
severity?: "TRACE" | "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL";
|
|
16
|
+
bodyRegex?: string;
|
|
7
17
|
}
|
|
8
18
|
export interface LogsSettings {
|
|
9
19
|
enabled: boolean;
|
|
@@ -17,4 +27,6 @@ export interface LogsSettings {
|
|
|
17
27
|
logExporters?: LogRecordExporter[];
|
|
18
28
|
additionalAttributes?: any;
|
|
19
29
|
maxAttributeDepth?: number;
|
|
30
|
+
filters?: LogFilter[];
|
|
31
|
+
defaults?: LogOptions;
|
|
20
32
|
}
|
package/dist/logs/types.js
CHANGED
package/dist/logs/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/logs/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/logs/types.ts"],"names":[],"mappings":";;AAkBC,CAAC"}
|