@interopio/insights-metrics 0.1.11 → 0.1.12
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/constants.d.ts +0 -1
- package/dist/constants.js +1 -2
- package/dist/constants.js.map +1 -1
- package/dist/factory/factory.js +3 -3
- package/dist/factory/factory.js.map +1 -1
- package/dist/manager.d.ts +1 -1
- package/dist/manager.js +5 -6
- package/dist/manager.js.map +1 -1
- package/dist/meter/providerFactory.js +33 -2
- package/dist/meter/providerFactory.js.map +1 -1
- package/dist/metrics/application/error.js +3 -1
- package/dist/metrics/application/error.js.map +1 -1
- package/dist/metrics/base/base.js +15 -7
- package/dist/metrics/base/base.js.map +1 -1
- package/dist/settings/builder.js +19 -12
- package/dist/settings/builder.js.map +1 -1
- package/dist/utils.d.ts +7 -0
- package/dist/utils.js +33 -0
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/dist/constants.d.ts
CHANGED
package/dist/constants.js
CHANGED
|
@@ -29,8 +29,7 @@ exports.Defaults = {
|
|
|
29
29
|
canBeRoot: true,
|
|
30
30
|
currentTracingStateGetterContextName: "interopio.insights.currentTracingStateGetter",
|
|
31
31
|
minDurationMs: 0,
|
|
32
|
-
log: false
|
|
33
|
-
logOnDisabledSpans: false
|
|
32
|
+
log: false
|
|
34
33
|
};
|
|
35
34
|
exports.Library = {
|
|
36
35
|
name: package_json_1.default.name,
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA0C;AAG7B,QAAA,QAAQ,GAAG;IACpB,aAAa,EAAE,IAAI;IACnB,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,sBAAsB;IAC5C,kBAAkB,EAAE,oBAAoB;IACxC,uBAAuB,EAAE,yBAAyB;IAClD,wBAAwB,EAAE,0BAA0B;IACpD,0BAA0B,EAAE,gBAAgB;IAE5C,+BAA+B,EAAE,KAAK;IACtC,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,KAAK;IACrB,YAAY,EAAE,KAAK;IACnB,0BAA0B,EAAE,KAAK;IACjC,6BAA6B,EAAE,KAAK;IACpC,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,EAAE;IACnB,kBAAkB,EAAE,KAAK;IACzB,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,MAAM;IACb,iBAAiB,EAAE,KAAK;IACxB,SAAS,EAAE,IAAI;IACf,oCAAoC,EAAE,8CAA8C;IACpF,aAAa,EAAE,CAAC;IAChB,GAAG,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA0C;AAG7B,QAAA,QAAQ,GAAG;IACpB,aAAa,EAAE,IAAI;IACnB,YAAY,EAAE,cAAc;IAC5B,oBAAoB,EAAE,sBAAsB;IAC5C,kBAAkB,EAAE,oBAAoB;IACxC,uBAAuB,EAAE,yBAAyB;IAClD,wBAAwB,EAAE,0BAA0B;IACpD,0BAA0B,EAAE,gBAAgB;IAE5C,+BAA+B,EAAE,KAAK;IACtC,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,KAAK;IACrB,YAAY,EAAE,KAAK;IACnB,0BAA0B,EAAE,KAAK;IACjC,6BAA6B,EAAE,KAAK;IACpC,2BAA2B,EAAE,KAAK;IAClC,iBAAiB,EAAE,CAAC;IACpB,eAAe,EAAE,EAAE;IACnB,kBAAkB,EAAE,KAAK;IACzB,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,MAAM;IACb,iBAAiB,EAAE,KAAK;IACxB,SAAS,EAAE,IAAI;IACf,oCAAoC,EAAE,8CAA8C;IACpF,aAAa,EAAE,CAAC;IAChB,GAAG,EAAE,KAAK;CACb,CAAC;AACW,QAAA,OAAO,GAAG;IACnB,IAAI,EAAE,sBAAW,CAAC,IAAI;IACtB,OAAO,EAAE,sBAAW,CAAC,OAAO;CAC/B,CAAC"}
|
package/dist/factory/factory.js
CHANGED
|
@@ -25,9 +25,9 @@ class MetricsFactory {
|
|
|
25
25
|
validator.validate(this);
|
|
26
26
|
}
|
|
27
27
|
create(metricSettings, generalSettings, observeCallback, subscribeCallback, unsubscribeCallback) {
|
|
28
|
-
var _a;
|
|
29
|
-
const metricType = metricSettings.type;
|
|
30
|
-
metricSettings.name = (
|
|
28
|
+
var _a, _b;
|
|
29
|
+
const metricType = (_a = metricSettings.type) !== null && _a !== void 0 ? _a : "null";
|
|
30
|
+
metricSettings.name = (_b = metricSettings.name) !== null && _b !== void 0 ? _b : metricType;
|
|
31
31
|
if (~metricType.indexOf("observable") &&
|
|
32
32
|
!observeCallback) {
|
|
33
33
|
otel_2.Container.errorless(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/factory/factory.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAwE;AACxE,0CAA6C;AAE7C,mEAAsE;AACtE,uEAA0E;AAC1E,+EAAkF;AAClF,mFAAsF;AACtF,uFAA0F;AAC1F,mGAAsG;AACtG,+DAAkE;AAElE,0CAA4C;AAC5C,iDAA6D;AAC7D,wEAAyC;AAEzC,MAAa,cAAc;IACvB,YACW,MAAyB,EACzB,gBAAyE,EACzE,KAAY;QAFZ,WAAM,GAAN,MAAM,CAAmB;QACzB,qBAAgB,GAAhB,gBAAgB,CAAyD;QACzE,UAAK,GAAL,KAAK,CAAO;QAEnB,MAAM,SAAS,GAAG,IAAI,iCAAuB,EAAE,CAAC;QAChD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAEM,MAAM,CACT,cAAyC,EACzC,eAA2C,EAC3C,eAAoE,EACpE,iBAAuC,EACvC,mBAAyC;;QAEzC,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/factory/factory.ts"],"names":[],"mappings":"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"}
|
package/dist/manager.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare class MetricsManager implements IOInsights.MetricsManager {
|
|
|
16
16
|
getObservableFromSettings<TData extends Attributes>(settings: IOInsights.MetricSettings, observeCallback: (result: ObservableResult<TData>) => Promise<void>, subscribeCallback?: () => Promise<void>, unsubscribeCallback?: () => Promise<void>): IOInsights.Metric | undefined;
|
|
17
17
|
start(): Promise<void>;
|
|
18
18
|
stop(): Promise<void>;
|
|
19
|
-
waitForFinalExport(timeoutMs?: number): Promise<void>;
|
|
19
|
+
waitForFinalExport(timeoutMs?: number): Promise<void | undefined>;
|
|
20
20
|
private createEnabledMetrics;
|
|
21
21
|
private getOrCreateMetric;
|
|
22
22
|
private getOrCreateMetricFromSettings;
|
package/dist/manager.js
CHANGED
|
@@ -72,7 +72,6 @@ class MetricsManager {
|
|
|
72
72
|
const metric = metricKvp[1];
|
|
73
73
|
yield this.stopMetric(metric);
|
|
74
74
|
}
|
|
75
|
-
yield this.meterProvider.forceFlush();
|
|
76
75
|
this.started = false;
|
|
77
76
|
this.logger.debug("metrics manager has been stopped");
|
|
78
77
|
}
|
|
@@ -85,11 +84,11 @@ class MetricsManager {
|
|
|
85
84
|
}
|
|
86
85
|
waitForFinalExport(timeoutMs) {
|
|
87
86
|
return __awaiter(this, void 0, void 0, function* () {
|
|
88
|
-
var _a;
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
return (0, otel_1.withTimeout)((_a = this.meterProvider) === null || _a === void 0 ? void 0 : _a.forceFlush(),
|
|
87
|
+
var _a, _b;
|
|
88
|
+
// forceFlush already collects and exports (PeriodicExportingMetricReader
|
|
89
|
+
// performs both), so no separate collect pass is needed. Never rejects:
|
|
90
|
+
// a failed final export must not break a caller's shutdown path.
|
|
91
|
+
return (0, otel_1.withTimeout)((_b = (_a = this.meterProvider) === null || _a === void 0 ? void 0 : _a.forceFlush) === null || _b === void 0 ? void 0 : _b.call(_a), timeoutMs).catch(() => undefined);
|
|
93
92
|
});
|
|
94
93
|
}
|
|
95
94
|
createEnabledMetrics(metrics) {
|
package/dist/manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAuE;AAGvE,2CAAuC;AAEvC,0CAAwE;AAExE,MAAa,cAAc;IAKvB,YACW,YAAiC,EACjC,QAAoC,EACpC,cAAyC,EACzC,aAAuC,EACvC,MAAyB;QAJzB,iBAAY,GAAZ,YAAY,CAAqB;QACjC,aAAQ,GAAR,QAAQ,CAA4B;QACpC,mBAAc,GAAd,cAAc,CAA2B;QACzC,kBAAa,GAAb,aAAa,CAA0B;QACvC,WAAM,GAAN,MAAM,CAAmB;QAT5B,YAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;QAEhD,YAAO,GAAG,KAAK,CAAC;QASnB,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,MAAK,KAAK,EAAE,CAAC;YAC/C,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,yCAAyC,IAAA,oBAAa,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,iCAAuB,EAAE,CAAC;QAChD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAEM,GAAG,CAAC,IAAY;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAa,IAAI,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,eAAe,CAAC,QAAmC;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,6BAA6B,CAAa,QAAQ,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,aAAa,CAChB,IAAY,EACZ,eAAmE,EACnE,iBAAuC,EACvC,mBAAyC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QACrG,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,yBAAyB,CAC5B,QAAmC,EACnC,eAAmE,EACnE,iBAAuC,EACvC,mBAAyC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QACrH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEY,KAAK;;;YACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,IAAI,CAAC;oBACD,IAAI,CAAC,oBAAoB,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;oBAEvD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;wBACnC,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBAC5B,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBACnC,CAAC;oBAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;gBAC1D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,MAAM,OAAO,GAAG,sCAAsC,CAAC;oBACvD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC;QACL,CAAC;KAAA;IAEY,IAAI;;YACb,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,IAAI,CAAC;oBACD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;wBACnC,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;oBAClC,CAAC;oBAED,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../src/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,38 @@ const api_1 = require("@opentelemetry/api");
|
|
|
9
9
|
class MetricsMeterProviderFactory {
|
|
10
10
|
create(settings, otelSettings, logger) {
|
|
11
11
|
var _a;
|
|
12
|
-
|
|
12
|
+
if (otelSettings.useExistingOTELSDK) {
|
|
13
|
+
// Trust the host application's OTEL SDK unconditionally - the API
|
|
14
|
+
// global is never falsy (NoopMeterProvider when unregistered), so
|
|
15
|
+
// there is nothing meaningful to gate on. Unlike the trace/logs
|
|
16
|
+
// API globals (proxies that late-bind their delegate),
|
|
17
|
+
// metrics.getMeterProvider() returns a SNAPSHOT: capturing it once
|
|
18
|
+
// before the host registers would pin the noop forever. This
|
|
19
|
+
// delegating provider re-resolves the global per getMeter call, so
|
|
20
|
+
// a host SDK that initializes after io.Insights still receives the
|
|
21
|
+
// meters created from then on. Meters obtained BEFORE the host
|
|
22
|
+
// registered remain bound to the noop (OTel meters cannot rebind)
|
|
23
|
+
// - hosts should register their SDK before io.Insights starts for
|
|
24
|
+
// full coverage.
|
|
25
|
+
logger.info("io.Insights metrics: using the host application's OTEL SDK meter provider (useExistingOTELSDK)");
|
|
26
|
+
const delegating = {
|
|
27
|
+
getMeter: (name, version, options) => api_1.metrics.getMeterProvider().getMeter(name, version, options),
|
|
28
|
+
forceFlush: () => {
|
|
29
|
+
var _a, _b;
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
31
|
+
const current = api_1.metrics.getMeterProvider();
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
|
|
33
|
+
return (_b = (_a = current.forceFlush) === null || _a === void 0 ? void 0 : _a.call(current)) !== null && _b !== void 0 ? _b : Promise.resolve();
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
return {
|
|
37
|
+
meterProvider: delegating,
|
|
38
|
+
metricReaders: []
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
const exporterSettings = Object.assign(Object.assign({ url: settings.url, concurrencyLimit: settings.concurrencyLimit, timeoutMillis: settings.timeoutMillis, compression: settings.compression, keepAlive: settings.keepAlive }, settings.exporterSettings), {
|
|
42
|
+
// (with ssoAuth: a function, asked for the headers - the SSO login included - on every export)
|
|
43
|
+
headers: (0, otel_1.createExportHeaders)([otelSettings.headers, (_a = settings.exporterSettings) === null || _a === void 0 ? void 0 : _a.headers, settings.headers], Object.assign(Object.assign({}, otelSettings.ssoAuth), settings.ssoAuth), logger) });
|
|
13
44
|
const metricReaderSettings = Object.assign(Object.assign({}, settings.readerSettings), { exportIntervalMillis: settings.publishInterval });
|
|
14
45
|
let metricReaders = [];
|
|
15
46
|
if (settings.metricReaders) {
|
|
@@ -28,7 +59,7 @@ class MetricsMeterProviderFactory {
|
|
|
28
59
|
metricReaders.push(new sdk_metrics_1.PeriodicExportingMetricReader(Object.assign(Object.assign({}, metricReaderSettings), { exporter })));
|
|
29
60
|
}
|
|
30
61
|
const meterProvider = this.createMeterProvider(settings, otelSettings, metricReaders, logger);
|
|
31
|
-
return { meterProvider, metricReaders };
|
|
62
|
+
return { meterProvider: meterProvider, metricReaders };
|
|
32
63
|
}
|
|
33
64
|
createMeterProvider(settings, otelSettings, metricReaders, logger) {
|
|
34
65
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerFactory.js","sourceRoot":"","sources":["../../src/meter/providerFactory.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"providerFactory.js","sourceRoot":"","sources":["../../src/meter/providerFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,9 @@ class ApplicationErrorMetric extends base_1.MetricBase {
|
|
|
32
32
|
try {
|
|
33
33
|
this.validator.validateApplicationError(args);
|
|
34
34
|
// this.logger.debug(`app error for application ${args.application} and metric ${this.settings.name} is being invoked`);
|
|
35
|
-
const data = Object.assign({ stack: (_a = args.stack) !== null && _a !== void 0 ? _a : "unknown"
|
|
35
|
+
const data = Object.assign({ stack: (_a = args.stack) !== null && _a !== void 0 ? _a : "unknown",
|
|
36
|
+
// the same key the error spans carry, so the two can be queried together
|
|
37
|
+
"error.type": args.errorType || "unknown" }, this.getApplicationData(args.application));
|
|
36
38
|
if (((_b = this.getFilter(data)) === null || _b === void 0 ? void 0 : _b.enabled) === false) {
|
|
37
39
|
return;
|
|
38
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/metrics/application/error.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,sEAA6F;AAC7F,0CAA4C;AAE5C,MAAa,sBAAuB,SAAQ,iBAAU;IAKlD,YACI,QAAmC,EAC5B,KAAY,EACnB,MAAyB,EACzB,eAA2C,EACpC,oBAAqD,EAC5D,cAAiD;QAEjD,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;QANzD,UAAK,GAAL,KAAK,CAAO;QAGZ,yBAAoB,GAApB,oBAAoB,CAAiC;QAI5D,IAAI,CAAC,SAAS,GAAG,IAAI,uCAA+B,EAAE,CAAC;QACvD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,8DAA8D;IAC3C,gBAAgB,CAAC,IAAY,EAAE,YAAiB;QAC/D,OAAO,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9E,CAAC;IAEkB,SAAS;QACxB,IAAI,CAAC,UAAU,GAAG,gBAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEjH,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,aAAa;QAC5B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,WAAW;QAC1B,gBAAS,CAAC,SAAS,CAAC,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,UAAU,oDAAI,CAAA,EAAA,CAAC,CAAC;QAC/C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEO,wBAAwB,CAAC,IAAyC;;QACtE,IAAI,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;YAE9C,wHAAwH;YAExH,MAAM,IAAI,mBACN,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/metrics/application/error.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,sEAA6F;AAC7F,0CAA4C;AAE5C,MAAa,sBAAuB,SAAQ,iBAAU;IAKlD,YACI,QAAmC,EAC5B,KAAY,EACnB,MAAyB,EACzB,eAA2C,EACpC,oBAAqD,EAC5D,cAAiD;QAEjD,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;QANzD,UAAK,GAAL,KAAK,CAAO;QAGZ,yBAAoB,GAApB,oBAAoB,CAAiC;QAI5D,IAAI,CAAC,SAAS,GAAG,IAAI,uCAA+B,EAAE,CAAC;QACvD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,8DAA8D;IAC3C,gBAAgB,CAAC,IAAY,EAAE,YAAiB;QAC/D,OAAO,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9E,CAAC;IAEkB,SAAS;QACxB,IAAI,CAAC,UAAU,GAAG,gBAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEjH,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,aAAa;QAC5B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEkB,WAAW;QAC1B,gBAAS,CAAC,SAAS,CAAC,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,UAAU,oDAAI,CAAA,EAAA,CAAC,CAAC;QAC/C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAEO,wBAAwB,CAAC,IAAyC;;QACtE,IAAI,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;YAE9C,wHAAwH;YAExH,MAAM,IAAI,mBACN,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,SAAS;gBAC9B,yEAAyE;gBACzE,YAAY,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS,IACtC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAC/C,CAAC;YACF,IAAI,CAAA,MAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0CAAE,OAAO,MAAK,KAAK,EAAE,CAAC;gBAC1C,OAAO;YACX,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAQ,CAAC,CAAC;YAEzD,6FAA6F;QACjG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,8DAA8D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnG,oCAAoC;QACxC,CAAC;IACL,CAAC;CACJ;AA7DD,wDA6DC"}
|
|
@@ -42,16 +42,16 @@ class MetricBase {
|
|
|
42
42
|
}))
|
|
43
43
|
.concat((_e = (_d = this.filters) === null || _d === void 0 ? void 0 : _d.filter(x => !x.overrideDefaultFilters)) !== null && _e !== void 0 ? _e : [])
|
|
44
44
|
.find(x => {
|
|
45
|
-
var _a, _b, _c;
|
|
46
|
-
if (x.type && !this.matchStringOrRegex(this.settings.type, x.type)) {
|
|
45
|
+
var _a, _b, _c, _d, _e;
|
|
46
|
+
if (x.type && !this.matchStringOrRegex((_a = this.settings.type) !== null && _a !== void 0 ? _a : "null", x.type)) {
|
|
47
47
|
return false;
|
|
48
48
|
}
|
|
49
|
-
if (x.name && !this.matchStringOrRegex((
|
|
49
|
+
if (x.name && !this.matchStringOrRegex((_c = (_b = this.settings.name) !== null && _b !== void 0 ? _b : this.settings.type) !== null && _c !== void 0 ? _c : "null", x.name)) {
|
|
50
50
|
return false;
|
|
51
51
|
}
|
|
52
|
-
for (const prop of Object.keys((
|
|
52
|
+
for (const prop of Object.keys((_d = x === null || x === void 0 ? void 0 : x.attributes) !== null && _d !== void 0 ? _d : {})) {
|
|
53
53
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
54
|
-
if (args[prop] !== ((
|
|
54
|
+
if (args[prop] !== ((_e = x === null || x === void 0 ? void 0 : x.attributes) !== null && _e !== void 0 ? _e : {})[prop]) {
|
|
55
55
|
return false;
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -140,14 +140,22 @@ class MetricBase {
|
|
|
140
140
|
return data;
|
|
141
141
|
}
|
|
142
142
|
prePublish(data) {
|
|
143
|
-
var _a, _b, _c, _d, _e;
|
|
143
|
+
var _a, _b, _c, _d, _e, _f;
|
|
144
144
|
if (!data) {
|
|
145
145
|
return data;
|
|
146
146
|
}
|
|
147
147
|
const filter = this.getFilter(data);
|
|
148
148
|
const attributeSettings = Object.assign(Object.assign(Object.assign({}, (_b = (_a = this.generalSettings) === null || _a === void 0 ? void 0 : _a.defaultPublishingSettings) === null || _b === void 0 ? void 0 : _b.attributeSettings), (_c = this.settings.publishingSettings) === null || _c === void 0 ? void 0 : _c.attributeSettings), filter === null || filter === void 0 ? void 0 : filter.attributeSettings);
|
|
149
149
|
const flattenedData = (0, otel_1.flattenOtelAtributes)(data, (_e = (_d = this.generalSettings) === null || _d === void 0 ? void 0 : _d.maxAttributeDepth) !== null && _e !== void 0 ? _e : 5);
|
|
150
|
-
|
|
150
|
+
// The allow list of the most specific level that has one applies: a matching filter, the
|
|
151
|
+
// metric, the defaults. The drop lists add up - whatever any level drops stays dropped.
|
|
152
|
+
const defaultPublishingSettings = (_f = this.generalSettings) === null || _f === void 0 ? void 0 : _f.defaultPublishingSettings;
|
|
153
|
+
const publishingSettings = this.settings.publishingSettings;
|
|
154
|
+
const allowAttributes = [filter === null || filter === void 0 ? void 0 : filter.allowAttributes, publishingSettings === null || publishingSettings === void 0 ? void 0 : publishingSettings.allowAttributes, defaultPublishingSettings === null || defaultPublishingSettings === void 0 ? void 0 : defaultPublishingSettings.allowAttributes]
|
|
155
|
+
.find((list) => Array.isArray(list));
|
|
156
|
+
const dropAttributes = [defaultPublishingSettings === null || defaultPublishingSettings === void 0 ? void 0 : defaultPublishingSettings.dropAttributes, publishingSettings === null || publishingSettings === void 0 ? void 0 : publishingSettings.dropAttributes, filter === null || filter === void 0 ? void 0 : filter.dropAttributes]
|
|
157
|
+
.reduce((all, list) => Array.isArray(list) ? all.concat(list) : all, []);
|
|
158
|
+
return (0, utils_1.reduceModality)((0, utils_1.filterAttributes)(flattenedData, allowAttributes, dropAttributes), attributeSettings);
|
|
151
159
|
}
|
|
152
160
|
getApplicationData(application) {
|
|
153
161
|
const data = Object.assign(Object.assign({}, this.getData()), { application });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/metrics/base/base.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6DAAyE;AACzE,0CAAkE;AAElE,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/metrics/base/base.ts"],"names":[],"mappings":"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"}
|
package/dist/settings/builder.js
CHANGED
|
@@ -21,7 +21,7 @@ class MetricsSettingsBuilder {
|
|
|
21
21
|
this.explicitMetrics = [];
|
|
22
22
|
}
|
|
23
23
|
build() {
|
|
24
|
-
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, _1, _2, _3, _4, _5, _6, _7
|
|
24
|
+
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, _1, _2, _3, _4, _5, _6, _7;
|
|
25
25
|
if (this.platformMetricsEnabled === "only-explicit") {
|
|
26
26
|
for (const metricType of this.defaultSettings.metrics) {
|
|
27
27
|
if (!~this.explicitMetrics.indexOf((_a = metricType.name) !== null && _a !== void 0 ? _a : metricType.type)) {
|
|
@@ -83,17 +83,19 @@ class MetricsSettingsBuilder {
|
|
|
83
83
|
reduceModality: 0
|
|
84
84
|
}
|
|
85
85
|
};
|
|
86
|
+
// the trace metric settings are `boolean | string` - only a string is a custom metric name
|
|
87
|
+
const traceMetricName = (x, def) => typeof x === "string" && x ? x : def;
|
|
86
88
|
settings.defaultFilters = ((_1 = settings.defaultFilters) !== null && _1 !== void 0 ? _1 : [])
|
|
87
89
|
.concat([{
|
|
88
|
-
name: (
|
|
90
|
+
name: traceMetricName((_3 = (_2 = this.otelSettings) === null || _2 === void 0 ? void 0 : _2.traces) === null || _3 === void 0 ? void 0 : _3.durationMetric, "insights_trace_duration"),
|
|
89
91
|
attributeSettings: dropDimensionsFromClickstream
|
|
90
92
|
},
|
|
91
93
|
{
|
|
92
|
-
name: (
|
|
94
|
+
name: traceMetricName((_5 = (_4 = this.otelSettings) === null || _4 === void 0 ? void 0 : _4.traces) === null || _5 === void 0 ? void 0 : _5.countMetric, "insights_trace_count"),
|
|
93
95
|
attributeSettings: dropDimensionsFromClickstream
|
|
94
96
|
},
|
|
95
97
|
{
|
|
96
|
-
name: (
|
|
98
|
+
name: traceMetricName((_7 = (_6 = this.otelSettings) === null || _6 === void 0 ? void 0 : _6.traces) === null || _7 === void 0 ? void 0 : _7.resultMetric, "insights_trace_result"),
|
|
97
99
|
attributeSettings: dropDimensionsFromClickstream
|
|
98
100
|
}
|
|
99
101
|
]);
|
|
@@ -162,20 +164,25 @@ class MetricsSettingsBuilder {
|
|
|
162
164
|
return this;
|
|
163
165
|
}
|
|
164
166
|
withCustomMetric(custom) {
|
|
165
|
-
var _a
|
|
167
|
+
var _a;
|
|
166
168
|
if (!custom.name) {
|
|
167
|
-
throw new Error("
|
|
169
|
+
throw new Error("metric name property is not defined");
|
|
168
170
|
}
|
|
169
|
-
this.explicitMetrics.push(
|
|
170
|
-
const hasSettings = this.metrics.has(
|
|
171
|
+
this.explicitMetrics.push(custom.name);
|
|
172
|
+
const hasSettings = this.metrics.has(custom.name);
|
|
171
173
|
if (!hasSettings) {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
+
// A brand new metric without a type has nothing to publish with - it becomes a "null"
|
|
175
|
+
// (no-op) metric. Defaulted on a copy: the caller's settings object is left alone.
|
|
176
|
+
const converted = this.convert(Object.assign(Object.assign({}, custom), { type: (_a = custom.type) !== null && _a !== void 0 ? _a : "null" }));
|
|
177
|
+
this.metrics.set(custom.name, converted);
|
|
174
178
|
}
|
|
175
179
|
else {
|
|
176
|
-
|
|
180
|
+
// An override of existing (e.g. platform) metric settings: the type is optional and
|
|
181
|
+
// must not be defaulted here, or it would replace the type of the metric being
|
|
182
|
+
// overridden - mergeSettings falls back to the existing one.
|
|
183
|
+
const existing = this.metrics.get(custom.name);
|
|
177
184
|
const merged = this.mergeSettings(custom, existing);
|
|
178
|
-
this.metrics.set(
|
|
185
|
+
this.metrics.set(merged.name, merged);
|
|
179
186
|
}
|
|
180
187
|
return this;
|
|
181
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/settings/builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/settings/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -1,2 +1,9 @@
|
|
|
1
1
|
import { IOInsights } from "@interopio/otel/insights";
|
|
2
2
|
export declare function reduceModality(data: IOInsights.MetricData, attributeSettings: IOInsights.MetricPublishingSettings["attributeSettings"]): IOInsights.MetricData;
|
|
3
|
+
/**
|
|
4
|
+
* Applies the attribute allow/drop lists of a metric to the (flattened) attributes of a value:
|
|
5
|
+
* with an allow list only what it names gets published, and whatever the drop list names never
|
|
6
|
+
* does - it wins over the allow list. Entries that are not strings are ignored; an allow list
|
|
7
|
+
* that is not an array is no allow list (an EMPTY one is: nothing gets published).
|
|
8
|
+
*/
|
|
9
|
+
export declare function filterAttributes(data: IOInsights.MetricData, allowAttributes: string[] | undefined | null, dropAttributes: string[] | undefined | null): IOInsights.MetricData;
|
package/dist/utils.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.reduceModality = reduceModality;
|
|
7
|
+
exports.filterAttributes = filterAttributes;
|
|
7
8
|
const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
|
|
8
9
|
function reduceModality(data, attributeSettings) {
|
|
9
10
|
var _a;
|
|
@@ -31,6 +32,38 @@ function reduceModality(data, attributeSettings) {
|
|
|
31
32
|
}
|
|
32
33
|
return data;
|
|
33
34
|
}
|
|
35
|
+
// an entry names an attribute - or, for nested data, everything under it: "bounds" covers
|
|
36
|
+
// "bounds.left" (attribute names are the flattened, dot-separated ones)
|
|
37
|
+
function isListed(key, list) {
|
|
38
|
+
return list.some((entry) => key === entry || key.indexOf(entry + ".") === 0);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Applies the attribute allow/drop lists of a metric to the (flattened) attributes of a value:
|
|
42
|
+
* with an allow list only what it names gets published, and whatever the drop list names never
|
|
43
|
+
* does - it wins over the allow list. Entries that are not strings are ignored; an allow list
|
|
44
|
+
* that is not an array is no allow list (an EMPTY one is: nothing gets published).
|
|
45
|
+
*/
|
|
46
|
+
function filterAttributes(data, allowAttributes, dropAttributes) {
|
|
47
|
+
if (!data) {
|
|
48
|
+
return data;
|
|
49
|
+
}
|
|
50
|
+
const allow = Array.isArray(allowAttributes) ? allowAttributes.filter((x) => typeof x === "string") : undefined;
|
|
51
|
+
const drop = Array.isArray(dropAttributes) ? dropAttributes.filter((x) => typeof x === "string") : [];
|
|
52
|
+
if (!allow && !drop.length) {
|
|
53
|
+
return data;
|
|
54
|
+
}
|
|
55
|
+
const toReturn = {};
|
|
56
|
+
for (const key of Object.keys(data)) {
|
|
57
|
+
if (allow && !isListed(key, allow)) {
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
if (isListed(key, drop)) {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
toReturn[key] = data[key];
|
|
64
|
+
}
|
|
65
|
+
return toReturn;
|
|
66
|
+
}
|
|
34
67
|
function simpleHash(str, len) {
|
|
35
68
|
let hash = 0x811c9dc5; // FNV-1a 32-bit offset basis
|
|
36
69
|
for (let i = 0; i < str.length; i++) {
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;AAGA,wCAyBC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|