@interopio/otel 0.0.60 → 0.0.61
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/manager.d.ts +2 -0
- package/dist/logs/manager.js +10 -4
- package/dist/logs/manager.js.map +1 -1
- package/package.json +1 -1
package/dist/logs/manager.d.ts
CHANGED
|
@@ -4,8 +4,10 @@ import { LogRecord } from "@opentelemetry/sdk-logs";
|
|
|
4
4
|
import { Settings } from '../types';
|
|
5
5
|
export declare class LogsManager implements ILogsManager {
|
|
6
6
|
settings: LogsSettings;
|
|
7
|
+
private otelSettings;
|
|
7
8
|
started: boolean;
|
|
8
9
|
loggerOtel: Logger;
|
|
10
|
+
private additionalAttributes;
|
|
9
11
|
constructor(settings: LogsSettings, otelSettings: Settings);
|
|
10
12
|
emit(logRecord: LogRecord): Promise<void> | null;
|
|
11
13
|
applyFilters(logRecord: LogRecord): boolean;
|
package/dist/logs/manager.js
CHANGED
|
@@ -9,17 +9,20 @@ const logs_1 = require("./logs");
|
|
|
9
9
|
const otelUtils_1 = require("../otelUtils");
|
|
10
10
|
class LogsManager {
|
|
11
11
|
constructor(settings, otelSettings) {
|
|
12
|
-
var _a, _b, _c;
|
|
12
|
+
var _a, _b, _c, _d;
|
|
13
13
|
this.settings = settings;
|
|
14
|
+
this.otelSettings = otelSettings;
|
|
14
15
|
this.started = false;
|
|
15
16
|
const resource = (0, resources_1.resourceFromAttributes)(Object.assign({ "service.name": `${otelSettings.serviceName}`, "service.instance.id": `${otelSettings.serviceId}`, "service.version": `${otelSettings.serviceVersion}`, "user.id": `${otelSettings.userId}` }, (0, otelUtils_1.resolveSettingsMap)(otelSettings.additionalResourceAttributes, settings.additionalResourceAttributes)));
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
this.additionalAttributes =
|
|
18
|
+
(0, otelUtils_1.flattenOtelAtributes)((0, otelUtils_1.resolveSettingsMap)(this.otelSettings.additionalAttributes, this.settings.additionalAttributes), (_a = settings.maxAttributeDepth) !== null && _a !== void 0 ? _a : 5);
|
|
19
|
+
const loggerProvider = (_b = settings.loggerProvider) !== null && _b !== void 0 ? _b : new sdk_logs_1.LoggerProvider(Object.assign({ resource }, settings.providerSettings));
|
|
20
|
+
if ((_c = settings.logExporters) === null || _c === void 0 ? void 0 : _c.length) {
|
|
18
21
|
for (const exporter of settings.logExporters) {
|
|
19
22
|
loggerProvider.addLogRecordProcessor(new sdk_logs_1.BatchLogRecordProcessor(exporter, settings.batchSettings));
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
|
-
if ((
|
|
25
|
+
if ((_d = settings.logProcessors) === null || _d === void 0 ? void 0 : _d.length) {
|
|
23
26
|
for (const processor of settings.logProcessors) {
|
|
24
27
|
loggerProvider.addLogRecordProcessor(processor);
|
|
25
28
|
}
|
|
@@ -77,6 +80,9 @@ class LogsManager {
|
|
|
77
80
|
if (filter.enabled === false) {
|
|
78
81
|
return false;
|
|
79
82
|
}
|
|
83
|
+
for (const attribute in this.additionalAttributes) {
|
|
84
|
+
logRecord.setAttribute(attribute, this.additionalAttributes[attribute]);
|
|
85
|
+
}
|
|
80
86
|
if ((_d = filter.allowedAttributes) === null || _d === void 0 ? void 0 : _d.length) {
|
|
81
87
|
for (const attribute of Object.keys(logRecord.attributes)) {
|
|
82
88
|
if (!~filter.allowedAttributes.indexOf(attribute)) {
|
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;AAC9B,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/logs/manager.ts"],"names":[],"mappings":"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"}
|