@interopio/otel 0.0.35 → 0.0.37
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/builder.js +5 -6
- package/dist/builder.js.map +1 -1
- package/dist/metrics/builder.d.ts +3 -3
- package/dist/metrics/builder.js +1 -1
- package/dist/metrics/builder.js.map +1 -1
- package/dist/metrics/factory/builder.js +1 -1
- package/dist/metrics/factory/builder.js.map +1 -1
- package/dist/metrics/factory/factory.d.ts +3 -1
- package/dist/metrics/factory/factory.js +14 -1
- package/dist/metrics/factory/factory.js.map +1 -1
- package/dist/metrics/manager.d.ts +7 -3
- package/dist/metrics/manager.js +26 -9
- package/dist/metrics/manager.js.map +1 -1
- package/dist/metrics/metrics/base/types.d.ts +1 -1
- package/dist/metrics/metrics/custom/customCounter.d.ts +14 -0
- package/dist/metrics/metrics/custom/customCounter.js +30 -0
- package/dist/metrics/metrics/custom/customCounter.js.map +1 -0
- package/dist/metrics/metrics/custom/customHistogram.d.ts +14 -0
- package/dist/metrics/metrics/custom/customHistogram.js +30 -0
- package/dist/metrics/metrics/custom/customHistogram.js.map +1 -0
- package/dist/metrics/metrics/custom/customUpDownCounter.d.ts +14 -0
- package/dist/metrics/metrics/custom/customUpDownCounter.js +30 -0
- package/dist/metrics/metrics/custom/customUpDownCounter.js.map +1 -0
- package/dist/metrics/settings/builder.d.ts +7 -5
- package/dist/metrics/settings/builder.js +48 -29
- package/dist/metrics/settings/builder.js.map +1 -1
- package/dist/metrics/settings/default.d.ts +3 -1
- package/dist/metrics/settings/default.js +12 -3
- package/dist/metrics/settings/default.js.map +1 -1
- package/dist/metrics/settings/types.d.ts +1 -6
- package/dist/metrics/types.d.ts +3 -3
- package/dist/traces/builder.d.ts +4 -3
- package/dist/traces/builder.js +3 -3
- package/dist/traces/builder.js.map +1 -1
- package/dist/traces/manager.d.ts +4 -2
- package/dist/traces/manager.js +14 -14
- package/dist/traces/manager.js.map +1 -1
- package/dist/traces/tracingState.js +1 -1
- package/dist/traces/types.d.ts +0 -29
- package/dist/traces/utils/index.d.ts +3 -2
- package/dist/traces/utils/index.js +5 -9
- package/dist/traces/utils/index.js.map +1 -1
- package/dist/validation/metrics/builder.js +4 -1
- package/dist/validation/metrics/builder.js.map +1 -1
- package/dist/validation/metrics/factoryBuilder.js +1 -1
- package/dist/validation/metrics/factoryBuilder.js.map +1 -1
- package/dist/validation/metrics/settingsBuilder.d.ts +2 -2
- package/dist/validation/metrics/settingsBuilder.js +11 -9
- package/dist/validation/metrics/settingsBuilder.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,26 +7,46 @@ class MetricsSettingsBuilder {
|
|
|
7
7
|
constructor() {
|
|
8
8
|
this.metrics = new Map;
|
|
9
9
|
this.defaultSettings = new default_1.DefaultMetricsSettings();
|
|
10
|
-
this.withSettings(
|
|
10
|
+
this.withSettings({
|
|
11
|
+
enabled: false,
|
|
12
|
+
platformVersion: "unknown",
|
|
13
|
+
serviceId: "unknown",
|
|
14
|
+
serviceName: "unknown",
|
|
15
|
+
userId: "unknown",
|
|
16
|
+
serviceVersion: "unknown",
|
|
17
|
+
metrics: this.defaultSettings
|
|
18
|
+
});
|
|
11
19
|
}
|
|
12
20
|
build() {
|
|
13
|
-
var _a, _b, _c, _d, _e, _f;
|
|
14
|
-
|
|
15
|
-
|
|
21
|
+
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, _0;
|
|
22
|
+
if (!this.platformMetricsEnabled) {
|
|
23
|
+
for (const metricType of this.defaultSettings.metrics) {
|
|
24
|
+
this.metrics.delete(metricType.name);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
16
27
|
this.metrics.forEach((metric) => {
|
|
17
|
-
this.metrics.set(metric.
|
|
28
|
+
this.metrics.set(metric.name, this.convert(metric));
|
|
18
29
|
});
|
|
19
|
-
const settings = Object.assign(Object.assign({}, this.settings), { enabled: this.enabled,
|
|
30
|
+
const settings = Object.assign(Object.assign({}, this.settings), { enabled: this.enabled, platformMetricsEnabled: this.platformMetricsEnabled, meter: Object.assign(Object.assign(Object.assign({}, this.settings), this.meter), { url: (_a = this.meter.url) !== null && _a !== void 0 ? _a : (_b = this.settings) === null || _b === void 0 ? void 0 : _b.url, userId: (_e = (_c = this.userId) !== null && _c !== void 0 ? _c : (_d = this.otelSettings) === null || _d === void 0 ? void 0 : _d.userId) !== null && _e !== void 0 ? _e : this.meter.serviceId, serviceId: (_g = (_f = this.otelSettings) === null || _f === void 0 ? void 0 : _f.serviceId) !== null && _g !== void 0 ? _g : this.meter.serviceId, serviceName: (_j = (_h = this.otelSettings) === null || _h === void 0 ? void 0 : _h.serviceName) !== null && _j !== void 0 ? _j : this.meter.serviceId, serviceVersion: (_l = (_k = this.otelSettings) === null || _k === void 0 ? void 0 : _k.serviceVersion) !== null && _l !== void 0 ? _l : this.meter.serviceId, publishInterval: (_m = this.meter.publishInterval) !== null && _m !== void 0 ? _m : (_o = this.settings) === null || _o === void 0 ? void 0 : _o.publishInterval, compression: (_p = this.meter.compression) !== null && _p !== void 0 ? _p : (_q = this.settings) === null || _q === void 0 ? void 0 : _q.compression, headers: (_r = this.meter.headers) !== null && _r !== void 0 ? _r : (_s = this.settings) === null || _s === void 0 ? void 0 : _s.headers, hostname: (_t = this.meter.hostname) !== null && _t !== void 0 ? _t : (_u = this.settings) === null || _u === void 0 ? void 0 : _u.hostname, keepAlive: (_v = this.meter.keepAlive) !== null && _v !== void 0 ? _v : (_w = this.settings) === null || _w === void 0 ? void 0 : _w.keepAlive, concurrencyLimit: (_x = this.meter.concurrencyLimit) !== null && _x !== void 0 ? _x : (_y = this.settings) === null || _y === void 0 ? void 0 : _y.concurrencyLimit,
|
|
31
|
+
/** Maximum time the OTLP exporter will wait for each batch export.
|
|
32
|
+
* The default value is 10000ms. */
|
|
33
|
+
timeoutMillis: (_z = this.meter.concurrencyLimit) !== null && _z !== void 0 ? _z : (_0 = this.settings) === null || _0 === void 0 ? void 0 : _0.timeoutMillis }), metrics: [...this.metrics.values()] });
|
|
34
|
+
const validator = new settingsBuilder_1.MetricsSettingsBuilderValidator();
|
|
35
|
+
validator.validate(settings);
|
|
20
36
|
return settings;
|
|
21
37
|
}
|
|
22
|
-
withSettings(
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.
|
|
38
|
+
withSettings(otelSettings) {
|
|
39
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
40
|
+
const oldOtelSettings = this.otelSettings;
|
|
41
|
+
this.otelSettings = otelSettings;
|
|
42
|
+
const oldSettings = this.settings;
|
|
43
|
+
this.settings = otelSettings === null || otelSettings === void 0 ? void 0 : otelSettings.metrics;
|
|
44
|
+
return this.withEnabled((_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : oldSettings === null || oldSettings === void 0 ? void 0 : oldSettings.enabled)
|
|
45
|
+
.withPlatformMetricsEnabled((_d = (_c = this.settings) === null || _c === void 0 ? void 0 : _c.platformMetricsEnabled) !== null && _d !== void 0 ? _d : oldSettings === null || oldSettings === void 0 ? void 0 : oldSettings.platformMetricsEnabled)
|
|
46
|
+
.withUser((_f = (_e = this.otelSettings) === null || _e === void 0 ? void 0 : _e.userId) !== null && _f !== void 0 ? _f : oldOtelSettings === null || oldOtelSettings === void 0 ? void 0 : oldOtelSettings.userId)
|
|
47
|
+
.withPlatformVersion((_h = (_g = this.otelSettings) === null || _g === void 0 ? void 0 : _g.platformVersion) !== null && _h !== void 0 ? _h : oldOtelSettings === null || oldOtelSettings === void 0 ? void 0 : oldOtelSettings.platformVersion)
|
|
48
|
+
.withMeter(Object.assign(Object.assign({}, oldSettings === null || oldSettings === void 0 ? void 0 : oldSettings.meter), (_j = this.settings) === null || _j === void 0 ? void 0 : _j.meter))
|
|
49
|
+
.withCustomMetrics((_k = this.settings) === null || _k === void 0 ? void 0 : _k.metrics);
|
|
30
50
|
}
|
|
31
51
|
withEnabled(enabled) {
|
|
32
52
|
this.enabled = enabled !== null && enabled !== void 0 ? enabled : this.enabled;
|
|
@@ -36,7 +56,7 @@ class MetricsSettingsBuilder {
|
|
|
36
56
|
this.userId = userId !== null && userId !== void 0 ? userId : this.userId;
|
|
37
57
|
this.metrics.forEach((metric) => {
|
|
38
58
|
metric.user = this.userId;
|
|
39
|
-
this.metrics.set(metric.
|
|
59
|
+
this.metrics.set(metric.name, metric);
|
|
40
60
|
});
|
|
41
61
|
return this;
|
|
42
62
|
}
|
|
@@ -44,22 +64,18 @@ class MetricsSettingsBuilder {
|
|
|
44
64
|
this.platformVersion = version !== null && version !== void 0 ? version : this.platformVersion;
|
|
45
65
|
this.metrics.forEach((metric) => {
|
|
46
66
|
metric.platformVersion = this.platformVersion;
|
|
47
|
-
this.metrics.set(metric.
|
|
67
|
+
this.metrics.set(metric.name, metric);
|
|
48
68
|
});
|
|
49
69
|
return this;
|
|
50
70
|
}
|
|
51
|
-
|
|
52
|
-
this.
|
|
53
|
-
this.metrics.forEach((metric) => {
|
|
54
|
-
metric.enabled = this.defaultMetricsEnabled;
|
|
55
|
-
this.metrics.set(metric.type, metric);
|
|
56
|
-
});
|
|
71
|
+
withPlatformMetricsEnabled(enabled) {
|
|
72
|
+
this.platformMetricsEnabled = enabled !== null && enabled !== void 0 ? enabled : this.platformMetricsEnabled;
|
|
57
73
|
return this;
|
|
58
74
|
}
|
|
59
75
|
withMeter(settings) {
|
|
60
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k
|
|
76
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
61
77
|
const defaultMeterSettings = this.meter;
|
|
62
|
-
this.meter = Object.assign(Object.assign(Object.assign({}, defaultMeterSettings), (settings !== null && settings !== void 0 ? settings : {})), { url: (_a = settings === null || settings === void 0 ? void 0 : settings.url) !== null && _a !== void 0 ? _a : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.url,
|
|
78
|
+
this.meter = Object.assign(Object.assign(Object.assign({}, defaultMeterSettings), (settings !== null && settings !== void 0 ? settings : {})), { url: (_a = settings === null || settings === void 0 ? void 0 : settings.url) !== null && _a !== void 0 ? _a : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.url, publishInterval: (_b = settings === null || settings === void 0 ? void 0 : settings.publishInterval) !== null && _b !== void 0 ? _b : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.publishInterval, compression: (_e = (_c = settings === null || settings === void 0 ? void 0 : settings.compression) !== null && _c !== void 0 ? _c : (_d = this.settings) === null || _d === void 0 ? void 0 : _d.compression) !== null && _e !== void 0 ? _e : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.compression, headers: (_f = settings === null || settings === void 0 ? void 0 : settings.headers) !== null && _f !== void 0 ? _f : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.headers, hostname: (_g = settings === null || settings === void 0 ? void 0 : settings.hostname) !== null && _g !== void 0 ? _g : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.hostname, keepAlive: (_h = settings === null || settings === void 0 ? void 0 : settings.keepAlive) !== null && _h !== void 0 ? _h : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.keepAlive, concurrencyLimit: (_j = settings === null || settings === void 0 ? void 0 : settings.concurrencyLimit) !== null && _j !== void 0 ? _j : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.concurrencyLimit, timeoutMillis: (_k = settings === null || settings === void 0 ? void 0 : settings.timeoutMillis) !== null && _k !== void 0 ? _k : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.timeoutMillis });
|
|
63
79
|
return this;
|
|
64
80
|
}
|
|
65
81
|
withCustomMetrics(settings) {
|
|
@@ -68,26 +84,29 @@ class MetricsSettingsBuilder {
|
|
|
68
84
|
return this;
|
|
69
85
|
}
|
|
70
86
|
withCustomMetric(custom) {
|
|
71
|
-
|
|
87
|
+
if (!custom.name) {
|
|
88
|
+
throw new Error("settings.name is not defined");
|
|
89
|
+
}
|
|
90
|
+
const hasSettings = this.metrics.has(custom.name);
|
|
72
91
|
if (!hasSettings) {
|
|
73
92
|
const converted = this.convert(custom);
|
|
74
|
-
this.metrics.set(custom.
|
|
93
|
+
this.metrics.set(custom.name, converted);
|
|
75
94
|
}
|
|
76
95
|
else {
|
|
77
96
|
const existing = this.metrics.get(custom.type);
|
|
78
97
|
const merged = this.mergeSettings(custom, existing);
|
|
79
|
-
this.metrics.set(merged.
|
|
98
|
+
this.metrics.set(merged.name, merged);
|
|
80
99
|
}
|
|
81
100
|
return this;
|
|
82
101
|
}
|
|
83
102
|
convert(custom) {
|
|
84
103
|
var _a, _b, _c, _d;
|
|
85
|
-
const converted = Object.assign(Object.assign({}, this.settings), { type: custom.type, user: this.userId, enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : true, name: (_b = custom.name) !== null && _b !== void 0 ? _b : custom.type, description: (_c = custom.description) !== null && _c !== void 0 ? _c : ((_d = custom.name) !== null && _d !== void 0 ? _d : custom.type), platformVersion: this.platformVersion, unit: custom.unit, buckets: custom.buckets });
|
|
104
|
+
const converted = Object.assign(Object.assign(Object.assign({}, this.settings), custom), { type: custom.type, user: this.userId, enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : true, name: (_b = custom.name) !== null && _b !== void 0 ? _b : custom.type, description: (_c = custom.description) !== null && _c !== void 0 ? _c : ((_d = custom.name) !== null && _d !== void 0 ? _d : custom.type), platformVersion: this.platformVersion, unit: custom.unit, buckets: custom.buckets });
|
|
86
105
|
return converted;
|
|
87
106
|
}
|
|
88
107
|
mergeSettings(custom, existing) {
|
|
89
108
|
var _a, _b, _c, _d;
|
|
90
|
-
const converted = Object.assign(Object.assign({}, this.settings), { type: custom.type, user: this.userId, enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : existing.enabled, name: (_b = custom.name) !== null && _b !== void 0 ? _b : existing.name, description: (_c = custom.description) !== null && _c !== void 0 ? _c : existing.description, platformVersion: this.platformVersion, unit: existing.unit, buckets: (_d = custom.buckets) !== null && _d !== void 0 ? _d : existing.buckets });
|
|
109
|
+
const converted = Object.assign(Object.assign(Object.assign({}, existing), this.settings), { type: custom.type, user: this.userId, enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : existing.enabled, name: (_b = custom.name) !== null && _b !== void 0 ? _b : existing.name, description: (_c = custom.description) !== null && _c !== void 0 ? _c : existing.description, platformVersion: this.platformVersion, unit: existing.unit, buckets: (_d = custom.buckets) !== null && _d !== void 0 ? _d : existing.buckets });
|
|
91
110
|
return converted;
|
|
92
111
|
}
|
|
93
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/metrics/settings/builder.ts"],"names":[],"mappings":";;;AAAA,8EAA2F;AAE3F,uCAAmD;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/metrics/settings/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { InternalMetricsSettings } from "./types";
|
|
|
4
4
|
export declare class DefaultMetricsSettings implements InternalMetricsSettings {
|
|
5
5
|
private unknown;
|
|
6
6
|
get enabled(): boolean;
|
|
7
|
-
get
|
|
7
|
+
get platformMetricsEnabled(): boolean;
|
|
8
8
|
get userId(): string;
|
|
9
9
|
get platformVersion(): string;
|
|
10
10
|
get meter(): InternalMetricsMeterSettings;
|
|
@@ -14,12 +14,14 @@ export declare class DefaultMetricsSettings implements InternalMetricsSettings {
|
|
|
14
14
|
private getAppCount;
|
|
15
15
|
private getAppStartup;
|
|
16
16
|
private getAppDuration;
|
|
17
|
+
private getAppDurationSoft;
|
|
17
18
|
private getAppMemory;
|
|
18
19
|
private getAppCPU;
|
|
19
20
|
private getAppError;
|
|
20
21
|
private getAppCrash;
|
|
21
22
|
private getLayoutStartup;
|
|
22
23
|
private getWorkspaceStartup;
|
|
24
|
+
private getWorkspaceStarted;
|
|
23
25
|
private getWorkspaceStopped;
|
|
24
26
|
private getWorkspaceCount;
|
|
25
27
|
private getPlatformStartup;
|
|
@@ -8,7 +8,7 @@ class DefaultMetricsSettings {
|
|
|
8
8
|
get enabled() {
|
|
9
9
|
return true;
|
|
10
10
|
}
|
|
11
|
-
get
|
|
11
|
+
get platformMetricsEnabled() {
|
|
12
12
|
return true;
|
|
13
13
|
}
|
|
14
14
|
get userId() {
|
|
@@ -28,9 +28,10 @@ class DefaultMetricsSettings {
|
|
|
28
28
|
}
|
|
29
29
|
get metrics() {
|
|
30
30
|
const metrics = [
|
|
31
|
-
this.getAppStarted(), this.getAppStopped(), this.getAppCount(), this.getAppStartup(), this.getAppDuration(),
|
|
31
|
+
this.getAppStarted(), this.getAppStopped(), this.getAppCount(), this.getAppStartup(), this.getAppDuration(), this.getAppDuration(),
|
|
32
|
+
this.getAppDurationSoft(),
|
|
32
33
|
this.getAppMemory(), this.getAppCPU(), this.getAppError(), this.getAppCrash(), this.getLayoutStartup(),
|
|
33
|
-
this.getWorkspaceStartup(), this.getWorkspaceStopped(), this.getWorkspaceCount(), this.getPlatformStartup(),
|
|
34
|
+
this.getWorkspaceStartup(), this.getWorkspaceStarted(), this.getWorkspaceStopped(), this.getWorkspaceCount(), this.getPlatformStartup(),
|
|
34
35
|
this.getPlatformError(), this.getSystemMemory(), this.getSystemCPU(),
|
|
35
36
|
];
|
|
36
37
|
return metrics;
|
|
@@ -55,6 +56,10 @@ class DefaultMetricsSettings {
|
|
|
55
56
|
const settings = this.getSettings("app_duration", "How long an application has been focused during each platform session", "app_duration", "ms", [1000, 10000, 30000, 60000, 600000]);
|
|
56
57
|
return settings;
|
|
57
58
|
}
|
|
59
|
+
getAppDurationSoft() {
|
|
60
|
+
const settings = this.getSettings("app_duration_soft", "How long an application has been focused during each platform session (without the currently focused application)", "app_duration_soft", "ms", [1000, 10000, 30000, 60000, 600000]);
|
|
61
|
+
return settings;
|
|
62
|
+
}
|
|
58
63
|
getAppMemory() {
|
|
59
64
|
const settings = this.getSettings("app_memory", "Current app memory usage", "app_memory", "kb");
|
|
60
65
|
return settings;
|
|
@@ -79,6 +84,10 @@ class DefaultMetricsSettings {
|
|
|
79
84
|
const settings = this.getSettings("workspace_startup", "Time to load the workspace layout", "workspace_startup", "ms", [100, 1000, 10000, 30000, 60000]);
|
|
80
85
|
return settings;
|
|
81
86
|
}
|
|
87
|
+
getWorkspaceStarted() {
|
|
88
|
+
const settings = this.getSettings("workspace_started", "Number of times a workspace has been stopped during each platform session", "workspace_started");
|
|
89
|
+
return settings;
|
|
90
|
+
}
|
|
82
91
|
getWorkspaceStopped() {
|
|
83
92
|
const settings = this.getSettings("workspace_stopped", "Number of times a workspace has been stopped during each platform session", "workspace_stopped");
|
|
84
93
|
return settings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../src/metrics/settings/default.ts"],"names":[],"mappings":";;;AAKA,MAAa,sBAAsB;IAAnC;QACY,YAAO,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../src/metrics/settings/default.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,7 @@ import { InternalMetricSettings, MetricSettings } from "../metrics/base/types";
|
|
|
2
2
|
import { CompressionAlgorithm, InternalMetricsMeterSettings, MetricsMeterSettings } from "../meter/types";
|
|
3
3
|
export interface InternalMetricsSettings {
|
|
4
4
|
enabled: boolean;
|
|
5
|
-
|
|
6
|
-
serviceId?: string;
|
|
7
|
-
serviceName?: string;
|
|
8
|
-
serviceVersion?: string;
|
|
9
|
-
platformVersion?: string;
|
|
10
|
-
userId?: string;
|
|
5
|
+
platformMetricsEnabled: boolean;
|
|
11
6
|
meter: InternalMetricsMeterSettings;
|
|
12
7
|
metrics: InternalMetricSettings[];
|
|
13
8
|
url?: string;
|
package/dist/metrics/types.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { Manager } from "../types";
|
|
1
|
+
import { Manager, Settings } from "../types";
|
|
2
2
|
import { Logger } from "../logger/types";
|
|
3
3
|
import { MetricsDependencyContainer } from "./dependencies/types";
|
|
4
4
|
import { MetricsMeterProviderCreateFunc } from "./meter/types";
|
|
5
5
|
import { Metric, MetricType } from "./metrics/base/types";
|
|
6
|
-
import {
|
|
6
|
+
import { MetricsSettings } from "./settings/types";
|
|
7
7
|
export interface MetricsManagerBuilder {
|
|
8
8
|
build(): MetricsManager;
|
|
9
9
|
withLogger(logger: Logger): this;
|
|
10
|
-
withSettings(settings:
|
|
10
|
+
withSettings(settings: Settings): this;
|
|
11
11
|
withMeterProvider(func: MetricsMeterProviderCreateFunc): this;
|
|
12
12
|
withDependencyContainer(container: MetricsDependencyContainer): this;
|
|
13
13
|
}
|
package/dist/traces/builder.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { ContextManager, TracerProvider } from "@opentelemetry/api";
|
|
2
2
|
import { Logger } from "../logger/types";
|
|
3
|
-
import { TracesManager as ITracesManager,
|
|
3
|
+
import { TracesManager as ITracesManager, FilteringContext } from "./types";
|
|
4
4
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
5
|
+
import { Settings } from "../types";
|
|
5
6
|
export declare class TracesManagerBuilder implements TracesManagerBuilder {
|
|
6
7
|
logger: Logger;
|
|
7
|
-
settings:
|
|
8
|
+
settings: Settings;
|
|
8
9
|
filteringContextGetter: (() => FilteringContext) | undefined;
|
|
9
10
|
tracerProvider: TracerProvider;
|
|
10
11
|
samplerGetter?: (defaultSampler: Sampler) => Sampler;
|
|
@@ -12,7 +13,7 @@ export declare class TracesManagerBuilder implements TracesManagerBuilder {
|
|
|
12
13
|
spanExporters?: SpanExporter[];
|
|
13
14
|
providerRegistrationSettings?: any;
|
|
14
15
|
withLogger(logger: Logger): this;
|
|
15
|
-
withSettings(settings
|
|
16
|
+
withSettings(settings: Settings): this;
|
|
16
17
|
withFilteringContextGetter(filteringContextGetter?: () => FilteringContext): this;
|
|
17
18
|
withTracerProvider(tracerProvider: TracerProvider): this;
|
|
18
19
|
withSamplerGetter(samplerGetter: (defaultSampler: Sampler) => Sampler): this;
|
package/dist/traces/builder.js
CHANGED
|
@@ -40,7 +40,7 @@ class TracesManagerBuilder {
|
|
|
40
40
|
withContextManager(contextManager) {
|
|
41
41
|
this.providerRegistrationSettings = Object.assign(Object.assign({}, this.providerRegistrationSettings), { contextManager });
|
|
42
42
|
if (this.settings) {
|
|
43
|
-
this.settings = Object.assign(Object.assign({}, this.settings), { useOTELContextManager: true });
|
|
43
|
+
this.settings = Object.assign(Object.assign({}, this.settings), { traces: Object.assign(Object.assign({ enabled: false }, this.settings.traces), { useOTELContextManager: true }) });
|
|
44
44
|
}
|
|
45
45
|
return this;
|
|
46
46
|
}
|
|
@@ -51,11 +51,11 @@ class TracesManagerBuilder {
|
|
|
51
51
|
return this.buildCore();
|
|
52
52
|
}
|
|
53
53
|
buildCore() {
|
|
54
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
54
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
55
55
|
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
|
|
56
56
|
return new nullTracesManager_1.NullTracesManager();
|
|
57
57
|
}
|
|
58
|
-
const manager = new manager_1.TracesManager(this.settings, this.logger, this.filteringContextGetter || ((_b = this.settings) === null || _b === void 0 ? void 0 : _b.filteringContextGetter), this.tracerProvider || ((
|
|
58
|
+
const manager = new manager_1.TracesManager(this.settings, this.logger, this.filteringContextGetter || ((_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.traces) === null || _c === void 0 ? void 0 : _c.filteringContextGetter), this.tracerProvider || ((_e = (_d = this.settings) === null || _d === void 0 ? void 0 : _d.traces) === null || _e === void 0 ? void 0 : _e.tracerProvider), this.samplerGetter || ((_g = (_f = this.settings) === null || _f === void 0 ? void 0 : _f.traces) === null || _g === void 0 ? void 0 : _g.samplerGetter), this.spanProcessors || ((_j = (_h = this.settings) === null || _h === void 0 ? void 0 : _h.traces) === null || _j === void 0 ? void 0 : _j.spanProcessors), this.spanExporters || ((_l = (_k = this.settings) === null || _k === void 0 ? void 0 : _k.traces) === null || _l === void 0 ? void 0 : _l.spanExporters), this.providerRegistrationSettings || ((_o = (_m = this.settings) === null || _m === void 0 ? void 0 : _m.traces) === null || _o === void 0 ? void 0 : _o.providerRegistrationSettings));
|
|
59
59
|
return manager;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/traces/builder.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAI1C,2DAAwD;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/traces/builder.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAI1C,2DAAwD;AAGxD,MAAa,oBAAoB;IAUxB,UAAU,CAAC,MAAc;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAkB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,0BAA0B,CAAC,sBAA+C;QAC/E,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA8B;QACpD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,aAAmD;QAC1E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA+B;QACvD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,iBAAiB,CAAC,aAA6B;QACpD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gCAAgC,CAAC,4BAAiC;;QACvE,IAAI,CAAC,4BAA4B,mBAAK,cAAc,EAAE,MAAA,IAAI,CAAC,4BAA4B,0CAAE,cAAc,IAAK,4BAA4B,CAAE,CAAC;QAC3I,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA8B;QACtD,IAAI,CAAC,4BAA4B,mCAAQ,IAAI,CAAC,4BAA4B,KAAE,cAAc,GAAE,CAAC;QAC7F,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,mCAAQ,IAAI,CAAC,QAAQ,KAAE,MAAM,gCAAI,OAAO,EAAE,KAAK,IAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAE,qBAAqB,EAAE,IAAI,MAAI,CAAC;SACxH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK;QACV,gBAAgB;QAChB,kDAAkD;QAClD,4BAA4B;QAE5B,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEO,SAAS;;QACf,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,MAAK,IAAI,EAAE;YACnC,OAAO,IAAI,qCAAiB,EAAE,CAAC;SAChC;QACD,MAAM,OAAO,GAAG,IAAI,uBAAa,CAC/B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,sBAAsB,KAAK,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,sBAAsB,CAAA,EAC7E,IAAI,CAAC,cAAc,KAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,cAAc,CAAA,EAC5D,IAAI,CAAC,aAAa,KAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,aAAa,CAAA,EAC1D,IAAI,CAAC,cAAc,KAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,cAAc,CAAA,EAC5D,IAAI,CAAC,aAAa,KAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,aAAa,CAAA,EAC1D,IAAI,CAAC,4BAA4B,KAAI,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,0CAAE,4BAA4B,CAAA,CAAC,CAAC;QAC5F,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAjFD,oDAiFC"}
|
package/dist/traces/manager.d.ts
CHANGED
|
@@ -2,8 +2,9 @@ import { Logger } from "../logger/types";
|
|
|
2
2
|
import { TracesManager as ITracesManager, PropagationInfo, PropagationInfoCarrier, TracesSettings, FilteringContext, WithSpanCallback } from "./types";
|
|
3
3
|
import { TracerProvider, ContextManager } from "@opentelemetry/api";
|
|
4
4
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
5
|
+
import { Settings } from "../types";
|
|
5
6
|
export declare class TracesManager implements ITracesManager {
|
|
6
|
-
|
|
7
|
+
otelSettings: Settings;
|
|
7
8
|
private logger;
|
|
8
9
|
private filteringContextGetter;
|
|
9
10
|
started: boolean;
|
|
@@ -12,7 +13,8 @@ export declare class TracesManager implements ITracesManager {
|
|
|
12
13
|
private DEFAULT_USER;
|
|
13
14
|
private DEFAULT_SERVICE_NAME;
|
|
14
15
|
private filters;
|
|
15
|
-
|
|
16
|
+
settings: TracesSettings;
|
|
17
|
+
constructor(otelSettings: Settings, logger: Logger, filteringContextGetter: (() => FilteringContext) | undefined, tracerProvider?: TracerProvider, sampler?: (defaultSampler: Sampler) => Sampler, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
16
18
|
contextManager?: ContextManager;
|
|
17
19
|
});
|
|
18
20
|
withSpan<T>(source: string, filteringContextOrCallback: FilteringContext | WithSpanCallback<T>, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T> | null, callback?: WithSpanCallback<T>): T;
|
package/dist/traces/manager.js
CHANGED
|
@@ -21,8 +21,8 @@ const withSpan_1 = require("../validation/traces/withSpan");
|
|
|
21
21
|
const nullTracingState_1 = require("./nullTracingState");
|
|
22
22
|
const traces_1 = __importDefault(require("./traces"));
|
|
23
23
|
class TracesManager {
|
|
24
|
-
constructor(
|
|
25
|
-
this.
|
|
24
|
+
constructor(otelSettings, logger, filteringContextGetter, tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings) {
|
|
25
|
+
this.otelSettings = otelSettings;
|
|
26
26
|
this.logger = logger;
|
|
27
27
|
this.filteringContextGetter = filteringContextGetter;
|
|
28
28
|
this.started = false;
|
|
@@ -32,8 +32,8 @@ class TracesManager {
|
|
|
32
32
|
this.DEFAULT_SERVICE_NAME = "unknown-service-name";
|
|
33
33
|
this.filteringContextGetter = filteringContextGetter || (() => ({}));
|
|
34
34
|
const defaultTracingEnv = filteringContextGetter === null || filteringContextGetter === void 0 ? void 0 : filteringContextGetter.call(this);
|
|
35
|
-
const replacedSettings =
|
|
36
|
-
this.settings =
|
|
35
|
+
// const replacedSettings = replacePlaceHolders(settings.traces, defaultTracingEnv);
|
|
36
|
+
this.settings = otelSettings.traces || { enabled: false };
|
|
37
37
|
this.filters = this.settings.filters || [];
|
|
38
38
|
if (this.settings.useDefaultFilters) {
|
|
39
39
|
this.filters = [
|
|
@@ -45,7 +45,7 @@ class TracesManager {
|
|
|
45
45
|
}
|
|
46
46
|
const validator = new manager_1.TracesManagerValidator();
|
|
47
47
|
validator.validate(this);
|
|
48
|
-
(0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.filteringContextGetter, this.logger, Object.assign(Object.assign({},
|
|
48
|
+
(0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.filteringContextGetter, this.logger, Object.assign(Object.assign({}, otelSettings), { serviceName: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.serviceName) || otelSettings.serviceName || this.DEFAULT_SERVICE_NAME, userId: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.user) || otelSettings.userId || this.DEFAULT_USER, traces: Object.assign(Object.assign({}, this.settings), { url: this.settings.url || this.DEFAULT_URL }) }));
|
|
49
49
|
traces_1.default.instance = this;
|
|
50
50
|
}
|
|
51
51
|
// todo vnikolov: split this up
|
|
@@ -59,22 +59,22 @@ class TracesManager {
|
|
|
59
59
|
}
|
|
60
60
|
const fullFilteringContext = Object.assign(Object.assign({}, (_a = this.filteringContextGetter) === null || _a === void 0 ? void 0 : _a.call(this)), filteringContext);
|
|
61
61
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.user)) {
|
|
62
|
-
fullFilteringContext.user = this.
|
|
62
|
+
fullFilteringContext.user = this.otelSettings.userId || this.DEFAULT_USER;
|
|
63
63
|
}
|
|
64
64
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.userId)) {
|
|
65
|
-
fullFilteringContext.userId = this.
|
|
65
|
+
fullFilteringContext.userId = this.otelSettings.userId || this.DEFAULT_USER;
|
|
66
66
|
}
|
|
67
67
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceName)) {
|
|
68
|
-
fullFilteringContext.serviceName = this.
|
|
68
|
+
fullFilteringContext.serviceName = this.otelSettings.serviceName || this.DEFAULT_SERVICE_NAME;
|
|
69
69
|
}
|
|
70
70
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceId)) {
|
|
71
|
-
fullFilteringContext.serviceId = this.
|
|
71
|
+
fullFilteringContext.serviceId = this.otelSettings.serviceId;
|
|
72
72
|
}
|
|
73
73
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceVersion)) {
|
|
74
|
-
fullFilteringContext.serviceVersion = this.
|
|
74
|
+
fullFilteringContext.serviceVersion = this.otelSettings.serviceVersion;
|
|
75
75
|
}
|
|
76
76
|
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.platformVersion)) {
|
|
77
|
-
fullFilteringContext.platformVersion = this.
|
|
77
|
+
fullFilteringContext.platformVersion = this.otelSettings.platformVersion;
|
|
78
78
|
}
|
|
79
79
|
if (this.settings.filteringContext) {
|
|
80
80
|
for (const key in this.settings.filteringContext) {
|
|
@@ -123,11 +123,11 @@ class TracesManager {
|
|
|
123
123
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
124
124
|
const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION, (_d = (_a = match === null || match === void 0 ? void 0 : match.disablePropagation) !== null && _a !== void 0 ? _a : (_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.disablePropagation) !== null && _d !== void 0 ? _d : false, this.settings);
|
|
125
125
|
traces_1.default.currentTracingState = tracingState;
|
|
126
|
-
if (this.
|
|
127
|
-
(0, utils_1.saveDataInAttribute)({ platformVersion: this.
|
|
126
|
+
if (this.otelSettings.platformVersion) {
|
|
127
|
+
(0, utils_1.saveDataInAttribute)({ platformVersion: this.otelSettings.platformVersion }, otelSpan, (_e = this.settings.maxAttributeDepth) !== null && _e !== void 0 ? _e : 5);
|
|
128
128
|
}
|
|
129
129
|
if ((_h = (_f = match === null || match === void 0 ? void 0 : match.addContextToTrace) !== null && _f !== void 0 ? _f : (_g = this.settings.default) === null || _g === void 0 ? void 0 : _g.addContextToTrace) !== null && _h !== void 0 ? _h : true) {
|
|
130
|
-
(0, utils_1.saveDataInAttribute)(fullFilteringContext, otelSpan, (_j = this.settings.maxAttributeDepth) !== null && _j !== void 0 ? _j :
|
|
130
|
+
(0, utils_1.saveDataInAttribute)(fullFilteringContext, otelSpan, (_j = this.settings.maxAttributeDepth) !== null && _j !== void 0 ? _j : 5);
|
|
131
131
|
}
|
|
132
132
|
try {
|
|
133
133
|
traces_1.default.currentTracingState = tracingState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAcA,4CAO4B;AAC5B,mCAOiB;AACjB,0DAAsE;AACtE,iDAA8C;AAC9C,4DAAwE;AAExE,yDAAsD;AACtD,sDAA8B;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ class TracingState {
|
|
|
68
68
|
}
|
|
69
69
|
// todo vnikolov: log
|
|
70
70
|
if (level >= types_1.Verbosity[this.level]) {
|
|
71
|
-
(0, utils_1.saveDataInAttribute)(data, this.span, (_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.maxAttributeDepth) !== null && _b !== void 0 ? _b :
|
|
71
|
+
(0, utils_1.saveDataInAttribute)(data, this.span, (_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.maxAttributeDepth) !== null && _b !== void 0 ? _b : 5);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
getPropagationInfo() {
|
package/dist/traces/types.d.ts
CHANGED
|
@@ -201,11 +201,6 @@ export interface TracesSettings {
|
|
|
201
201
|
* Defaults to 'false'.
|
|
202
202
|
*/
|
|
203
203
|
enabled: boolean;
|
|
204
|
-
/**
|
|
205
|
-
* If provided, this value will be added to the span attributes
|
|
206
|
-
* and to the span filtering context (see 'filters').
|
|
207
|
-
*/
|
|
208
|
-
platformVersion?: string;
|
|
209
204
|
/**
|
|
210
205
|
* If provided, these values will be added to the span attributes
|
|
211
206
|
* and to the span filtering context (see 'filters').
|
|
@@ -282,30 +277,6 @@ export interface TracesSettings {
|
|
|
282
277
|
* have a ConsoleTraceExporter.
|
|
283
278
|
*/
|
|
284
279
|
console?: boolean;
|
|
285
|
-
/**
|
|
286
|
-
* If an OTEL TraceProvider isn't provided to the library,
|
|
287
|
-
* it will initialize its own, with this provided service.name
|
|
288
|
-
* attribute.
|
|
289
|
-
*/
|
|
290
|
-
serviceName?: string;
|
|
291
|
-
/**
|
|
292
|
-
* If an OTEL TraceProvider isn't provided to the library,
|
|
293
|
-
* it will initialize its own, with this provided service.instance.id
|
|
294
|
-
* attribute.
|
|
295
|
-
*/
|
|
296
|
-
serviceId?: string;
|
|
297
|
-
/**
|
|
298
|
-
* If an OTEL TraceProvider isn't provided to the library,
|
|
299
|
-
* it will initialize its own, with this provided service.version
|
|
300
|
-
* attribute.
|
|
301
|
-
*/
|
|
302
|
-
serviceVersion?: string;
|
|
303
|
-
/**
|
|
304
|
-
* If an OTEL TraceProvider isn't provided to the library,
|
|
305
|
-
* it will initialize its own, with this provided user.id
|
|
306
|
-
* attribute.
|
|
307
|
-
*/
|
|
308
|
-
userId?: string;
|
|
309
280
|
/**
|
|
310
281
|
* How deep addData method should recurse into objects when adding
|
|
311
282
|
* attributes to spans. Default value: 3
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
2
2
|
import { ContextManager, TracerProvider } from "@opentelemetry/api";
|
|
3
|
-
import { Filter, FilteringContext, TracesDefaultsSettings
|
|
3
|
+
import { Filter, FilteringContext, TracesDefaultsSettings } from "../types";
|
|
4
4
|
import { Span } from "@opentelemetry/api";
|
|
5
5
|
import { Logger } from "../../logger/types";
|
|
6
|
+
import { Settings } from "../../types";
|
|
6
7
|
export declare const isSpanEnabled: (match: Filter | undefined, defaultMatch: TracesDefaultsSettings | undefined) => boolean | undefined;
|
|
7
8
|
export declare const isFilterMatch: (filter: Filter, filteringContext: FilteringContext, source: string) => boolean;
|
|
8
9
|
export declare const setTracerProvider: (tracerProvider?: TracerProvider, sampler?: ((defaultSampler: Sampler) => Sampler) | undefined, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
9
10
|
contextManager?: ContextManager;
|
|
10
|
-
}, filteringContextGetter?: () => FilteringContext, logger?: Logger,
|
|
11
|
+
}, filteringContextGetter?: () => FilteringContext, logger?: Logger, otelSettings?: Settings) => void;
|
|
11
12
|
export declare const saveDataInAttribute: (data: object, otelSpan: Span, maxDepth: number) => void;
|
|
12
13
|
export declare const replacePlaceHolders: (settings: any, context: any) => any;
|
|
13
14
|
export declare const isFunctionType: (variable: unknown) => boolean;
|