@interopio/otel 0.0.14 → 0.0.17
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 +13 -8
- package/dist/builder.js.map +1 -1
- package/dist/container.d.ts +2 -1
- package/dist/container.js +3 -6
- package/dist/container.js.map +1 -1
- package/dist/index.d.ts +4 -2
- package/dist/index.js +17 -3
- package/dist/index.js.map +1 -1
- package/dist/logger/log4jsWrapper.d.ts +7 -1
- package/dist/logger/log4jsWrapper.js +7 -1
- package/dist/logger/log4jsWrapper.js.map +1 -1
- package/dist/metrics/builder.js +6 -2
- package/dist/metrics/builder.js.map +1 -1
- package/dist/traces/builder.js +8 -7
- package/dist/traces/builder.js.map +1 -1
- package/dist/traces/ioInsightsSampler.js +4 -3
- package/dist/traces/ioInsightsSampler.js.map +1 -1
- package/dist/traces/manager.d.ts +3 -3
- package/dist/traces/manager.js +49 -31
- package/dist/traces/manager.js.map +1 -1
- package/dist/traces/nullTracesManager.d.ts +6 -1
- package/dist/traces/nullTracesManager.js +42 -29
- package/dist/traces/nullTracesManager.js.map +1 -1
- package/dist/traces/nullTracingState.d.ts +2 -4
- package/dist/traces/nullTracingState.js +12 -6
- package/dist/traces/nullTracingState.js.map +1 -1
- package/dist/traces/traces.d.ts +21 -0
- package/dist/traces/traces.js +65 -0
- package/dist/traces/traces.js.map +1 -0
- package/dist/traces/tracingState.d.ts +1 -0
- package/dist/traces/tracingState.js +5 -2
- package/dist/traces/tracingState.js.map +1 -1
- package/dist/traces/types.d.ts +49 -2
- package/dist/traces/types.js.map +1 -1
- package/dist/traces/utils/index.d.ts +8 -0
- package/dist/traces/utils/index.js +55 -11
- package/dist/traces/utils/index.js.map +1 -1
- package/dist/types.d.ts +41 -3
- package/package.json +1 -1
package/dist/builder.js
CHANGED
|
@@ -48,10 +48,10 @@ class Builder {
|
|
|
48
48
|
return this.metricsBuilder;
|
|
49
49
|
}
|
|
50
50
|
withTraces() {
|
|
51
|
-
var _a;
|
|
51
|
+
var _a, _b, _c, _d, _e, _f;
|
|
52
52
|
this.tracesBuilder = new builder_2.TracesManagerBuilder();
|
|
53
53
|
this.tracesBuilder.withLogger(this.logger);
|
|
54
|
-
this.tracesBuilder.withSettings((_a = this.settings) === null || _a === void 0 ? void 0 : _a.traces);
|
|
54
|
+
this.tracesBuilder.withSettings(Object.assign({ serviceId: (_a = this.settings) === null || _a === void 0 ? void 0 : _a.serviceId, serviceName: (_b = this.settings) === null || _b === void 0 ? void 0 : _b.serviceName, serviceVersion: (_c = this.settings) === null || _c === void 0 ? void 0 : _c.serviceVersion, platformVersion: (_d = this.settings) === null || _d === void 0 ? void 0 : _d.platformVersion, userId: (_e = this.settings) === null || _e === void 0 ? void 0 : _e.userId, enabled: false }, (_f = this.settings) === null || _f === void 0 ? void 0 : _f.traces));
|
|
55
55
|
return this.tracesBuilder;
|
|
56
56
|
}
|
|
57
57
|
build() {
|
|
@@ -60,12 +60,17 @@ class Builder {
|
|
|
60
60
|
return this.buildCore();
|
|
61
61
|
}
|
|
62
62
|
buildCore() {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
63
|
+
var _a;
|
|
64
|
+
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) === true) {
|
|
65
|
+
const metrics = (this.metricsBuilder || this.withMetrics()).build();
|
|
66
|
+
const traces = (this.tracesBuilder || this.withTraces()).build();
|
|
67
|
+
// not implemented yet
|
|
68
|
+
const logs = new nullManager_1.NullManager();
|
|
69
|
+
return new container_1.Container(Object.assign({ enabled: true }, this.settings), traces, metrics, logs);
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
return new container_1.Container(Object.assign({ enabled: false }, this.settings), new nullTracesManager_1.NullTracesManager(), new nullMetricsManager_1.NullMetricsManager(), new nullManager_1.NullManager());
|
|
73
|
+
}
|
|
69
74
|
}
|
|
70
75
|
}
|
|
71
76
|
exports.Builder = Builder;
|
package/dist/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":";;;AAAA,4CAA0C;AAC1C,+CAA0D;AAC1D,8CAAwD;AAIxD,wCAA2C;AAC3C,kDAAwD;AAExD,2CAAwC;AACxC,2EAAwE;AACxE,qDAAkD;AAElD,kEAA+D;AAE/D,MAAa,OAAO;IAMlB;;;;;;;QAOI;IACJ;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAU,EAAE,CAAC;IACjC,CAAC;IAED,mCAAmC;IAE5B,UAAU,CAAC,MAAc;;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,MAAM,CAAC;QAEpC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACrB,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,0CAAE,OAAO,EAAE,CAAC;YAC3C,UAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SACpC;aAAM;YACL,UAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,6BAA2B,CAAC,CAAC;SAC1D;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAA2B;QAC7C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0BAA0B;IAEnB,WAAW;;QAChB,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAqB,EAAE,CAAC;QAClD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,UAAU;;QACf,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAoB,EAAE,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/container.d.ts
CHANGED
|
@@ -3,11 +3,12 @@ import { MetricsManager } from "./metrics/types";
|
|
|
3
3
|
import { TracesManager } from "./traces/types";
|
|
4
4
|
import { Container as IContainer, Settings } from "./types";
|
|
5
5
|
export declare class Container implements IContainer {
|
|
6
|
+
private _settings;
|
|
6
7
|
traces: TracesManager;
|
|
7
8
|
metrics: MetricsManager;
|
|
8
9
|
logs: LogsManager;
|
|
9
10
|
started: boolean;
|
|
10
|
-
constructor(traces: TracesManager, metrics: MetricsManager, logs: LogsManager);
|
|
11
|
+
constructor(_settings: Settings, traces: TracesManager, metrics: MetricsManager, logs: LogsManager);
|
|
11
12
|
get settings(): Settings;
|
|
12
13
|
start(): Promise<void>;
|
|
13
14
|
stop(): Promise<void>;
|
package/dist/container.js
CHANGED
|
@@ -12,7 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.Container = void 0;
|
|
13
13
|
const container_1 = require("./validation/container");
|
|
14
14
|
class Container {
|
|
15
|
-
constructor(traces, metrics, logs) {
|
|
15
|
+
constructor(_settings, traces, metrics, logs) {
|
|
16
|
+
this._settings = _settings;
|
|
16
17
|
this.traces = traces;
|
|
17
18
|
this.metrics = metrics;
|
|
18
19
|
this.logs = logs;
|
|
@@ -21,11 +22,7 @@ class Container {
|
|
|
21
22
|
validator.validate(this);
|
|
22
23
|
}
|
|
23
24
|
get settings() {
|
|
24
|
-
return
|
|
25
|
-
metrics: this.metrics.settings,
|
|
26
|
-
traces: this.traces.settings,
|
|
27
|
-
logs: this.logs.settings
|
|
28
|
-
};
|
|
25
|
+
return this._settings;
|
|
29
26
|
}
|
|
30
27
|
start() {
|
|
31
28
|
return __awaiter(this, void 0, void 0, function* () {
|
package/dist/container.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,sDAA4D;AAE5D,MAAa,SAAS;IAGlB,
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":";;;;;;;;;;;;AAIA,sDAA4D;AAE5D,MAAa,SAAS;IAGlB,YACY,SAAmB,EACpB,MAAqB,EACrB,OAAuB,EACvB,IAAiB;QAHhB,cAAS,GAAT,SAAS,CAAU;QACpB,WAAM,GAAN,MAAM,CAAe;QACrB,YAAO,GAAP,OAAO,CAAgB;QACvB,SAAI,GAAJ,IAAI,CAAa;QANrB,YAAO,GAAY,KAAK,CAAC;QAQ5B,MAAM,SAAS,GAAG,IAAI,8BAAkB,EAAE,CAAC;QAC3C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEY,KAAK;;YACd,gEAAgE;YAChE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAChG,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAEvF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;YAEhE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,CAAC;KAAA;IAEY,IAAI;;YACb,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACtF,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACnF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAE7E,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;YAEhE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACzB,CAAC;KAAA;CACJ;AArCD,8BAqCC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export { MetricsMeterProvider, MetricsMeterSettings } from "./metrics/meter/type
|
|
|
9
9
|
export { MetricSettings, MetricType, Metric } from "./metrics/metrics/base/types";
|
|
10
10
|
export { MetricsDependencyBuilder } from "./metrics/dependencies/builder";
|
|
11
11
|
export * from "./metrics/dependencies/types";
|
|
12
|
-
export { TracesManager, TracesSettings, SamplingSettings, TracesDefaultsSettings } from "./traces/types";
|
|
13
|
-
|
|
12
|
+
export { PropagationInfo, PropagationInfoCarrier, TracesManager, TracesSettings, SamplingSettings, TracesDefaultsSettings, TracingState, WithSpanCallback, } from "./traces/types";
|
|
13
|
+
import Traces, { withSpan } from "./traces/traces";
|
|
14
|
+
export { Traces, withSpan };
|
|
14
15
|
export { LogsManager, LogsSettings } from "./logs/types";
|
|
16
|
+
export declare const OTEL_PI_KEY = "__interopIOTracePropagationInfo";
|
package/dist/index.js
CHANGED
|
@@ -10,11 +10,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
o[k2] = m[k];
|
|
12
12
|
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
13
18
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
19
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
20
|
};
|
|
21
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
22
|
+
if (mod && mod.__esModule) return mod;
|
|
23
|
+
var result = {};
|
|
24
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
25
|
+
__setModuleDefault(result, mod);
|
|
26
|
+
return result;
|
|
27
|
+
};
|
|
16
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
29
|
+
exports.OTEL_PI_KEY = exports.withSpan = exports.Traces = exports.MetricsDependencyBuilder = exports.Log4jsWrapper = exports.ioInsightsSampler = exports.Builder = void 0;
|
|
18
30
|
var builder_1 = require("./builder");
|
|
19
31
|
Object.defineProperty(exports, "Builder", { enumerable: true, get: function () { return builder_1.Builder; } });
|
|
20
32
|
var ioInsightsSampler_1 = require("./traces/ioInsightsSampler");
|
|
@@ -24,6 +36,8 @@ Object.defineProperty(exports, "Log4jsWrapper", { enumerable: true, get: functio
|
|
|
24
36
|
var builder_2 = require("./metrics/dependencies/builder");
|
|
25
37
|
Object.defineProperty(exports, "MetricsDependencyBuilder", { enumerable: true, get: function () { return builder_2.MetricsDependencyBuilder; } });
|
|
26
38
|
__exportStar(require("./metrics/dependencies/types"), exports);
|
|
27
|
-
|
|
28
|
-
|
|
39
|
+
const traces_1 = __importStar(require("./traces/traces"));
|
|
40
|
+
exports.Traces = traces_1.default;
|
|
41
|
+
Object.defineProperty(exports, "withSpan", { enumerable: true, get: function () { return traces_1.withSpan; } });
|
|
42
|
+
exports.OTEL_PI_KEY = "__interopIOTracePropagationInfo";
|
|
29
43
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,gEAA+D;AAAtD,sHAAA,iBAAiB,OAAA;AAC1B,wDAAuD;AAA9C,8GAAA,aAAa,OAAA;AAUtB,0DAA0E;AAAjE,mHAAA,wBAAwB,OAAA;AACjC,+DAA6C;AAa7C,0DAAmD;AAC1C,iBADF,gBAAM,CACE;AAAE,yFADA,iBAAQ,OACA;AAIZ,QAAA,WAAW,GAAG,iCAAiC,CAAC"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import * as log4js from "log4js";
|
|
2
2
|
import { Logger, LoggerLogLevel } from "./types";
|
|
3
|
+
type logLevel = "error" | "warn" | "info" | "debug" | "trace";
|
|
4
|
+
type moreLogLevels = "off" | "trace" | "debug" | "info" | "warn" | "error";
|
|
5
|
+
type log4jsSubset = Pick<log4js.Logger, logLevel> & (Pick<log4js.Logger, "level"> | {
|
|
6
|
+
publishLevel: () => moreLogLevels | undefined;
|
|
7
|
+
});
|
|
3
8
|
export declare class Log4jsWrapper implements Logger {
|
|
4
9
|
private logger;
|
|
5
|
-
constructor(logger:
|
|
10
|
+
constructor(logger: log4jsSubset);
|
|
6
11
|
get level(): LoggerLogLevel;
|
|
7
12
|
error(message: string, ...args: unknown[]): void;
|
|
8
13
|
warn(message: string, ...args: unknown[]): void;
|
|
@@ -11,3 +16,4 @@ export declare class Log4jsWrapper implements Logger {
|
|
|
11
16
|
verbose(message: string, ...args: unknown[]): void;
|
|
12
17
|
private convert;
|
|
13
18
|
}
|
|
19
|
+
export {};
|
|
@@ -7,7 +7,7 @@ class Log4jsWrapper {
|
|
|
7
7
|
this.logger = logger;
|
|
8
8
|
}
|
|
9
9
|
get level() {
|
|
10
|
-
return this.convert(this.logger.level);
|
|
10
|
+
return this.convert("level" in this.logger ? this.logger.level : this.logger.publishLevel());
|
|
11
11
|
}
|
|
12
12
|
error(message, ...args) {
|
|
13
13
|
// we log errors as warn because some of our clients stopped the platform if an log error is observed (they consider it as broken state)
|
|
@@ -27,8 +27,14 @@ class Log4jsWrapper {
|
|
|
27
27
|
this.logger.trace(message, ...args);
|
|
28
28
|
}
|
|
29
29
|
convert(level) {
|
|
30
|
+
if (level === undefined) {
|
|
31
|
+
return 60 /* LoggerLogLevel.INFO */;
|
|
32
|
+
}
|
|
30
33
|
const currentLevel = typeof level !== "string" ? level.levelStr.toLowerCase() : level.toLowerCase();
|
|
31
34
|
switch (currentLevel) {
|
|
35
|
+
case "off": {
|
|
36
|
+
return 0 /* LoggerLogLevel.NONE */;
|
|
37
|
+
}
|
|
32
38
|
case "error": {
|
|
33
39
|
return 30 /* LoggerLogLevel.ERROR */;
|
|
34
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log4jsWrapper.js","sourceRoot":"","sources":["../../src/logger/log4jsWrapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"log4jsWrapper.js","sourceRoot":"","sources":["../../src/logger/log4jsWrapper.ts"],"names":[],"mappings":";;;AAOA,qDAAqD;AACrD,MAAa,aAAa;IAGtB,YAAY,MAAoB;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,IAAe;QAC5C,wIAAwI;QACxI,4DAA4D;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,IAAe;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,GAAG,IAAe;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,GAAG,IAAe;QAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,OAAO,CAAC,OAAe,EAAE,GAAG,IAAe;QAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,CAAC;IAEO,OAAO,CAAC,KAAwC;QACpD,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,oCAA2B;SAC9B;QACD,MAAM,YAAY,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAEpG,QAAQ,YAAY,EAAE;YAClB,KAAK,KAAK,CAAC,CAAC;gBACR,mCAA2B;aAC9B;YACD,KAAK,OAAO,CAAC,CAAC;gBACV,qCAA4B;aAC/B;YACD,KAAK,MAAM,CAAC,CAAC;gBACT,oCAA2B;aAC9B;YACD,KAAK,MAAM,CAAC,CAAC;gBACT,oCAA2B;aAC9B;YACD,KAAK,OAAO,CAAC,CAAC;gBACV,qCAA4B;aAC/B;YACD,KAAK,OAAO,CAAC,CAAC;gBACV,uCAA8B;aACjC;YACD,OAAO,CAAC,CAAC;gBACL,oCAA2B;aAC9B;SACJ;IACL,CAAC;CACJ;AA/DD,sCA+DC"}
|
package/dist/metrics/builder.js
CHANGED
|
@@ -7,6 +7,7 @@ const builder_2 = require("./settings/builder");
|
|
|
7
7
|
const builder_3 = require("../validation/metrics/builder");
|
|
8
8
|
const providerFactory_1 = require("./meter/providerFactory");
|
|
9
9
|
const lazyProvider_1 = require("./meter/lazyProvider");
|
|
10
|
+
const nullMetricsManager_1 = require("./utils/nullMetricsManager");
|
|
10
11
|
class MetricsManagerBuilder {
|
|
11
12
|
withLogger(logger) {
|
|
12
13
|
this.logger = logger;
|
|
@@ -30,9 +31,12 @@ class MetricsManagerBuilder {
|
|
|
30
31
|
return this.buildCore();
|
|
31
32
|
}
|
|
32
33
|
buildCore() {
|
|
33
|
-
var _a;
|
|
34
|
+
var _a, _b;
|
|
35
|
+
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
|
|
36
|
+
return new nullMetricsManager_1.NullMetricsManager();
|
|
37
|
+
}
|
|
34
38
|
const metricsSettings = this.createMetricsSettings();
|
|
35
|
-
const meterProviderCreateFunc = (
|
|
39
|
+
const meterProviderCreateFunc = (_b = this.meterProviderCreateFunc) !== null && _b !== void 0 ? _b : this.createMeterProviderCreateFunc(metricsSettings.meter);
|
|
36
40
|
const lazyMeterProvider = new lazyProvider_1.LazyMetricsMeterProvider(meterProviderCreateFunc, metricsSettings.meter.serviceName);
|
|
37
41
|
const metricsFactory = this.createMetricsFactory(lazyMeterProvider, this.dependencyContainer, this.logger);
|
|
38
42
|
const manager = new manager_1.MetricsManager(metricsSettings, metricsFactory, lazyMeterProvider, this.logger);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/metrics/builder.ts"],"names":[],"mappings":";;;AAAA,+CAA0D;AAC1D,uCAA2C;AAC3C,gDAA4D;AAC5D,2DAAwE;AACxE,6DAAsE;AAOtE,uDAAgE;AAEhE,MAAa,qBAAqB;IAMvB,UAAU,CAAC,MAAc;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,QAA0B;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,uBAAuD;QAC5E,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,uBAAuB,CAAC,SAAqC;QAChE,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,KAAK;QACR,MAAM,SAAS,GAAG,IAAI,iCAAuB,EAAE,CAAC;QAChD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAEO,SAAS;;QACb,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,MAAM,uBAAuB,GAAG,MAAA,IAAI,CAAC,uBAAuB,mCAAI,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1H,MAAM,iBAAiB,GAAG,IAAI,uCAAwB,CAAC,uBAAuB,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnH,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpG,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,qBAAqB;QACzB,MAAM,QAAQ,GAAG,IAAI,gCAAsB,EAAE;aACxC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC3B,KAAK,EAAE,CAAC;QAEb,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,oBAAoB,CACxB,iBAA2C,EAC3C,mBAA+C,EAC/C,MAAc;QAGd,MAAM,OAAO,GAAG,IAAI,+BAAqB,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,CAAC;aACpF,YAAY,EAAE;aACd,KAAK,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,6BAA6B,CAAC,QAAsC;QACxE,MAAM,IAAI,qBAAQ,QAAQ,CAAE,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,MAAM,OAAO,GAAG,IAAI,6CAA2B,EAAE,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC;IACN,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/metrics/builder.ts"],"names":[],"mappings":";;;AAAA,+CAA0D;AAC1D,uCAA2C;AAC3C,gDAA4D;AAC5D,2DAAwE;AACxE,6DAAsE;AAOtE,uDAAgE;AAChE,mEAAgE;AAEhE,MAAa,qBAAqB;IAMvB,UAAU,CAAC,MAAc;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,QAA0B;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,uBAAuD;QAC5E,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,uBAAuB,CAAC,SAAqC;QAChE,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,KAAK;QACR,MAAM,SAAS,GAAG,IAAI,iCAAuB,EAAE,CAAC;QAChD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAEO,SAAS;;QACb,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,MAAK,IAAI,EAAE;YACjC,OAAO,IAAI,uCAAkB,EAAE,CAAC;SACnC;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,MAAM,uBAAuB,GAAG,MAAA,IAAI,CAAC,uBAAuB,mCAAI,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1H,MAAM,iBAAiB,GAAG,IAAI,uCAAwB,CAAC,uBAAuB,EAAE,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnH,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpG,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,qBAAqB;QACzB,MAAM,QAAQ,GAAG,IAAI,gCAAsB,EAAE;aACxC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;aAC3B,KAAK,EAAE,CAAC;QAEb,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,oBAAoB,CACxB,iBAA2C,EAC3C,mBAA+C,EAC/C,MAAc;QAGd,MAAM,OAAO,GAAG,IAAI,+BAAqB,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,CAAC;aACpF,YAAY,EAAE;aACd,KAAK,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC;IACnB,CAAC;IAEO,6BAA6B,CAAC,QAAsC;QACxE,MAAM,IAAI,qBAAQ,QAAQ,CAAE,CAAC;QAC7B,OAAO,GAAG,EAAE;YACR,MAAM,OAAO,GAAG,IAAI,6CAA2B,EAAE,CAAC;YAClD,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC;IACN,CAAC;CACJ;AA1ED,sDA0EC"}
|
package/dist/traces/builder.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TracesManagerBuilder = void 0;
|
|
4
4
|
const manager_1 = require("./manager");
|
|
5
|
+
const nullTracesManager_1 = require("./nullTracesManager");
|
|
5
6
|
class TracesManagerBuilder {
|
|
6
7
|
withLogger(logger) {
|
|
7
8
|
this.logger = logger;
|
|
@@ -32,7 +33,8 @@ class TracesManagerBuilder {
|
|
|
32
33
|
return this;
|
|
33
34
|
}
|
|
34
35
|
withProviderRegistrationSettings(providerRegistrationSettings) {
|
|
35
|
-
|
|
36
|
+
var _a;
|
|
37
|
+
this.providerRegistrationSettings = Object.assign({ contextManager: (_a = this.providerRegistrationSettings) === null || _a === void 0 ? void 0 : _a.contextManager }, providerRegistrationSettings);
|
|
36
38
|
return this;
|
|
37
39
|
}
|
|
38
40
|
withContextManager(contextManager) {
|
|
@@ -46,12 +48,11 @@ class TracesManagerBuilder {
|
|
|
46
48
|
return this.buildCore();
|
|
47
49
|
}
|
|
48
50
|
buildCore() {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}, this.logger, this.tracingContextGetter, this.tracerProvider, this.samplerGetter, this.spanProcessors, this.spanExporters, this.providerRegistrationSettings);
|
|
51
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
52
|
+
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
|
|
53
|
+
return new nullTracesManager_1.NullTracesManager();
|
|
54
|
+
}
|
|
55
|
+
const manager = new manager_1.TracesManager(this.settings, this.logger, this.tracingContextGetter || ((_b = this.settings) === null || _b === void 0 ? void 0 : _b.tracingContextGetter), this.tracerProvider || ((_c = this.settings) === null || _c === void 0 ? void 0 : _c.tracerProvider), this.samplerGetter || ((_d = this.settings) === null || _d === void 0 ? void 0 : _d.samplerGetter), this.spanProcessors || ((_e = this.settings) === null || _e === void 0 ? void 0 : _e.spanProcessors), this.spanExporters || ((_f = this.settings) === null || _f === void 0 ? void 0 : _f.spanExporters), this.providerRegistrationSettings || ((_g = this.settings) === null || _g === void 0 ? void 0 : _g.providerRegistrationSettings));
|
|
55
56
|
return manager;
|
|
56
57
|
}
|
|
57
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/traces/builder.ts"],"names":[],"mappings":";;;AACA,uCAA0C;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/traces/builder.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAI1C,2DAAwD;AAExD,MAAa,oBAAoB;IAUxB,UAAU,CAAC,MAAc;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAyB;QAC3C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,wBAAwB,CAAC,oBAA2C;QACzE,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,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,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,oBAAoB,KAAK,MAAA,IAAI,CAAC,QAAQ,0CAAE,oBAAoB,CAAA,EACjE,IAAI,CAAC,cAAc,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,CAAA,EACpD,IAAI,CAAC,aAAa,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,aAAa,CAAA,EAClD,IAAI,CAAC,cAAc,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,CAAA,EACpD,IAAI,CAAC,aAAa,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,aAAa,CAAA,EAClD,IAAI,CAAC,4BAA4B,KAAI,MAAA,IAAI,CAAC,QAAQ,0CAAE,4BAA4B,CAAA,CAAC,CAAC;QACpF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA9ED,oDA8EC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ioInsightsSampler = void 0;
|
|
4
4
|
const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
|
|
5
|
+
const utils_1 = require("./utils");
|
|
5
6
|
// https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
|
|
6
7
|
// doesn't work on IE 11
|
|
7
8
|
const cyrb53 = (str, seed = 0) => {
|
|
@@ -40,7 +41,7 @@ class ioInsightsSampler {
|
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
if (matched && setting.context) {
|
|
43
|
-
if (!this.matchObjects("context", setting.context, currentContext)) {
|
|
44
|
+
if (!this.matchObjects("context", setting.context, currentContext, true)) {
|
|
44
45
|
matched = false;
|
|
45
46
|
}
|
|
46
47
|
}
|
|
@@ -78,10 +79,10 @@ class ioInsightsSampler {
|
|
|
78
79
|
return "ioInsightsSampler: (error) " + err.message;
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
|
-
matchObjects(description, required, provided) {
|
|
82
|
+
matchObjects(description, required, provided, deepValue) {
|
|
82
83
|
var _a, _b, _c, _d, _e, _f;
|
|
83
84
|
for (const [key, requiredValue] of Object.entries(required)) {
|
|
84
|
-
const providedValue = provided[key];
|
|
85
|
+
const providedValue = deepValue ? (0, utils_1.deep_value)(provided, key) : provided[key];
|
|
85
86
|
if (typeof requiredValue === "string" && requiredValue[0] === "#") {
|
|
86
87
|
if (providedValue === null ||
|
|
87
88
|
providedValue === undefined ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ioInsightsSampler.js","sourceRoot":"","sources":["../../src/traces/ioInsightsSampler.ts"],"names":[],"mappings":";;;AAGA,kEAA0F;
|
|
1
|
+
{"version":3,"file":"ioInsightsSampler.js","sourceRoot":"","sources":["../../src/traces/ioInsightsSampler.ts"],"names":[],"mappings":"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"}
|
package/dist/traces/manager.d.ts
CHANGED
|
@@ -4,17 +4,17 @@ import { TracerProvider, ContextManager } from "@opentelemetry/api";
|
|
|
4
4
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
5
5
|
export declare class TracesManager implements ITracesManager {
|
|
6
6
|
settings: TracesSettings;
|
|
7
|
-
logger
|
|
8
|
-
tracingContextGetter
|
|
7
|
+
private logger;
|
|
8
|
+
private tracingContextGetter;
|
|
9
9
|
started: boolean;
|
|
10
10
|
private VERSION;
|
|
11
11
|
private DEFAULT_URL;
|
|
12
12
|
private DEFAULT_USER;
|
|
13
13
|
private DEFAULT_SERVICE_NAME;
|
|
14
|
+
private filters;
|
|
14
15
|
constructor(settings: TracesSettings, logger: Logger, tracingContextGetter: (() => TracingContext) | undefined, tracerProvider?: TracerProvider, sampler?: (defaultSampler: Sampler) => Sampler, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
15
16
|
contextManager?: ContextManager;
|
|
16
17
|
});
|
|
17
|
-
extractTracingPropagationInfo(propagationInfo: PropagationInfo | PropagationInfoCarrier, deleteProperty?: boolean): PropagationInfo | null;
|
|
18
18
|
withSpan<T>(source: string, tracingContextOrCallback: TracingContext | WithSpanCallback<T>, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T>, callback?: WithSpanCallback<T>): Promise<T>;
|
|
19
19
|
start(): Promise<void>;
|
|
20
20
|
stop(): Promise<void>;
|
package/dist/traces/manager.js
CHANGED
|
@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.TracesManager = void 0;
|
|
13
16
|
const api_1 = require("@opentelemetry/api");
|
|
@@ -16,6 +19,7 @@ const manager_1 = require("../validation/traces/manager");
|
|
|
16
19
|
const tracingState_1 = require("./tracingState");
|
|
17
20
|
const withSpan_1 = require("../validation/traces/withSpan");
|
|
18
21
|
const nullTracingState_1 = require("./nullTracingState");
|
|
22
|
+
const traces_1 = __importDefault(require("./traces"));
|
|
19
23
|
class TracesManager {
|
|
20
24
|
constructor(settings, logger, tracingContextGetter, tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings) {
|
|
21
25
|
this.settings = settings;
|
|
@@ -30,28 +34,22 @@ class TracesManager {
|
|
|
30
34
|
const defaultTracingEnv = tracingContextGetter === null || tracingContextGetter === void 0 ? void 0 : tracingContextGetter.call(this);
|
|
31
35
|
const replacedSettings = (0, utils_1.replacePlaceHolders)(settings, defaultTracingEnv);
|
|
32
36
|
this.settings = replacedSettings;
|
|
33
|
-
|
|
37
|
+
this.filters = this.settings.filters || [];
|
|
38
|
+
if (this.settings.useDefaultFilters) {
|
|
39
|
+
this.filters = [
|
|
40
|
+
{
|
|
41
|
+
source: "interopio.desktop.workspaces.logMessage",
|
|
42
|
+
level: "DIAGNOSTIC",
|
|
43
|
+
},
|
|
44
|
+
].concat(this.filters);
|
|
45
|
+
}
|
|
34
46
|
const validator = new manager_1.TracesManagerValidator();
|
|
35
47
|
validator.validate(this);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (propagationInfo.traceparent) {
|
|
39
|
-
return propagationInfo;
|
|
40
|
-
}
|
|
41
|
-
const nestedPropagationInfo = propagationInfo
|
|
42
|
-
.__interopIOTracePropagationInfo;
|
|
43
|
-
if (nestedPropagationInfo) {
|
|
44
|
-
if (deleteProperty === false) {
|
|
45
|
-
delete propagationInfo.__interopIOTracePropagationInfo;
|
|
46
|
-
}
|
|
47
|
-
return nestedPropagationInfo;
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
return null;
|
|
51
|
-
}
|
|
48
|
+
(0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.tracingContextGetter, this.logger, Object.assign(Object.assign({}, this.settings), { serviceName: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.serviceName) || this.settings.serviceName || this.DEFAULT_SERVICE_NAME, userId: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.user) || this.settings.userId, url: this.settings.url || this.DEFAULT_URL }));
|
|
49
|
+
traces_1.default.instance = this;
|
|
52
50
|
}
|
|
53
51
|
withSpan(source, tracingContextOrCallback, propagationInfoOrCallback, callback) {
|
|
54
|
-
var _a, _b, _c, _d;
|
|
52
|
+
var _a, _b, _c, _d, _e, _f;
|
|
55
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
54
|
const validator = new withSpan_1.TracesWithSpanValidator();
|
|
57
55
|
validator.validate(source, tracingContextOrCallback, propagationInfoOrCallback, callback);
|
|
@@ -85,20 +83,27 @@ class TracesManager {
|
|
|
85
83
|
}
|
|
86
84
|
}
|
|
87
85
|
}
|
|
88
|
-
const match =
|
|
89
|
-
(
|
|
86
|
+
const match = this.filters.find((filter) => (0, utils_1.isFilterMatch)(filter, fullTracingContext, source));
|
|
87
|
+
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`beginSpan() source:${source} context:${fullTracingContext} ` +
|
|
90
88
|
(match
|
|
91
89
|
? "match: " + JSON.stringify(match)
|
|
92
90
|
: "default: " + JSON.stringify(this.settings.default)));
|
|
93
91
|
const enabled = this.started && (0, utils_1.isSpanEnabled)(match, this.settings.default);
|
|
94
|
-
const level = (match === null || match === void 0 ? void 0 : match.level) || ((
|
|
92
|
+
const level = (match === null || match === void 0 ? void 0 : match.level) || ((_c = this.settings.default) === null || _c === void 0 ? void 0 : _c.level) || "INFO";
|
|
93
|
+
(_d = this.logger) === null || _d === void 0 ? void 0 : _d.debug(JSON.stringify({ started: this.started, enabled, level }));
|
|
95
94
|
let activeContext = api_1.context.active();
|
|
96
95
|
if (propagationInfoOrCallback) {
|
|
97
96
|
let propagationInfoCarrier = {};
|
|
98
97
|
if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
|
|
99
98
|
propagationInfoCarrier = Object.assign({}, propagationInfoOrCallback);
|
|
100
99
|
}
|
|
101
|
-
const propagationInfo =
|
|
100
|
+
const propagationInfo = traces_1.default.extractTracingPropagationInfo(propagationInfoCarrier);
|
|
101
|
+
if (propagationInfo) {
|
|
102
|
+
activeContext = api_1.propagation.extract(api_1.context.active(), propagationInfo);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
else if (traces_1.default.currentTracingState) {
|
|
106
|
+
const propagationInfo = traces_1.default.currentTracingState.getPropagationInfo();
|
|
102
107
|
if (propagationInfo) {
|
|
103
108
|
activeContext = api_1.propagation.extract(api_1.context.active(), propagationInfo);
|
|
104
109
|
}
|
|
@@ -121,20 +126,22 @@ class TracesManager {
|
|
|
121
126
|
// todo: replace this dummy options
|
|
122
127
|
const options = {};
|
|
123
128
|
return tracer.startActiveSpan(source, options, activeContext, (otelSpan) => __awaiter(this, void 0, void 0, function* () {
|
|
124
|
-
var
|
|
129
|
+
var _g, _h, _j;
|
|
125
130
|
const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION);
|
|
131
|
+
traces_1.default.currentTracingState = tracingState;
|
|
126
132
|
if (this.settings.platformVersion) {
|
|
127
133
|
(0, utils_1.saveDataInAttribute)({ platformVersion: this.settings.platformVersion }, otelSpan);
|
|
128
134
|
}
|
|
129
135
|
if ((match && match.addContextToTrace !== false) ||
|
|
130
|
-
(!match && ((
|
|
136
|
+
(!match && ((_g = this.settings.default) === null || _g === void 0 ? void 0 : _g.addContextToTrace) !== false)) {
|
|
131
137
|
(0, utils_1.saveDataInAttribute)(fullTracingContext, otelSpan);
|
|
132
138
|
}
|
|
133
139
|
try {
|
|
140
|
+
traces_1.default.currentTracingState = tracingState;
|
|
134
141
|
const result = yield actualCallback(tracingState);
|
|
135
142
|
if (tracingState.currentSpanStatus.code === api_1.SpanStatusCode.UNSET) {
|
|
136
143
|
if ((match && match.autoSetSuccessStatus) ||
|
|
137
|
-
(!match && ((
|
|
144
|
+
(!match && ((_j = (_h = this.settings) === null || _h === void 0 ? void 0 : _h.default) === null || _j === void 0 ? void 0 : _j.autoSetSuccessStatus))) {
|
|
138
145
|
otelSpan.setStatus({ code: api_1.SpanStatusCode.OK });
|
|
139
146
|
}
|
|
140
147
|
}
|
|
@@ -152,19 +159,30 @@ class TracesManager {
|
|
|
152
159
|
finally {
|
|
153
160
|
// we implicitly call otelSpan.end()
|
|
154
161
|
otelSpan.end();
|
|
162
|
+
traces_1.default.currentTracingState = null;
|
|
155
163
|
}
|
|
156
164
|
}));
|
|
157
165
|
}
|
|
158
166
|
else {
|
|
159
167
|
let extractedPI = null;
|
|
160
|
-
if (
|
|
161
|
-
|
|
162
|
-
if (
|
|
163
|
-
propagationInfoCarrier =
|
|
168
|
+
if (((match === null || match === void 0 ? void 0 : match.stopPropagation) === true) ||
|
|
169
|
+
((match === null || match === void 0 ? void 0 : match.stopPropagation) !== false && ((_f = (_e = this.settings) === null || _e === void 0 ? void 0 : _e.default) === null || _f === void 0 ? void 0 : _f.stopPropagation))) {
|
|
170
|
+
if (propagationInfoOrCallback) {
|
|
171
|
+
let propagationInfoCarrier = {};
|
|
172
|
+
if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
|
|
173
|
+
propagationInfoCarrier = Object.assign({}, propagationInfoOrCallback);
|
|
174
|
+
}
|
|
175
|
+
extractedPI = traces_1.default.extractTracingPropagationInfo(propagationInfoCarrier);
|
|
164
176
|
}
|
|
165
|
-
extractedPI = this.extractTracingPropagationInfo(propagationInfoCarrier);
|
|
166
177
|
}
|
|
167
|
-
|
|
178
|
+
const nts = new nullTracingState_1.NullTracingState(source, extractedPI);
|
|
179
|
+
traces_1.default.currentTracingState = nts;
|
|
180
|
+
try {
|
|
181
|
+
return actualCallback(nts);
|
|
182
|
+
}
|
|
183
|
+
finally {
|
|
184
|
+
traces_1.default.currentTracingState = null;
|
|
185
|
+
}
|
|
168
186
|
}
|
|
169
187
|
});
|
|
170
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
+
import { Logger } from "../logger/types";
|
|
1
2
|
import { NullManager } from "../utils/nullManager";
|
|
2
3
|
import { PropagationInfo, PropagationInfoCarrier, TracesManager, TracesSettings, TracingContext, WithSpanCallback } from "./types";
|
|
3
4
|
export declare class NullTracesManager extends NullManager<TracesSettings> implements TracesManager {
|
|
5
|
+
private _settings?;
|
|
6
|
+
private logger?;
|
|
7
|
+
get settings(): TracesSettings;
|
|
8
|
+
set settings(value: TracesSettings);
|
|
9
|
+
constructor(_settings?: TracesSettings | undefined, logger?: Logger | undefined);
|
|
4
10
|
withSpan<T>(source: string, tracingContextOrCallback: TracingContext | WithSpanCallback<T>, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T>, callback?: WithSpanCallback<T>): Promise<T>;
|
|
5
|
-
extractTracingPropagationInfo(propagationInfo: PropagationInfo | PropagationInfoCarrier, deleteProperty?: boolean): PropagationInfo | null;
|
|
6
11
|
}
|