@interopio/otel 0.0.20 → 0.0.22
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 +7 -3
- package/dist/builder.js.map +1 -1
- package/dist/metrics/builder.js +1 -1
- package/dist/metrics/builder.js.map +1 -1
- package/dist/metrics/meter/types.d.ts +17 -4
- package/dist/metrics/metrics/base/base.js +3 -2
- package/dist/metrics/metrics/base/base.js.map +1 -1
- package/dist/metrics/metrics/base/types.d.ts +2 -2
- package/dist/metrics/settings/builder.d.ts +2 -1
- package/dist/metrics/settings/builder.js +12 -32
- package/dist/metrics/settings/builder.js.map +1 -1
- package/dist/metrics/settings/types.d.ts +16 -3
- package/dist/traces/manager.js +2 -1
- package/dist/traces/manager.js.map +1 -1
- package/dist/traces/nullTracingState.d.ts +2 -2
- package/dist/traces/nullTracingState.js.map +1 -1
- package/dist/traces/traces.d.ts +2 -2
- package/dist/traces/traces.js +1 -1
- package/dist/traces/traces.js.map +1 -1
- package/dist/traces/tracingState.d.ts +2 -2
- package/dist/traces/tracingState.js.map +1 -1
- package/dist/traces/types.d.ts +15 -1
- package/dist/traces/utils/index.d.ts +2 -2
- package/dist/traces/utils/index.js +6 -2
- package/dist/traces/utils/index.js.map +1 -1
- package/dist/types.d.ts +9 -12
- package/dist/validation/metrics/base/base.js +1 -1
- package/dist/validation/metrics/base/base.js.map +1 -1
- package/dist/validation/metrics/builder.js +1 -1
- package/dist/validation/metrics/builder.js.map +1 -1
- package/dist/validation/metrics/settingsBuilder.js +6 -5
- package/dist/validation/metrics/settingsBuilder.js.map +1 -1
- package/dist/validation/traces/attributeData.js +8 -4
- package/dist/validation/traces/attributeData.js.map +1 -1
- package/dist/validation/validator.d.ts +1 -1
- package/dist/validation/validator.js +2 -2
- package/dist/validation/validator.js.map +1 -1
- package/package.json +1 -1
package/dist/builder.js
CHANGED
|
@@ -41,10 +41,10 @@ class Builder {
|
|
|
41
41
|
}
|
|
42
42
|
// ...before these methods
|
|
43
43
|
withMetrics() {
|
|
44
|
-
var _a;
|
|
44
|
+
var _a, _b, _c, _d, _e, _f;
|
|
45
45
|
this.metricsBuilder = new builder_1.MetricsManagerBuilder();
|
|
46
46
|
this.metricsBuilder.withLogger(this.logger);
|
|
47
|
-
this.metricsBuilder.withSettings((_a = this.settings) === null || _a === void 0 ? void 0 : _a.metrics);
|
|
47
|
+
this.metricsBuilder.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 }, (_f = this.settings) === null || _f === void 0 ? void 0 : _f.metrics));
|
|
48
48
|
return this.metricsBuilder;
|
|
49
49
|
}
|
|
50
50
|
withTraces() {
|
|
@@ -60,8 +60,12 @@ class Builder {
|
|
|
60
60
|
return this.buildCore();
|
|
61
61
|
}
|
|
62
62
|
buildCore() {
|
|
63
|
-
var _a;
|
|
63
|
+
var _a, _b, _c;
|
|
64
64
|
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) === true) {
|
|
65
|
+
if (((_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.metrics) === null || _c === void 0 ? void 0 : _c.enabled) &&
|
|
66
|
+
!this.metricsBuilder) {
|
|
67
|
+
throw new Error("metrics.enabled is true, but .withMetrics() method not called, metrics will be disabled.");
|
|
68
|
+
}
|
|
65
69
|
const metrics = this.metricsBuilder ? this.metricsBuilder.build() : new nullMetricsManager_1.NullMetricsManager();
|
|
66
70
|
const traces = (this.tracesBuilder || this.withTraces()).build();
|
|
67
71
|
// not implemented yet
|
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,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/metrics/builder.js
CHANGED
|
@@ -37,7 +37,7 @@ class MetricsManagerBuilder {
|
|
|
37
37
|
}
|
|
38
38
|
const metricsSettings = this.createMetricsSettings();
|
|
39
39
|
const meterProviderCreateFunc = (_b = this.meterProviderCreateFunc) !== null && _b !== void 0 ? _b : this.createMeterProviderCreateFunc(metricsSettings.meter);
|
|
40
|
-
const lazyMeterProvider = new lazyProvider_1.LazyMetricsMeterProvider(meterProviderCreateFunc, metricsSettings.meter.serviceName);
|
|
40
|
+
const lazyMeterProvider = new lazyProvider_1.LazyMetricsMeterProvider(meterProviderCreateFunc, metricsSettings.meter.serviceName || "io.Insights");
|
|
41
41
|
const metricsFactory = this.createMetricsFactory(lazyMeterProvider, this.dependencyContainer, this.logger);
|
|
42
42
|
const manager = new manager_1.MetricsManager(metricsSettings, metricsFactory, lazyMeterProvider, this.logger);
|
|
43
43
|
return manager;
|
|
@@ -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;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;
|
|
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,IAAI,aAAa,CAAC,CAAC;QACpI,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"}
|
|
@@ -4,11 +4,24 @@ export interface MetricsMeterProvider extends MeterProvider {
|
|
|
4
4
|
}
|
|
5
5
|
export interface InternalMetricsMeterSettings {
|
|
6
6
|
url: string;
|
|
7
|
-
publishInterval
|
|
8
|
-
serviceName
|
|
9
|
-
serviceId
|
|
10
|
-
serviceVersion
|
|
7
|
+
publishInterval?: number;
|
|
8
|
+
serviceName?: string;
|
|
9
|
+
serviceId?: string;
|
|
10
|
+
serviceVersion?: string;
|
|
11
|
+
userId?: string;
|
|
12
|
+
compression?: CompressionAlgorithm;
|
|
13
|
+
headers?: Partial<Record<string, unknown>>;
|
|
14
|
+
hostname?: string;
|
|
15
|
+
keepAlive?: boolean;
|
|
16
|
+
concurrencyLimit?: number;
|
|
17
|
+
/** Maximum time the OTLP exporter will wait for each batch export.
|
|
18
|
+
* The default value is 10000ms. */
|
|
19
|
+
timeoutMillis?: number;
|
|
11
20
|
[key: string]: unknown;
|
|
12
21
|
}
|
|
22
|
+
export declare enum CompressionAlgorithm {
|
|
23
|
+
NONE = "none",
|
|
24
|
+
GZIP = "gzip"
|
|
25
|
+
}
|
|
13
26
|
export type MetricsMeterSettings = Partial<InternalMetricsMeterSettings>;
|
|
14
27
|
export type MetricsMeterProviderCreateFunc = () => MetricsMeterProvider;
|
|
@@ -53,8 +53,9 @@ class MetricBase {
|
|
|
53
53
|
}
|
|
54
54
|
getData() {
|
|
55
55
|
const data = {
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
platformVersion: this.settings.platformVersion,
|
|
57
|
+
// todo vnikolov: control which attributes are added as explicit data here
|
|
58
|
+
user: this.settings.user
|
|
58
59
|
};
|
|
59
60
|
return data;
|
|
60
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/metrics/metrics/base/base.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gEAA4E;AAS5E,MAAsB,UAAU;IAG5B,YAAmB,QAAgC,EAAS,MAAc;QAAvD,aAAQ,GAAR,QAAQ,CAAwB;QAAS,WAAM,GAAN,MAAM,CAAQ;QAFnE,YAAO,GAAY,KAAK,CAAC;QAI5B,MAAM,SAAS,GAAG,IAAI,0BAAmB,EAAE,CAAC;QAC5C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAEY,KAAK;;YACd,IAAI;gBACA,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,CAAC;gBAEnE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,iBAAiB,CAAC,CAAC;gBAEjE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;aACvB;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,OAAO,GAAG,8DAA8D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACpC;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KAAA;IAEY,IAAI;;YACb,IAAI;gBACA,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,CAAC;gBAEnE,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,CAAC;gBAErE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;aACxB;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,OAAO,GAAG,gEAAgE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACrG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACpC;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KAAA;IAQS,OAAO;QACb,MAAM,IAAI,GAAe;YACrB,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/metrics/metrics/base/base.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gEAA4E;AAS5E,MAAsB,UAAU;IAG5B,YAAmB,QAAgC,EAAS,MAAc;QAAvD,aAAQ,GAAR,QAAQ,CAAwB;QAAS,WAAM,GAAN,MAAM,CAAQ;QAFnE,YAAO,GAAY,KAAK,CAAC;QAI5B,MAAM,SAAS,GAAG,IAAI,0BAAmB,EAAE,CAAC;QAC5C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAEY,KAAK;;YACd,IAAI;gBACA,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,CAAC;gBAEnE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,iBAAiB,CAAC,CAAC;gBAEjE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;aACvB;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,OAAO,GAAG,8DAA8D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACpC;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KAAA;IAEY,IAAI;;YACb,IAAI;gBACA,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,mBAAmB,CAAC,CAAC;gBAEnE,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,CAAC;gBAErE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;aACxB;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,OAAO,GAAG,gEAAgE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACrG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;aACpC;YACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;KAAA;IAQS,OAAO;QACb,MAAM,IAAI,GAAe;YACrB,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,eAAe;YAC9C,0EAA0E;YAC1E,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;SAC3B,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,kBAAkB,CAAC,WAAmB;QAC5C,MAAM,IAAI,mCACH,IAAI,CAAC,OAAO,EAAE,KACjB,WAAW,GACd,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,aAAa,CAAC,MAAc;QAClC,MAAM,IAAI,mCACH,IAAI,CAAC,OAAO,EAAE,KACjB,MAAM,GACT,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAvED,gCAuEC"}
|
|
@@ -4,8 +4,8 @@ export interface InternalMetricSettings {
|
|
|
4
4
|
type: MetricType;
|
|
5
5
|
name: string;
|
|
6
6
|
description: string;
|
|
7
|
-
user: string;
|
|
8
7
|
platformVersion: string;
|
|
8
|
+
user: string;
|
|
9
9
|
unit?: string;
|
|
10
10
|
buckets?: number[];
|
|
11
11
|
}
|
|
@@ -13,8 +13,8 @@ export interface MetricSettings extends Partial<Omit<InternalMetricSettings, "ty
|
|
|
13
13
|
type: MetricType;
|
|
14
14
|
}
|
|
15
15
|
export interface MetricData extends Attributes {
|
|
16
|
-
user: string;
|
|
17
16
|
platformVersion: string;
|
|
17
|
+
user: string;
|
|
18
18
|
}
|
|
19
19
|
export interface ApplicationMetricData extends MetricData {
|
|
20
20
|
application: string;
|
|
@@ -9,11 +9,12 @@ export declare class MetricsSettingsBuilder {
|
|
|
9
9
|
defaultMetricsEnabled: boolean;
|
|
10
10
|
platformVersion: string;
|
|
11
11
|
meter: InternalMetricsMeterSettings;
|
|
12
|
+
settings?: MetricsSettings;
|
|
12
13
|
constructor();
|
|
13
14
|
build(): InternalMetricsSettings;
|
|
14
15
|
withSettings(settings?: MetricsSettings): this;
|
|
15
16
|
withEnabled(enabled?: boolean): this;
|
|
16
|
-
|
|
17
|
+
withUser(userId?: string): this;
|
|
17
18
|
withPlatformVersion(version?: string): this;
|
|
18
19
|
withDefaultMetricsEnabled(enabled?: boolean): this;
|
|
19
20
|
withMeter(settings?: MetricsMeterSettings): this;
|
|
@@ -10,22 +10,20 @@ class MetricsSettingsBuilder {
|
|
|
10
10
|
this.withSettings(this.defaultSettings);
|
|
11
11
|
}
|
|
12
12
|
build() {
|
|
13
|
+
var _a, _b, _c, _d, _e, _f;
|
|
13
14
|
const validator = new settingsBuilder_1.MetricsSettingsBuilderValidator();
|
|
14
15
|
validator.validate(this);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
platformVersion: this.platformVersion,
|
|
20
|
-
meter: this.meter,
|
|
21
|
-
metrics: [...this.metrics.values()]
|
|
22
|
-
};
|
|
16
|
+
this.metrics.forEach((metric) => {
|
|
17
|
+
this.metrics.set(metric.type, Object.assign(Object.assign({}, this.settings), metric));
|
|
18
|
+
});
|
|
19
|
+
const settings = Object.assign(Object.assign({}, this.settings), { enabled: this.enabled, userId: this.userId || ((_a = this.settings) === null || _a === void 0 ? void 0 : _a.userId), defaultMetricsEnabled: this.defaultMetricsEnabled, platformVersion: this.platformVersion || ((_b = this.settings) === null || _b === void 0 ? void 0 : _b.platformVersion), serviceId: (_c = this.settings) === null || _c === void 0 ? void 0 : _c.serviceId, serviceName: (_d = this.settings) === null || _d === void 0 ? void 0 : _d.serviceName, serviceVersion: (_e = this.settings) === null || _e === void 0 ? void 0 : _e.serviceVersion, meter: Object.assign(Object.assign({ userId: this.userId || ((_f = this.settings) === null || _f === void 0 ? void 0 : _f.userId) }, this.settings), this.meter), metrics: [...this.metrics.values()] });
|
|
23
20
|
return settings;
|
|
24
21
|
}
|
|
25
22
|
withSettings(settings) {
|
|
23
|
+
this.settings = settings;
|
|
26
24
|
return this.withEnabled(settings === null || settings === void 0 ? void 0 : settings.enabled)
|
|
27
25
|
.withDefaultMetricsEnabled(settings === null || settings === void 0 ? void 0 : settings.defaultMetricsEnabled)
|
|
28
|
-
.
|
|
26
|
+
.withUser(settings === null || settings === void 0 ? void 0 : settings.userId)
|
|
29
27
|
.withPlatformVersion(settings === null || settings === void 0 ? void 0 : settings.platformVersion)
|
|
30
28
|
.withMeter(settings === null || settings === void 0 ? void 0 : settings.meter)
|
|
31
29
|
.withCustomMetrics(settings === null || settings === void 0 ? void 0 : settings.metrics);
|
|
@@ -34,7 +32,7 @@ class MetricsSettingsBuilder {
|
|
|
34
32
|
this.enabled = enabled !== null && enabled !== void 0 ? enabled : this.enabled;
|
|
35
33
|
return this;
|
|
36
34
|
}
|
|
37
|
-
|
|
35
|
+
withUser(userId) {
|
|
38
36
|
this.userId = userId !== null && userId !== void 0 ? userId : this.userId;
|
|
39
37
|
this.metrics.forEach((metric) => {
|
|
40
38
|
metric.user = this.userId;
|
|
@@ -59,9 +57,9 @@ class MetricsSettingsBuilder {
|
|
|
59
57
|
return this;
|
|
60
58
|
}
|
|
61
59
|
withMeter(settings) {
|
|
62
|
-
var _a, _b, _c, _d, _e;
|
|
60
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
63
61
|
const defaultMeterSettings = this.meter;
|
|
64
|
-
this.meter = Object.assign(Object.assign({}, (settings !== null && settings !== void 0 ? settings : {})), { url: (_a = settings === null || settings === void 0 ? void 0 : settings.url) !== null && _a !== void 0 ? _a : defaultMeterSettings.url,
|
|
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, userId: (_c = (_b = this.userId) !== null && _b !== void 0 ? _b : settings === null || settings === void 0 ? void 0 : settings.userId) !== null && _c !== void 0 ? _c : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.userId, publishInterval: (_d = settings === null || settings === void 0 ? void 0 : settings.publishInterval) !== null && _d !== void 0 ? _d : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.publishInterval, serviceId: (_e = settings === null || settings === void 0 ? void 0 : settings.serviceId) !== null && _e !== void 0 ? _e : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.serviceId, serviceName: (_f = settings === null || settings === void 0 ? void 0 : settings.serviceName) !== null && _f !== void 0 ? _f : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.serviceName, serviceVersion: (_g = settings === null || settings === void 0 ? void 0 : settings.serviceVersion) !== null && _g !== void 0 ? _g : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.serviceVersion, compression: (_h = settings === null || settings === void 0 ? void 0 : settings.compression) !== null && _h !== void 0 ? _h : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.compression, headers: (_j = settings === null || settings === void 0 ? void 0 : settings.headers) !== null && _j !== void 0 ? _j : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.headers, hostname: (_k = settings === null || settings === void 0 ? void 0 : settings.hostname) !== null && _k !== void 0 ? _k : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.hostname, keepAlive: (_l = settings === null || settings === void 0 ? void 0 : settings.keepAlive) !== null && _l !== void 0 ? _l : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.keepAlive, concurrencyLimit: (_m = settings === null || settings === void 0 ? void 0 : settings.concurrencyLimit) !== null && _m !== void 0 ? _m : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.concurrencyLimit, timeoutMillis: (_o = settings === null || settings === void 0 ? void 0 : settings.timeoutMillis) !== null && _o !== void 0 ? _o : defaultMeterSettings === null || defaultMeterSettings === void 0 ? void 0 : defaultMeterSettings.timeoutMillis });
|
|
65
63
|
return this;
|
|
66
64
|
}
|
|
67
65
|
withCustomMetrics(settings) {
|
|
@@ -84,30 +82,12 @@ class MetricsSettingsBuilder {
|
|
|
84
82
|
}
|
|
85
83
|
convert(custom) {
|
|
86
84
|
var _a, _b, _c, _d;
|
|
87
|
-
const converted = {
|
|
88
|
-
type: custom.type,
|
|
89
|
-
enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : true,
|
|
90
|
-
name: (_b = custom.name) !== null && _b !== void 0 ? _b : custom.type,
|
|
91
|
-
description: (_c = custom.description) !== null && _c !== void 0 ? _c : ((_d = custom.name) !== null && _d !== void 0 ? _d : custom.type),
|
|
92
|
-
user: this.userId,
|
|
93
|
-
platformVersion: this.platformVersion,
|
|
94
|
-
unit: custom.unit,
|
|
95
|
-
buckets: custom.buckets
|
|
96
|
-
};
|
|
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 });
|
|
97
86
|
return converted;
|
|
98
87
|
}
|
|
99
88
|
mergeSettings(custom, existing) {
|
|
100
89
|
var _a, _b, _c, _d;
|
|
101
|
-
const converted = {
|
|
102
|
-
type: custom.type,
|
|
103
|
-
enabled: (_a = custom.enabled) !== null && _a !== void 0 ? _a : existing.enabled,
|
|
104
|
-
name: (_b = custom.name) !== null && _b !== void 0 ? _b : existing.name,
|
|
105
|
-
description: (_c = custom.description) !== null && _c !== void 0 ? _c : existing.description,
|
|
106
|
-
user: this.userId,
|
|
107
|
-
platformVersion: this.platformVersion,
|
|
108
|
-
unit: existing.unit,
|
|
109
|
-
buckets: (_d = custom.buckets) !== null && _d !== void 0 ? _d : existing.buckets
|
|
110
|
-
};
|
|
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 });
|
|
111
91
|
return converted;
|
|
112
92
|
}
|
|
113
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/metrics/settings/builder.ts"],"names":[],"mappings":";;;AAAA,8EAA2F;AAE3F,uCAAmD;AAInD,MAAa,sBAAsB;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/metrics/settings/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,25 @@
|
|
|
1
1
|
import { InternalMetricSettings, MetricSettings } from "../metrics/base/types";
|
|
2
|
-
import { InternalMetricsMeterSettings, MetricsMeterSettings } from "../meter/types";
|
|
2
|
+
import { CompressionAlgorithm, InternalMetricsMeterSettings, MetricsMeterSettings } from "../meter/types";
|
|
3
3
|
export interface InternalMetricsSettings {
|
|
4
4
|
enabled: boolean;
|
|
5
5
|
defaultMetricsEnabled: boolean;
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
serviceId?: string;
|
|
7
|
+
serviceName?: string;
|
|
8
|
+
serviceVersion?: string;
|
|
9
|
+
platformVersion?: string;
|
|
10
|
+
userId?: string;
|
|
8
11
|
meter: InternalMetricsMeterSettings;
|
|
9
12
|
metrics: InternalMetricSettings[];
|
|
13
|
+
url?: string;
|
|
14
|
+
publishInterval?: number;
|
|
15
|
+
compression?: CompressionAlgorithm;
|
|
16
|
+
headers?: Partial<Record<string, unknown>>;
|
|
17
|
+
hostname?: string;
|
|
18
|
+
keepAlive?: boolean;
|
|
19
|
+
concurrencyLimit?: number;
|
|
20
|
+
/** Maximum time the OTLP exporter will wait for each batch export.
|
|
21
|
+
* The default value is 10000ms. */
|
|
22
|
+
timeoutMillis?: number;
|
|
10
23
|
}
|
|
11
24
|
export interface MetricsSettings extends Partial<Omit<InternalMetricsSettings, "meter" | "metrics">> {
|
|
12
25
|
meter?: MetricsMeterSettings;
|
package/dist/traces/manager.js
CHANGED
|
@@ -99,7 +99,8 @@ class TracesManager {
|
|
|
99
99
|
activeContext = api_1.propagation.extract(api_1.context.active(), propagationInfo);
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
|
-
else if (traces_1.default.currentTracingState
|
|
102
|
+
else if (traces_1.default.currentTracingState &&
|
|
103
|
+
this.settings.useOTELContextManager !== true) {
|
|
103
104
|
const propagationInfo = traces_1.default.currentTracingState.getPropagationInfo();
|
|
104
105
|
if (propagationInfo) {
|
|
105
106
|
activeContext = api_1.propagation.extract(api_1.context.active(), propagationInfo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PropagationInfo, PropagationInfoCarrier, TracingState as ITracingState, Verbosity } from "./types";
|
|
2
2
|
import { Exception, TimeInput, Attributes } from "@opentelemetry/api";
|
|
3
3
|
export declare class NullTracingState implements ITracingState {
|
|
4
4
|
source: string;
|
|
@@ -14,7 +14,7 @@ export declare class NullTracingState implements ITracingState {
|
|
|
14
14
|
isRecording(): boolean;
|
|
15
15
|
updateName(name: string): this;
|
|
16
16
|
spanContext(): undefined;
|
|
17
|
-
addData(level: Verbosity | keyof typeof Verbosity, data:
|
|
17
|
+
addData(level: Verbosity | keyof typeof Verbosity, data: object): Promise<void>;
|
|
18
18
|
getPropagationInfo(): PropagationInfo | null;
|
|
19
19
|
injectPropagationInfo(carrier: PropagationInfoCarrier): void;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullTracingState.js","sourceRoot":"","sources":["../../src/traces/nullTracingState.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"nullTracingState.js","sourceRoot":"","sources":["../../src/traces/nullTracingState.ts"],"names":[],"mappings":";;;AAeA,MAAa,gBAAgB;IAC3B,YAAmB,MAAc,EAAU,eAAuC;QAA/D,WAAM,GAAN,MAAM,CAAQ;QAAU,oBAAe,GAAf,eAAe,CAAwB;QAElF,UAAK,GAAG,KAAc,CAAC;IAF8D,CAAC;IAI/E,OAAO;QACZ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAW,EAAE;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,QAAQ,CACb,IAAY,EACZ,qBAA8C,EAC9C,SAAqB;QAErB,OAAO,IAAI,CAAC;IACd,CAAC;IACM,eAAe,CAAC,SAAoB,EAAE,IAAgB,IAAG,CAAC;IAC1D,WAAW;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IACM,UAAU,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,OAAO,CAAC,KAAyC,EAAE,IAAY;QACpE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,OAAO,IAAI,CAAC,eAAe,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC;QACZ,wEAAwE;QACxE,+BAA+B;QAC/B,yDAAyD;QACzD,0BAA0B;IAC5B,CAAC;IAEM,qBAAqB,CAAC,OAA+B;QAC1D,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC,eAAe,CAAC;SAChE;IACH,CAAC;CACF;AA1DD,4CA0DC"}
|
package/dist/traces/traces.d.ts
CHANGED
|
@@ -11,10 +11,10 @@ export default class Traces {
|
|
|
11
11
|
static get currentTracingState(): TracingState;
|
|
12
12
|
static set currentTracingState(value: TracingState | null);
|
|
13
13
|
static extractTracingPropagationInfo(propagationInfoCarrier: PropagationInfo | PropagationInfoCarrier, deleteProperty?: boolean | undefined): PropagationInfo | null;
|
|
14
|
-
static withSpan(root: string,
|
|
14
|
+
static withSpan(root: string, decoratorOptions?: {
|
|
15
15
|
argMapping: {
|
|
16
16
|
[x: string]: string;
|
|
17
|
-
}
|
|
17
|
+
} | Array<string>;
|
|
18
18
|
}): any;
|
|
19
19
|
static withSpan<T>(source: string, callback: WithSpanCallback<T>): Promise<T>;
|
|
20
20
|
static withSpan<T>(source: string, tracingContext: TracingContext | any, callback: WithSpanCallback<T>): Promise<T>;
|
package/dist/traces/traces.js
CHANGED
|
@@ -41,7 +41,7 @@ class Traces {
|
|
|
41
41
|
}
|
|
42
42
|
static withSpan(source, tracingContextOrCallback, propagationInfoOrCallback, callback) {
|
|
43
43
|
// decorator
|
|
44
|
-
if ((!tracingContextOrCallback || tracingContextOrCallback
|
|
44
|
+
if ((!tracingContextOrCallback || tracingContextOrCallback.argMapping) &&
|
|
45
45
|
!propagationInfoOrCallback &&
|
|
46
46
|
!callback) {
|
|
47
47
|
return function (target, propertyKey, descriptor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/traces/traces.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,kBAAkB;AAClB,2DAAwD;AACxD,yDAAsD;AAStD,mCAAwD;AAExD;;;GAGG;AACH,MAAqB,MAAM;IAGlB,MAAM,KAAK,QAAQ;QACxB,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,MAAM,KAAK,QAAQ,CAAC,KAAoB;QAC7C,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAGM,MAAM,KAAK,mBAAmB;QACnC,OAAO,MAAM,CAAC,oBAAoB,IAAI,IAAI,mCAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IACM,MAAM,KAAK,mBAAmB,CAAC,KAA0B;QAC9D,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,6BAA6B,CAClC,sBAAgE,EAChE,cAAoC;QAEpC,IAAK,sBAA0C,CAAC,WAAW,EAAE;YAC3D,OAAO,sBAAyC,CAAC;SAClD;QACD,MAAM,qBAAqB,GAAI,sBAAiD;aAC7E,+BAA+B,CAAC;QACnC,IAAI,qBAAqB,EAAE;YACzB,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC3B,OAAQ,sBAAiD,CAAC,+BAA+B,CAAC;aAC3F;YACD,OAAO,qBAAqB,CAAC;SAC9B;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAiBD,MAAM,CAAC,QAAQ,CACb,MAAc,EACd,wBAA+
|
|
1
|
+
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/traces/traces.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,kBAAkB;AAClB,2DAAwD;AACxD,yDAAsD;AAStD,mCAAwD;AAExD;;;GAGG;AACH,MAAqB,MAAM;IAGlB,MAAM,KAAK,QAAQ;QACxB,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IACM,MAAM,KAAK,QAAQ,CAAC,KAAoB;QAC7C,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAGM,MAAM,KAAK,mBAAmB;QACnC,OAAO,MAAM,CAAC,oBAAoB,IAAI,IAAI,mCAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC;IACM,MAAM,KAAK,mBAAmB,CAAC,KAA0B;QAC9D,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,6BAA6B,CAClC,sBAAgE,EAChE,cAAoC;QAEpC,IAAK,sBAA0C,CAAC,WAAW,EAAE;YAC3D,OAAO,sBAAyC,CAAC;SAClD;QACD,MAAM,qBAAqB,GAAI,sBAAiD;aAC7E,+BAA+B,CAAC;QACnC,IAAI,qBAAqB,EAAE;YACzB,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC3B,OAAQ,sBAAiD,CAAC,+BAA+B,CAAC;aAC3F;YACD,OAAO,qBAAqB,CAAC;SAC9B;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAiBD,MAAM,CAAC,QAAQ,CACb,MAAc,EACd,wBAA+H,EAC/H,yBAAiG,EACjG,QAA8B;QAE9B,YAAY;QACZ,IACE,CAAC,CAAC,wBAAwB,IAAI,wBAAwB,CAAC,UAAU,CAAC;YAClE,CAAC,yBAAyB;YAC1B,CAAC,QAAQ,EACT;YACA,OAAO,UAAU,MAAW,EAAE,WAAmB,EAAE,UAA8B;gBAC/E,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC;gBACpC,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;oBACzC,OAAO,MAAM,CAAC,QAAQ,CACpB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,EAClE,wBAAwB;wBACtB,CAAC,mBAAM,IAAA,qCAA6B,EAAC,wBAAwB,EAAE,IAAI,CAAC,EACpE,CAAC,CAAC;wBACE,IAAI;qBACL,EACL,GAAG,EAAE;wBACH,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACtC,CAAC,CACF,CAAC;gBACJ,CAAC,CAAC;YACJ,CAAC,CAAC;SACH;QAED,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAC7B,MAAM,EACN,wBAA+B,EAC/B,yBAAgC,EAChC,QAAe,CAChB,CAAC;IACJ,CAAC;;AAxFH,yBAyFC;AAvFgB,gBAAS,GAAkB,IAAI,qCAAiB,EAAE,CAAC;AAyFvD,QAAA,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from "../logger/types";
|
|
2
|
-
import {
|
|
2
|
+
import { PropagationInfo, PropagationInfoCarrier, TracingState as ITracingState, Verbosity } from "./types";
|
|
3
3
|
import { Span, SpanContext, Exception, TimeInput, Attributes, SpanStatus } from "@opentelemetry/api";
|
|
4
4
|
export declare class TracingState implements ITracingState {
|
|
5
5
|
source: string;
|
|
@@ -22,7 +22,7 @@ export declare class TracingState implements ITracingState {
|
|
|
22
22
|
isRecording(): boolean;
|
|
23
23
|
updateName(name: string): this;
|
|
24
24
|
spanContext(): SpanContext;
|
|
25
|
-
addData(level: Verbosity | keyof typeof Verbosity, data:
|
|
25
|
+
addData(level: Verbosity | keyof typeof Verbosity, data: object): Promise<void>;
|
|
26
26
|
getPropagationInfo(): PropagationInfo;
|
|
27
27
|
injectPropagationInfo(carrier: PropagationInfoCarrier): void;
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracingState.js","sourceRoot":"","sources":["../../src/traces/tracingState.ts"],"names":[],"mappings":";;;AAGA,mCAMiB;AACjB,4CAU4B;AAC5B,mCAA8C;AAE9C,MAAa,YAAY;IAEvB,YACS,MAAc,EACd,KAA6B,EAC7B,IAAU,EACT,MAAc,EACd,OAAe;QAJhB,WAAM,GAAN,MAAM,CAAQ;QACd,UAAK,GAAL,KAAK,CAAwB;QAC7B,SAAI,GAAJ,IAAI,CAAM;QACT,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAQ;QANjB,sBAAiB,GAAe,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,CAAC;QAyB/D,aAAQ,GAAG,KAAK,CAAC;QAjBvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC7C,CAAC;IAEM,OAAO;;QACZ,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,8BAA8B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SACjE;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SACjB;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAMD,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;IACtC,CAAC;IACD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACvC,CAAC;IACD,IAAW,MAAM,CAAC,MAAkB;QAClC,IAAI,CAAC,iBAAiB,qBAAQ,MAAM,CAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IACD,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACM,QAAQ,CACb,IAAY,EACZ,qBAA8C,EAC9C,SAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IACM,eAAe,CAAC,SAAoB,EAAE,IAAgB;QAC3D,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IACM,UAAU,CAAC,IAAY;QAC5B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAEM,OAAO,CAAC,KAAyC,EAAE,
|
|
1
|
+
{"version":3,"file":"tracingState.js","sourceRoot":"","sources":["../../src/traces/tracingState.ts"],"names":[],"mappings":"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"}
|
package/dist/traces/types.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export interface TracingState {
|
|
|
25
25
|
enabled: boolean;
|
|
26
26
|
status?: SpanStatus;
|
|
27
27
|
level: keyof typeof Verbosity;
|
|
28
|
-
addData(level: Verbosity | keyof typeof Verbosity, data:
|
|
28
|
+
addData(level: Verbosity | keyof typeof Verbosity, data: object): Promise<void>;
|
|
29
29
|
source: string;
|
|
30
30
|
id?: string;
|
|
31
31
|
traceId?: string;
|
|
@@ -217,6 +217,20 @@ export interface TracesSettings {
|
|
|
217
217
|
* in 'filters' and 'sampling' collections.
|
|
218
218
|
*/
|
|
219
219
|
default?: TracesDefaultsSettings;
|
|
220
|
+
/**
|
|
221
|
+
* If 'true', the library will use the ContextManager provided
|
|
222
|
+
* by the active OTEL SDK to manage and derive propagation information
|
|
223
|
+
* to ensure spans created across asynchronous operations are properly
|
|
224
|
+
* nested.
|
|
225
|
+
*
|
|
226
|
+
* Otherwise, use 'Traces.currentTracingState' to set and retrieve propagation
|
|
227
|
+
* info across asynchronous operations manually.
|
|
228
|
+
*
|
|
229
|
+
* See https://opentelemetry.io/docs/languages/js/propagation/ and
|
|
230
|
+
* https://opentelemetry.io/docs/languages/js/context/#context-manager for
|
|
231
|
+
* more information.
|
|
232
|
+
*/
|
|
233
|
+
useOTELContextManager?: boolean;
|
|
220
234
|
/**
|
|
221
235
|
* If an OTEL TraceProvider isn't provided to the library,
|
|
222
236
|
* it will initialize its own.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
2
2
|
import { ContextManager, TracerProvider } from "@opentelemetry/api";
|
|
3
|
-
import {
|
|
3
|
+
import { Filter, TracesDefaultsSettings, TracesSettings, TracingContext } from "../types";
|
|
4
4
|
import { Span } from "@opentelemetry/api";
|
|
5
5
|
import { Logger } from "../../logger/types";
|
|
6
6
|
export declare const isSpanEnabled: (match: Filter | undefined, defaultMatch: TracesDefaultsSettings | undefined) => boolean | undefined;
|
|
@@ -8,7 +8,7 @@ export declare const isFilterMatch: (filter: Filter, context: TracingContext, so
|
|
|
8
8
|
export declare const setTracerProvider: (tracerProvider?: TracerProvider, sampler?: ((defaultSampler: Sampler) => Sampler) | undefined, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
9
9
|
contextManager?: ContextManager;
|
|
10
10
|
}, contextGetter?: () => TracingContext, logger?: Logger, settings?: TracesSettings) => void;
|
|
11
|
-
export declare const saveDataInAttribute: (data:
|
|
11
|
+
export declare const saveDataInAttribute: (data: object, otelSpan: Span) => void;
|
|
12
12
|
export declare const replacePlaceHolders: (settings: any, context: any) => any;
|
|
13
13
|
export declare const isFunctionType: (variable: unknown) => boolean;
|
|
14
14
|
export declare const deep_value: (obj: {
|
|
@@ -146,6 +146,9 @@ const getOTELData = (key, value, depth) => {
|
|
|
146
146
|
else if (isObject) {
|
|
147
147
|
return flatten(key, value, depth);
|
|
148
148
|
}
|
|
149
|
+
else if (typeof value === "function") {
|
|
150
|
+
return [];
|
|
151
|
+
}
|
|
149
152
|
else if (value) {
|
|
150
153
|
return [[key, value + ""]];
|
|
151
154
|
}
|
|
@@ -186,8 +189,9 @@ const deep_value = function (obj, path) {
|
|
|
186
189
|
}
|
|
187
190
|
;
|
|
188
191
|
for (var i = 0, path = path.split("."), len = path.length; i < len; i++) {
|
|
189
|
-
if (
|
|
190
|
-
return
|
|
192
|
+
if (obj === null || obj === undefined) {
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
191
195
|
obj = obj[path[i]];
|
|
192
196
|
}
|
|
193
197
|
return obj;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/traces/utils/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/traces/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -24,32 +24,29 @@ export interface Settings {
|
|
|
24
24
|
*/
|
|
25
25
|
failOnInitError?: boolean;
|
|
26
26
|
/**
|
|
27
|
-
* If provided, this value will be added to the span attributes
|
|
27
|
+
* If provided, this value will be added to the metrics and span attributes
|
|
28
28
|
* and to the span filtering context (see 'filters').
|
|
29
29
|
*/
|
|
30
30
|
platformVersion?: string;
|
|
31
31
|
/**
|
|
32
|
-
* If
|
|
33
|
-
*
|
|
34
|
-
* attribute.
|
|
32
|
+
* If provided, this value will be added to the metrics and traces service.name attribute,
|
|
33
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library.
|
|
35
34
|
*/
|
|
36
35
|
serviceName?: string;
|
|
37
36
|
/**
|
|
38
|
-
* If
|
|
39
|
-
*
|
|
40
|
-
* attribute.
|
|
37
|
+
* If provided, this value will be added to the metrics and traces service.id attribute,
|
|
38
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library.
|
|
41
39
|
*/
|
|
42
40
|
serviceId?: string;
|
|
43
41
|
/**
|
|
44
|
-
* If
|
|
45
|
-
*
|
|
42
|
+
* If provided, this value will be added to the metrics and traces service.version attribute,
|
|
43
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library.
|
|
46
44
|
* attribute.
|
|
47
45
|
*/
|
|
48
46
|
serviceVersion?: string;
|
|
49
47
|
/**
|
|
50
|
-
* If
|
|
51
|
-
*
|
|
52
|
-
* attribute.
|
|
48
|
+
* If provided, this value will be added to the metrics and traces user.id attribute,
|
|
49
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library.
|
|
53
50
|
*/
|
|
54
51
|
userId?: string;
|
|
55
52
|
traces?: TracesSettings;
|
|
@@ -14,7 +14,7 @@ class MetricBaseValidator {
|
|
|
14
14
|
validator_1.Validator.throwIfNullOrUndefined(settings.name, "name");
|
|
15
15
|
validator_1.Validator.throwIfNullOrUndefined(settings.type, "type");
|
|
16
16
|
validator_1.Validator.throwIfNullOrUndefined(settings.description, "description");
|
|
17
|
-
|
|
17
|
+
// Validator.throwIfNullOrUndefined(settings.user, "user");
|
|
18
18
|
validator_1.Validator.throwIfNullOrUndefined(settings.platformVersion, "platformVersion");
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/validation/metrics/base/base.ts"],"names":[],"mappings":";;;AAEA,+CAA4C;AAE5C,MAAa,mBAAmB;IAErB,QAAQ,CAAC,IAAgB;QAC5B,qBAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,qBAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEO,gBAAgB,CAAC,QAAgC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9D,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACtE,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/validation/metrics/base/base.ts"],"names":[],"mappings":";;;AAEA,+CAA4C;AAE5C,MAAa,mBAAmB;IAErB,QAAQ,CAAC,IAAgB;QAC5B,qBAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,qBAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEO,gBAAgB,CAAC,QAAgC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9D,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxD,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACtE,2DAA2D;QAC3D,qBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAClF,CAAC;CACJ;AAjBD,kDAiBC"}
|
|
@@ -6,7 +6,7 @@ class MetricsBuilderValidator {
|
|
|
6
6
|
validate(builder) {
|
|
7
7
|
validator_1.Validator.throwIfNullOrUndefined(builder, "builder");
|
|
8
8
|
validator_1.Validator.throwIfNullOrUndefined(builder.logger, "logger");
|
|
9
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.dependencyContainer, "dependencyContainer");
|
|
9
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.dependencyContainer, "dependencyContainer", ".withDependencyContainer() must be called to initialize metrics");
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
exports.MetricsBuilderValidator = MetricsBuilderValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/validation/metrics/builder.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,uBAAuB;IACzB,QAAQ,CAAC,OAA8B;QAC1C,qBAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/validation/metrics/builder.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,uBAAuB;IACzB,QAAQ,CAAC,OAA8B;QAC1C,qBAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,iEAAiE,CAAC,CAAC;IAC5J,CAAC;CACJ;AAND,0DAMC"}
|
|
@@ -11,11 +11,12 @@ class MetricsSettingsBuilderValidator {
|
|
|
11
11
|
validator_1.Validator.throwIfNullOrUndefined(builder.platformVersion, "platformVersion");
|
|
12
12
|
validator_1.Validator.throwIfNullOrUndefined(builder.metrics, "metrics");
|
|
13
13
|
validator_1.Validator.throwIfNullOrUndefined(builder.meter, "meter");
|
|
14
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.meter.url, "url");
|
|
15
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.meter.publishInterval, "publishInterval");
|
|
16
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.meter.
|
|
17
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.meter.
|
|
18
|
-
validator_1.Validator.throwIfNullOrUndefined(builder.meter.
|
|
14
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.url, "meter.url");
|
|
15
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.publishInterval, "meter.publishInterval");
|
|
16
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.userId, "meter.userId");
|
|
17
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.serviceId, "meter.serviceId");
|
|
18
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.serviceName, "meter.serviceName");
|
|
19
|
+
validator_1.Validator.throwIfNullOrUndefined(builder.meter.serviceVersion, "meter.serviceVersion");
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
22
|
exports.MetricsSettingsBuilderValidator = MetricsSettingsBuilderValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsBuilder.js","sourceRoot":"","sources":["../../../src/validation/metrics/settingsBuilder.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,+BAA+B;IACjC,QAAQ,CAAC,OAA+B;QAC3C,qBAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC;QACzF,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;QAC7E,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACzD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"settingsBuilder.js","sourceRoot":"","sources":["../../../src/validation/metrics/settingsBuilder.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,MAAa,+BAA+B;IACjC,QAAQ,CAAC,OAA+B;QAC3C,qBAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACrD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC;QACzF,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;QAC7E,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7D,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACzD,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACjE,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;QACzF,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QACvE,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAC7E,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QACjF,qBAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IAC3F,CAAC;CACJ;AAhBD,0EAgBC"}
|
|
@@ -8,10 +8,14 @@ class TracesAttributeDataValidator {
|
|
|
8
8
|
if (data instanceof Array || typeof data !== "object") {
|
|
9
9
|
throw new Error("'data' must be a non-array object");
|
|
10
10
|
}
|
|
11
|
-
if (
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
// if (
|
|
12
|
+
// data &&
|
|
13
|
+
// Object.values(data).some((value) => typeof value === "symbol" || typeof value === "bigint")
|
|
14
|
+
// ) {
|
|
15
|
+
// throw new Error(
|
|
16
|
+
// "Invalid data type: 'symbol' or 'bigint' values cannot be stored in OTEL spans."
|
|
17
|
+
// );
|
|
18
|
+
// }
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
21
|
exports.TracesAttributeDataValidator = TracesAttributeDataValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeData.js","sourceRoot":"","sources":["../../../src/validation/traces/attributeData.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AAEzC,MAAa,4BAA4B;IAChC,QAAQ,CAAC,IAAa;QAC3B,qBAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,IAAI,YAAY,KAAK,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QACD,
|
|
1
|
+
{"version":3,"file":"attributeData.js","sourceRoot":"","sources":["../../../src/validation/traces/attributeData.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AAEzC,MAAa,4BAA4B;IAChC,QAAQ,CAAC,IAAa;QAC3B,qBAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,IAAI,YAAY,KAAK,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QACD,OAAO;QACP,YAAY;QACZ,gGAAgG;QAChG,MAAM;QACN,qBAAqB;QACrB,uFAAuF;QACvF,OAAO;QACP,IAAI;IACN,CAAC;CACF;AAhBD,oEAgBC"}
|
|
@@ -5,9 +5,9 @@ class Validator {
|
|
|
5
5
|
static isNullOrUndefined(value) {
|
|
6
6
|
return value === null || value === undefined;
|
|
7
7
|
}
|
|
8
|
-
static throwIfNullOrUndefined(value, propName) {
|
|
8
|
+
static throwIfNullOrUndefined(value, propName, message) {
|
|
9
9
|
if (this.isNullOrUndefined(value)) {
|
|
10
|
-
throw new Error(`${propName} must be defined`);
|
|
10
|
+
throw new Error(message || `${propName} must be defined`);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validation/validator.ts"],"names":[],"mappings":";;;AAAA,MAAa,SAAS;IACX,MAAM,CAAC,iBAAiB,CAAI,KAAQ;QACvC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAI,KAAQ,EAAE,QAAgB;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/validation/validator.ts"],"names":[],"mappings":";;;AAAA,MAAa,SAAS;IACX,MAAM,CAAC,iBAAiB,CAAI,KAAQ;QACvC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,sBAAsB,CAAI,KAAQ,EAAE,QAAgB,EAAE,OAAgB;QAChF,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,GAAG,QAAQ,kBAAkB,CAAC,CAAC;SAC7D;IACL,CAAC;CACJ;AAVD,8BAUC"}
|