@interopio/otel 0.0.23 → 0.0.24
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 +1 -1
- package/dist/builder.js.map +1 -1
- package/dist/traces/builder.d.ts +3 -3
- package/dist/traces/builder.js +6 -3
- package/dist/traces/builder.js.map +1 -1
- package/dist/traces/ioInsightsSampler.d.ts +2 -2
- package/dist/traces/ioInsightsSampler.js +4 -4
- package/dist/traces/ioInsightsSampler.js.map +1 -1
- package/dist/traces/manager.d.ts +4 -4
- package/dist/traces/manager.js +30 -30
- package/dist/traces/manager.js.map +1 -1
- package/dist/traces/nullTracesManager.d.ts +2 -2
- package/dist/traces/nullTracesManager.js +3 -3
- package/dist/traces/nullTracesManager.js.map +1 -1
- package/dist/traces/traces.d.ts +3 -3
- package/dist/traces/traces.js +5 -5
- package/dist/traces/traces.js.map +1 -1
- package/dist/traces/types.d.ts +7 -6
- package/dist/traces/types.js.map +1 -1
- package/dist/traces/utils/index.d.ts +4 -4
- package/dist/traces/utils/index.js +11 -11
- package/dist/traces/utils/index.js.map +1 -1
- package/dist/types.d.ts +9 -5
- package/dist/validation/traces/withSpan.d.ts +2 -2
- package/dist/validation/traces/withSpan.js +2 -2
- package/dist/validation/traces/withSpan.js.map +1 -1
- package/package.json +1 -1
package/dist/builder.js
CHANGED
|
@@ -61,7 +61,7 @@ class Builder {
|
|
|
61
61
|
}
|
|
62
62
|
buildCore() {
|
|
63
63
|
var _a, _b, _c;
|
|
64
|
-
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled)
|
|
64
|
+
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== false) {
|
|
65
65
|
if (((_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.metrics) === null || _c === void 0 ? void 0 : _c.enabled) &&
|
|
66
66
|
!this.metricsBuilder) {
|
|
67
67
|
throw new Error("metrics.enabled is true, but .withMetrics() method not called, metrics will be disabled.");
|
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,iBAC9B,SAAS,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,EACnC,WAAW,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,WAAW,EACvC,cAAc,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,EAC7C,eAAe,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,eAAe,EAC/C,MAAM,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,IAC1B,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,EACzB,CAAC;QACH,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,iBAC7B,SAAS,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,EACnC,WAAW,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,WAAW,EACvC,cAAc,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,cAAc,EAC7C,eAAe,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,eAAe,EAC/C,MAAM,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,EAC7B,OAAO,EAAE,KAAK,IACX,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,EACxB,CAAC;QAEH,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,KAAK;QACV,MAAM,SAAS,GAAG,IAAI,0BAAgB,EAAE,CAAC;QACzC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEO,SAAS;;QACf,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,MAAK,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/traces/builder.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { ContextManager, TracerProvider } from "@opentelemetry/api";
|
|
2
2
|
import { Logger } from "../logger/types";
|
|
3
|
-
import { TracesManager as ITracesManager, TracesSettings,
|
|
3
|
+
import { TracesManager as ITracesManager, TracesSettings, FilteringContext } from "./types";
|
|
4
4
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
5
5
|
export declare class TracesManagerBuilder implements TracesManagerBuilder {
|
|
6
6
|
logger: Logger;
|
|
7
7
|
settings: TracesSettings | undefined;
|
|
8
|
-
|
|
8
|
+
filteringContextGetter: (() => FilteringContext) | undefined;
|
|
9
9
|
tracerProvider: TracerProvider;
|
|
10
10
|
samplerGetter?: (defaultSampler: Sampler) => Sampler;
|
|
11
11
|
spanProcessors?: SpanProcessor[];
|
|
@@ -13,7 +13,7 @@ export declare class TracesManagerBuilder implements TracesManagerBuilder {
|
|
|
13
13
|
providerRegistrationSettings?: any;
|
|
14
14
|
withLogger(logger: Logger): this;
|
|
15
15
|
withSettings(settings?: TracesSettings): this;
|
|
16
|
-
|
|
16
|
+
withFilteringContextGetter(filteringContextGetter?: () => FilteringContext): this;
|
|
17
17
|
withTracerProvider(tracerProvider: TracerProvider): this;
|
|
18
18
|
withSamplerGetter(samplerGetter: (defaultSampler: Sampler) => Sampler): this;
|
|
19
19
|
withSpanProcessors(spanProcessors: SpanProcessor[]): this;
|
package/dist/traces/builder.js
CHANGED
|
@@ -12,8 +12,8 @@ class TracesManagerBuilder {
|
|
|
12
12
|
this.settings = settings;
|
|
13
13
|
return this;
|
|
14
14
|
}
|
|
15
|
-
|
|
16
|
-
this.
|
|
15
|
+
withFilteringContextGetter(filteringContextGetter) {
|
|
16
|
+
this.filteringContextGetter = filteringContextGetter;
|
|
17
17
|
return this;
|
|
18
18
|
}
|
|
19
19
|
withTracerProvider(tracerProvider) {
|
|
@@ -39,6 +39,9 @@ class TracesManagerBuilder {
|
|
|
39
39
|
}
|
|
40
40
|
withContextManager(contextManager) {
|
|
41
41
|
this.providerRegistrationSettings = Object.assign(Object.assign({}, this.providerRegistrationSettings), { contextManager });
|
|
42
|
+
if (this.settings) {
|
|
43
|
+
this.settings = Object.assign(Object.assign({}, this.settings), { useOTELContextManager: true });
|
|
44
|
+
}
|
|
42
45
|
return this;
|
|
43
46
|
}
|
|
44
47
|
build() {
|
|
@@ -52,7 +55,7 @@ class TracesManagerBuilder {
|
|
|
52
55
|
if (((_a = this.settings) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
|
|
53
56
|
return new nullTracesManager_1.NullTracesManager();
|
|
54
57
|
}
|
|
55
|
-
const manager = new manager_1.TracesManager(this.settings, this.logger, this.
|
|
58
|
+
const manager = new manager_1.TracesManager(this.settings, this.logger, this.filteringContextGetter || ((_b = this.settings) === null || _b === void 0 ? void 0 : _b.filteringContextGetter), this.tracerProvider || ((_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));
|
|
56
59
|
return manager;
|
|
57
60
|
}
|
|
58
61
|
}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,0BAA0B,CAAC,sBAA+C;QAC/E,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA8B;QACpD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,aAAmD;QAC1E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA+B;QACvD,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,iBAAiB,CAAC,aAA6B;QACpD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,gCAAgC,CAAC,4BAAiC;;QACvE,IAAI,CAAC,4BAA4B,mBAAK,cAAc,EAAE,MAAA,IAAI,CAAC,4BAA4B,0CAAE,cAAc,IAAK,4BAA4B,CAAE,CAAC;QAC3I,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB,CAAC,cAA8B;QACtD,IAAI,CAAC,4BAA4B,mCAAQ,IAAI,CAAC,4BAA4B,KAAE,cAAc,GAAE,CAAC;QAC7F,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,mCAAQ,IAAI,CAAC,QAAQ,KAAE,qBAAqB,EAAE,IAAI,GAAE,CAAC;SACnE;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK;QACV,gBAAgB;QAChB,kDAAkD;QAClD,4BAA4B;QAE5B,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEO,SAAS;;QACf,IAAI,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,MAAK,IAAI,EAAE;YACnC,OAAO,IAAI,qCAAiB,EAAE,CAAC;SAChC;QACD,MAAM,OAAO,GAAG,IAAI,uBAAa,CAC/B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,sBAAsB,KAAK,MAAA,IAAI,CAAC,QAAQ,0CAAE,sBAAsB,CAAA,EACrE,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;AAjFD,oDAiFC"}
|
|
@@ -5,9 +5,9 @@ import { Sampler, SamplingResult } from "@opentelemetry/sdk-trace-base";
|
|
|
5
5
|
export declare class ioInsightsSampler implements Sampler {
|
|
6
6
|
private settings;
|
|
7
7
|
private defaults?;
|
|
8
|
-
private
|
|
8
|
+
private filteringContextGetter?;
|
|
9
9
|
private logger?;
|
|
10
|
-
constructor(settings: SamplingSettings[], defaults?: TracesDefaultsSettings | undefined,
|
|
10
|
+
constructor(settings: SamplingSettings[], defaults?: TracesDefaultsSettings | undefined, filteringContextGetter?: (() => {
|
|
11
11
|
[key: string]: any;
|
|
12
12
|
}) | undefined, logger?: Logger | undefined);
|
|
13
13
|
shouldSample(context: Context, traceId: string, spanName: string, spanKind: SpanKind, attributes: Attributes, links: Link[]): SamplingResult;
|
|
@@ -19,15 +19,15 @@ const cyrb53 = (str, seed = 0) => {
|
|
|
19
19
|
return 4294967296 * (2097151 & h2) + (h1 >>> 0);
|
|
20
20
|
};
|
|
21
21
|
class ioInsightsSampler {
|
|
22
|
-
constructor(settings, defaults,
|
|
22
|
+
constructor(settings, defaults, filteringContextGetter, logger) {
|
|
23
23
|
this.settings = settings;
|
|
24
24
|
this.defaults = defaults;
|
|
25
|
-
this.
|
|
25
|
+
this.filteringContextGetter = filteringContextGetter;
|
|
26
26
|
this.logger = logger;
|
|
27
27
|
}
|
|
28
28
|
shouldSample(context, traceId, spanName, spanKind, attributes, links) {
|
|
29
29
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
30
|
-
const
|
|
30
|
+
const currentFilteringContext = ((_a = this.filteringContextGetter) === null || _a === void 0 ? void 0 : _a.call(null)) || {};
|
|
31
31
|
for (const setting of this.settings || []) {
|
|
32
32
|
let matched = true;
|
|
33
33
|
if (matched && setting.name) {
|
|
@@ -41,7 +41,7 @@ class ioInsightsSampler {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
if (matched && setting.context) {
|
|
44
|
-
if (!this.matchObjects("context", setting.context,
|
|
44
|
+
if (!this.matchObjects("context", setting.context, currentFilteringContext, true)) {
|
|
45
45
|
matched = false;
|
|
46
46
|
}
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ioInsightsSampler.js","sourceRoot":"","sources":["../../src/traces/ioInsightsSampler.ts"],"names":[],"mappings":";;;AAGA,kEAA0F;AAC1F,mCAAqC;AAErC,wFAAwF;AACxF,wBAAwB;AACxB,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,IAAI,GAAG,CAAC,EAAE,EAAE;IACrC,IAAI,EAAE,GAAG,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC;IACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;QACpC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;KACvC;IACD,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7C,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9C,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7C,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAE9C,OAAO,UAAU,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,MAAa,iBAAiB;IAE1B,YACY,QAA4B,EAC5B,QAAiC,EACjC,
|
|
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
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { Logger } from "../logger/types";
|
|
2
|
-
import { TracesManager as ITracesManager, PropagationInfo, PropagationInfoCarrier, TracesSettings,
|
|
2
|
+
import { TracesManager as ITracesManager, PropagationInfo, PropagationInfoCarrier, TracesSettings, FilteringContext, WithSpanCallback } from "./types";
|
|
3
3
|
import { TracerProvider, ContextManager } from "@opentelemetry/api";
|
|
4
4
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
5
5
|
export declare class TracesManager implements ITracesManager {
|
|
6
6
|
settings: TracesSettings;
|
|
7
7
|
private logger;
|
|
8
|
-
private
|
|
8
|
+
private filteringContextGetter;
|
|
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
14
|
private filters;
|
|
15
|
-
constructor(settings: TracesSettings, logger: Logger,
|
|
15
|
+
constructor(settings: TracesSettings, logger: Logger, filteringContextGetter: (() => FilteringContext) | undefined, tracerProvider?: TracerProvider, sampler?: (defaultSampler: Sampler) => Sampler, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
16
16
|
contextManager?: ContextManager;
|
|
17
17
|
});
|
|
18
|
-
withSpan<T>(source: string,
|
|
18
|
+
withSpan<T>(source: string, filteringContextOrCallback: FilteringContext | WithSpanCallback<T> | null, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T> | null, callback?: WithSpanCallback<T>): Promise<T>;
|
|
19
19
|
start(): Promise<void>;
|
|
20
20
|
stop(): Promise<void>;
|
|
21
21
|
}
|
package/dist/traces/manager.js
CHANGED
|
@@ -21,17 +21,17 @@ const withSpan_1 = require("../validation/traces/withSpan");
|
|
|
21
21
|
const nullTracingState_1 = require("./nullTracingState");
|
|
22
22
|
const traces_1 = __importDefault(require("./traces"));
|
|
23
23
|
class TracesManager {
|
|
24
|
-
constructor(settings, logger,
|
|
24
|
+
constructor(settings, logger, filteringContextGetter, tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings) {
|
|
25
25
|
this.settings = settings;
|
|
26
26
|
this.logger = logger;
|
|
27
|
-
this.
|
|
27
|
+
this.filteringContextGetter = filteringContextGetter;
|
|
28
28
|
this.started = false;
|
|
29
29
|
this.VERSION = "00";
|
|
30
30
|
this.DEFAULT_URL = "http://localhost:4318/v1/traces";
|
|
31
31
|
this.DEFAULT_USER = "unknown-user";
|
|
32
32
|
this.DEFAULT_SERVICE_NAME = "unknown-service-name";
|
|
33
|
-
this.
|
|
34
|
-
const defaultTracingEnv =
|
|
33
|
+
this.filteringContextGetter = filteringContextGetter || (() => ({}));
|
|
34
|
+
const defaultTracingEnv = filteringContextGetter === null || filteringContextGetter === void 0 ? void 0 : filteringContextGetter.call(this);
|
|
35
35
|
const replacedSettings = (0, utils_1.replacePlaceHolders)(settings, defaultTracingEnv);
|
|
36
36
|
this.settings = replacedSettings;
|
|
37
37
|
this.filters = this.settings.filters || [];
|
|
@@ -45,46 +45,46 @@ class TracesManager {
|
|
|
45
45
|
}
|
|
46
46
|
const validator = new manager_1.TracesManagerValidator();
|
|
47
47
|
validator.validate(this);
|
|
48
|
-
(0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.
|
|
48
|
+
(0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.filteringContextGetter, 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
49
|
traces_1.default.instance = this;
|
|
50
50
|
}
|
|
51
|
-
withSpan(source,
|
|
51
|
+
withSpan(source, filteringContextOrCallback, propagationInfoOrCallback, callback) {
|
|
52
52
|
var _a, _b, _c, _d, _e, _f;
|
|
53
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
54
|
const validator = new withSpan_1.TracesWithSpanValidator();
|
|
55
|
-
validator.validate(source,
|
|
56
|
-
let
|
|
57
|
-
if (!(0, utils_1.isFunctionType)(
|
|
58
|
-
|
|
55
|
+
validator.validate(source, filteringContextOrCallback, propagationInfoOrCallback, callback);
|
|
56
|
+
let filteringContext = {};
|
|
57
|
+
if (!(0, utils_1.isFunctionType)(filteringContextOrCallback)) {
|
|
58
|
+
filteringContext = Object.assign({}, filteringContextOrCallback);
|
|
59
59
|
}
|
|
60
|
-
const
|
|
61
|
-
if (!(
|
|
62
|
-
|
|
60
|
+
const fullFilteringContext = Object.assign(Object.assign({}, (_a = this.filteringContextGetter) === null || _a === void 0 ? void 0 : _a.call(this)), filteringContext);
|
|
61
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.user)) {
|
|
62
|
+
fullFilteringContext.user = this.settings.userId || this.DEFAULT_USER;
|
|
63
63
|
}
|
|
64
|
-
if (!(
|
|
65
|
-
|
|
64
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.userId)) {
|
|
65
|
+
fullFilteringContext.userId = this.settings.userId || this.DEFAULT_USER;
|
|
66
66
|
}
|
|
67
|
-
if (!(
|
|
68
|
-
|
|
67
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceName)) {
|
|
68
|
+
fullFilteringContext.serviceName = this.settings.serviceName || this.DEFAULT_SERVICE_NAME;
|
|
69
69
|
}
|
|
70
|
-
if (!(
|
|
71
|
-
|
|
70
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceId)) {
|
|
71
|
+
fullFilteringContext.serviceId = this.settings.serviceId;
|
|
72
72
|
}
|
|
73
|
-
if (!(
|
|
74
|
-
|
|
73
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.serviceVersion)) {
|
|
74
|
+
fullFilteringContext.serviceVersion = this.settings.serviceVersion;
|
|
75
75
|
}
|
|
76
|
-
if (!(
|
|
77
|
-
|
|
76
|
+
if (!(fullFilteringContext === null || fullFilteringContext === void 0 ? void 0 : fullFilteringContext.platformVersion)) {
|
|
77
|
+
fullFilteringContext.platformVersion = this.settings.platformVersion;
|
|
78
78
|
}
|
|
79
79
|
if (this.settings.filteringContext) {
|
|
80
80
|
for (const key in this.settings.filteringContext) {
|
|
81
|
-
if (!
|
|
82
|
-
|
|
81
|
+
if (!fullFilteringContext[key]) {
|
|
82
|
+
fullFilteringContext[key] = this.settings.filteringContext[key];
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
|
-
const match = this.filters.find((filter) => (0, utils_1.isFilterMatch)(filter,
|
|
87
|
-
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`beginSpan() source:${source} context:${
|
|
86
|
+
const match = this.filters.find((filter) => (0, utils_1.isFilterMatch)(filter, fullFilteringContext, source));
|
|
87
|
+
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`beginSpan() source:${source} context:${fullFilteringContext} ` +
|
|
88
88
|
(match
|
|
89
89
|
? "match: " + JSON.stringify(match)
|
|
90
90
|
: "default: " + JSON.stringify(this.settings.default)));
|
|
@@ -107,8 +107,8 @@ class TracesManager {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
let actualCallback;
|
|
110
|
-
if (typeof
|
|
111
|
-
actualCallback = callback =
|
|
110
|
+
if (typeof filteringContextOrCallback === "function") {
|
|
111
|
+
actualCallback = callback = filteringContextOrCallback;
|
|
112
112
|
}
|
|
113
113
|
else if (typeof propagationInfoOrCallback === "function") {
|
|
114
114
|
actualCallback = callback = propagationInfoOrCallback;
|
|
@@ -132,7 +132,7 @@ class TracesManager {
|
|
|
132
132
|
}
|
|
133
133
|
if ((match && match.addContextToTrace !== false) ||
|
|
134
134
|
(!match && ((_g = this.settings.default) === null || _g === void 0 ? void 0 : _g.addContextToTrace) !== false)) {
|
|
135
|
-
(0, utils_1.saveDataInAttribute)(
|
|
135
|
+
(0, utils_1.saveDataInAttribute)(fullFilteringContext, otelSpan);
|
|
136
136
|
}
|
|
137
137
|
try {
|
|
138
138
|
traces_1.default.currentTracingState = tracingState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAcA,4CAO4B;AAC5B,mCAOiB;AACjB,0DAAsE;AACtE,iDAA8C;AAC9C,4DAAwE;AAExE,yDAAsD;AACtD,sDAA8B;AAE9B,MAAa,aAAa;IAQxB,YACS,QAAwB,EACvB,MAAc,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Logger } from "../logger/types";
|
|
2
2
|
import { NullManager } from "../utils/nullManager";
|
|
3
|
-
import { PropagationInfo, PropagationInfoCarrier, TracesManager, TracesSettings,
|
|
3
|
+
import { PropagationInfo, PropagationInfoCarrier, TracesManager, TracesSettings, FilteringContext, WithSpanCallback } from "./types";
|
|
4
4
|
export declare class NullTracesManager extends NullManager<TracesSettings> implements TracesManager {
|
|
5
5
|
private _settings?;
|
|
6
6
|
private logger?;
|
|
7
7
|
get settings(): TracesSettings;
|
|
8
8
|
set settings(value: TracesSettings);
|
|
9
9
|
constructor(_settings?: TracesSettings | undefined, logger?: Logger | undefined);
|
|
10
|
-
withSpan<T>(source: string,
|
|
10
|
+
withSpan<T>(source: string, filteringContextOrCallback: FilteringContext | WithSpanCallback<T> | null, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T> | null, callback?: WithSpanCallback<T>): Promise<T>;
|
|
11
11
|
}
|
|
@@ -19,12 +19,12 @@ class NullTracesManager extends nullManager_1.NullManager {
|
|
|
19
19
|
this._settings = _settings;
|
|
20
20
|
this.logger = logger;
|
|
21
21
|
}
|
|
22
|
-
withSpan(source,
|
|
22
|
+
withSpan(source, filteringContextOrCallback, propagationInfoOrCallback, callback) {
|
|
23
23
|
var _a;
|
|
24
24
|
const actualCallback =
|
|
25
25
|
// eslint-disable-next-line no-nested-ternary
|
|
26
|
-
typeof
|
|
27
|
-
?
|
|
26
|
+
typeof filteringContextOrCallback === "function"
|
|
27
|
+
? filteringContextOrCallback
|
|
28
28
|
: typeof propagationInfoOrCallback === "function"
|
|
29
29
|
? propagationInfoOrCallback
|
|
30
30
|
: callback;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullTracesManager.js","sourceRoot":"","sources":["../../src/traces/nullTracesManager.ts"],"names":[],"mappings":";;;;;;AACA,sDAAmD;AACnD,yDAAsD;AACtD,sDAA8B;AAU9B,MAAa,iBAAkB,SAAQ,yBAA2B;IAChE,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,IAAK,EAAqB,CAAC;IAClD,CAAC;IACD,IAAW,QAAQ,CAAC,KAAqB;QACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IACD,YAAoB,SAA0B,EAAU,MAAe;QACrE,KAAK,EAAE,CAAC;QADU,cAAS,GAAT,SAAS,CAAiB;QAAU,WAAM,GAAN,MAAM,CAAS;IAEvE,CAAC;IAED,QAAQ,CACN,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"nullTracesManager.js","sourceRoot":"","sources":["../../src/traces/nullTracesManager.ts"],"names":[],"mappings":";;;;;;AACA,sDAAmD;AACnD,yDAAsD;AACtD,sDAA8B;AAU9B,MAAa,iBAAkB,SAAQ,yBAA2B;IAChE,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,SAAS,IAAK,EAAqB,CAAC;IAClD,CAAC;IACD,IAAW,QAAQ,CAAC,KAAqB;QACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IACD,YAAoB,SAA0B,EAAU,MAAe;QACrE,KAAK,EAAE,CAAC;QADU,cAAS,GAAT,SAAS,CAAiB;QAAU,WAAM,GAAN,MAAM,CAAS;IAEvE,CAAC;IAED,QAAQ,CACN,MAAc,EACd,0BAAyE,EACzE,yBAIQ,EACR,QAA8B;;QAE9B,MAAM,cAAc;QAClB,6CAA6C;QAC7C,OAAO,0BAA0B,KAAK,UAAU;YAC9C,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,OAAO,yBAAyB,KAAK,UAAU;gBACjD,CAAC,CAAC,yBAAyB;gBAC3B,CAAC,CAAC,QAAQ,CAAC;QAEf,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,8BAA8B,GAAG,MAAM,CAAC,CAAC;QAE5D,sCAAsC;QACtC,kDAAkD;QAClD,mCAAmC;QACnC,qCAAqC;QACrC,sDAAsD;QACtD,iEAAiE;QACjE,MAAM;QACN,gFAAgF;QAChF,WAAW;QACX,4EAA4E;QAC5E,IAAI;QAEJ,yDAAyD;QACzD,MAAM,GAAG,GAAG,IAAI,mCAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE/C,gBAAM,CAAC,mBAAmB,GAAG,GAAG,CAAC;QACjC,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;SAC7C;gBAAS;YACR,gBAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC;SACnC;IACH,CAAC;CACF;AAzDD,8CAyDC"}
|
package/dist/traces/traces.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PropagationInfo, PropagationInfoCarrier, TracesManager,
|
|
1
|
+
import { PropagationInfo, PropagationInfoCarrier, TracesManager, FilteringContext, TracingState, WithSpanCallback } from "./types";
|
|
2
2
|
/**
|
|
3
3
|
* Null-safe singleton class that can be invoked even if you haven't initialized
|
|
4
4
|
* the library (yet?), or if you don't have access to the current manager instance.
|
|
@@ -20,7 +20,7 @@ export default class Traces {
|
|
|
20
20
|
};
|
|
21
21
|
}): any;
|
|
22
22
|
static withSpan<T>(source: string, callback: WithSpanCallback<T>): Promise<T>;
|
|
23
|
-
static withSpan<T>(source: string,
|
|
24
|
-
static withSpan<T>(source: string,
|
|
23
|
+
static withSpan<T>(source: string, filteringContext: FilteringContext | any, callback: WithSpanCallback<T>): Promise<T>;
|
|
24
|
+
static withSpan<T>(source: string, filteringContextOrCallback: FilteringContext | WithSpanCallback<T> | any, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T> | null, callback?: WithSpanCallback<T>): Promise<T>;
|
|
25
25
|
}
|
|
26
26
|
export declare const withSpan: typeof Traces.withSpan;
|
package/dist/traces/traces.js
CHANGED
|
@@ -39,22 +39,22 @@ class Traces {
|
|
|
39
39
|
return null;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
static withSpan(source,
|
|
42
|
+
static withSpan(source, filteringContextOrCallback, propagationInfoOrCallback, callback) {
|
|
43
43
|
// decorator
|
|
44
|
-
if ((!
|
|
44
|
+
if ((!filteringContextOrCallback || filteringContextOrCallback.argMapping || filteringContextOrCallback.thisMapping) &&
|
|
45
45
|
!propagationInfoOrCallback &&
|
|
46
46
|
!callback) {
|
|
47
47
|
return function (target, propertyKey, descriptor) {
|
|
48
48
|
const originalFn = descriptor.value;
|
|
49
49
|
descriptor.value = function (...args) {
|
|
50
|
-
return Traces.withSpan(((source.slice(-1) === ".") ? source + propertyKey : source),
|
|
51
|
-
? Object.assign({}, (0, utils_1.
|
|
50
|
+
return Traces.withSpan(((source.slice(-1) === ".") ? source + propertyKey : source), filteringContextOrCallback
|
|
51
|
+
? Object.assign({}, (0, utils_1.extractFilteringContextFromArgs)(filteringContextOrCallback, args, this)) : {}, () => {
|
|
52
52
|
return originalFn.apply(this, args);
|
|
53
53
|
});
|
|
54
54
|
};
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
|
-
return Traces.instance.withSpan(source,
|
|
57
|
+
return Traces.instance.withSpan(source, filteringContextOrCallback, propagationInfoOrCallback, callback);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
exports.default = Traces;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"traces.js","sourceRoot":"","sources":["../../src/traces/traces.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,kBAAkB;AAClB,2DAAwD;AACxD,yDAAsD;AAStD,mCAA0D;AAE1D;;;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;IAqBD,MAAM,CAAC,QAAQ,CACb,MAAc,EACd,0BAIS,EACT,yBAAiG,EACjG,QAA8B;QAE9B,YAAY;QACZ,IACE,CAAC,CAAC,0BAA0B,IAAI,0BAA0B,CAAC,UAAU,IAAI,0BAA0B,CAAC,WAAW,CAAC;YAChH,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,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,EAC5D,0BAA0B;wBACxB,CAAC,mBAAM,IAAA,uCAA+B,EAAC,0BAA0B,EAAE,IAAI,EAAE,IAAI,CAAC,EAC9E,CAAC,CAAC,EAAG,EACP,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,0BAAiC,EACjC,yBAAgC,EAChC,QAAe,CAChB,CAAC;IACJ,CAAC;;AA9FH,yBA+FC;AA7FgB,gBAAS,GAAkB,IAAI,qCAAiB,EAAE,CAAC;AA+FvD,QAAA,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC"}
|
package/dist/traces/types.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ import { OTLPExporterNodeConfigBase } from "@opentelemetry/otlp-exporter-base";
|
|
|
5
5
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
6
6
|
export interface TracesManager extends Manager<TracesSettings> {
|
|
7
7
|
withSpan<T>(source: string, callback: WithSpanCallback<T>): Promise<T>;
|
|
8
|
-
withSpan<T>(source: string,
|
|
9
|
-
withSpan<T>(source: string,
|
|
8
|
+
withSpan<T>(source: string, filteringContext: FilteringContext | null, callback: WithSpanCallback<T>): Promise<T>;
|
|
9
|
+
withSpan<T>(source: string, filteringContext: FilteringContext | null, propagationInfo: PropagationInfo | PropagationInfoCarrier | null, callback: WithSpanCallback<T>): Promise<T>;
|
|
10
10
|
}
|
|
11
11
|
export type WithSpanCallback<T> = (tracingState: TracingState) => T | Promise<T>;
|
|
12
12
|
export interface PropagationInfo {
|
|
@@ -53,9 +53,10 @@ export type AttributeArray = Array<null | undefined | string> | Array<null | und
|
|
|
53
53
|
export interface AttributeData {
|
|
54
54
|
[key: string]: string | number | boolean | undefined | AttributeArray | unknown[] | object;
|
|
55
55
|
}
|
|
56
|
-
export interface
|
|
56
|
+
export interface FilteringContext {
|
|
57
57
|
app?: string;
|
|
58
58
|
user?: string;
|
|
59
|
+
host?: string;
|
|
59
60
|
serviceName?: string;
|
|
60
61
|
serviceId?: string;
|
|
61
62
|
platformVersion?: string;
|
|
@@ -83,7 +84,7 @@ export interface Filter {
|
|
|
83
84
|
*/
|
|
84
85
|
source?: string;
|
|
85
86
|
/**
|
|
86
|
-
* Specifies the context values used for matching spans.
|
|
87
|
+
* Specifies the filtering context values used for matching spans.
|
|
87
88
|
* Spans match only if all the values in this object match
|
|
88
89
|
* the context values returned by the context getter callback
|
|
89
90
|
* and the filteringContext config property.
|
|
@@ -283,7 +284,7 @@ export interface TracesSettings {
|
|
|
283
284
|
/**
|
|
284
285
|
* Builder overrides
|
|
285
286
|
*/
|
|
286
|
-
|
|
287
|
+
filteringContextGetter?: (() => FilteringContext) | undefined;
|
|
287
288
|
tracerProvider?: TracerProvider;
|
|
288
289
|
samplerGetter?: (defaultSampler: Sampler) => Sampler;
|
|
289
290
|
spanProcessors?: SpanProcessor[];
|
|
@@ -331,6 +332,6 @@ export interface TracesManagerBuilder {
|
|
|
331
332
|
build(): TracesManager;
|
|
332
333
|
withLogger(logger: Logger): this;
|
|
333
334
|
withSettings(settings: TracesSettings): this;
|
|
334
|
-
|
|
335
|
+
withFilteringContextGetter(filteringContextGetter?: () => FilteringContext): this;
|
|
335
336
|
withTracerProvider(tracerProvider: TracerProvider): this;
|
|
336
337
|
}
|
package/dist/traces/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/traces/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/traces/types.ts"],"names":[],"mappings":";;;AAoGA,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,uCAAG,CAAA;IACH,6CAAM,CAAA;IACN,qDAAU,CAAA;IACV,2CAAK,CAAA;IACL,yCAAI,CAAA;IACJ,yCAAI,CAAA;IACJ,+CAAO,CAAA;AACT,CAAC,EARW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAQpB"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { Sampler, SpanExporter, SpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
2
2
|
import { ContextManager, TracerProvider } from "@opentelemetry/api";
|
|
3
|
-
import { Filter, TracesDefaultsSettings, TracesSettings
|
|
3
|
+
import { Filter, FilteringContext, TracesDefaultsSettings, TracesSettings } 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;
|
|
7
|
-
export declare const isFilterMatch: (filter: Filter, context:
|
|
7
|
+
export declare const isFilterMatch: (filter: Filter, context: FilteringContext, source: string) => boolean;
|
|
8
8
|
export declare const setTracerProvider: (tracerProvider?: TracerProvider, sampler?: ((defaultSampler: Sampler) => Sampler) | undefined, spanProcessors?: SpanProcessor[], spanExporters?: SpanExporter[], providerRegistrationSettings?: {
|
|
9
9
|
contextManager?: ContextManager;
|
|
10
|
-
},
|
|
10
|
+
}, filteringContextGetter?: () => FilteringContext, logger?: Logger, settings?: TracesSettings) => void;
|
|
11
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: {
|
|
15
15
|
[x: string]: any;
|
|
16
16
|
}, path: any) => any;
|
|
17
|
-
export declare const
|
|
17
|
+
export declare const extractFilteringContextFromArgs: (template: {
|
|
18
18
|
argMapping?: {
|
|
19
19
|
[x: string]: string;
|
|
20
20
|
} | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.extractFilteringContextFromArgs = exports.deep_value = exports.isFunctionType = exports.replacePlaceHolders = exports.saveDataInAttribute = exports.setTracerProvider = exports.isFilterMatch = exports.isSpanEnabled = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
5
|
const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
|
|
6
6
|
const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
|
|
@@ -65,13 +65,13 @@ const isFilterMatch = (filter, context, source) => {
|
|
|
65
65
|
return isMatch;
|
|
66
66
|
};
|
|
67
67
|
exports.isFilterMatch = isFilterMatch;
|
|
68
|
-
const setTracerProvider = (tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings,
|
|
68
|
+
const setTracerProvider = (tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, filteringContextGetter, logger, settings) => {
|
|
69
69
|
if (!tracerProvider && !settings) {
|
|
70
70
|
throw new Error("Required arguments not provided");
|
|
71
71
|
}
|
|
72
72
|
if (!tracerProvider) {
|
|
73
73
|
const defaultSampler = new sdk_trace_base_1.ParentBasedSampler({
|
|
74
|
-
root: new ioInsightsSampler_1.ioInsightsSampler((settings === null || settings === void 0 ? void 0 : settings.sampling) || [], settings === null || settings === void 0 ? void 0 : settings.default,
|
|
74
|
+
root: new ioInsightsSampler_1.ioInsightsSampler((settings === null || settings === void 0 ? void 0 : settings.sampling) || [], settings === null || settings === void 0 ? void 0 : settings.default, filteringContextGetter, logger),
|
|
75
75
|
});
|
|
76
76
|
const btProvider = (tracerProvider = new sdk_trace_base_1.BasicTracerProvider({
|
|
77
77
|
sampler: typeof sampler === "function" ? sampler(defaultSampler) : defaultSampler,
|
|
@@ -198,25 +198,25 @@ const deep_value = function (obj, path) {
|
|
|
198
198
|
};
|
|
199
199
|
exports.deep_value = deep_value;
|
|
200
200
|
// https://stackoverflow.com/a/8817473
|
|
201
|
-
const
|
|
202
|
-
const
|
|
201
|
+
const extractFilteringContextFromArgs = (template, args, that) => {
|
|
202
|
+
const filteringContext = {};
|
|
203
203
|
Object.keys(template.argMapping || {}).forEach((keyOrPath) => {
|
|
204
204
|
if (!keyOrPath || !template.argMapping) {
|
|
205
205
|
return;
|
|
206
206
|
}
|
|
207
|
-
const
|
|
208
|
-
|
|
207
|
+
const filteringContextKey = template.argMapping[keyOrPath];
|
|
208
|
+
filteringContext[filteringContextKey] = (0, exports.deep_value)(args, keyOrPath);
|
|
209
209
|
});
|
|
210
210
|
Object.keys(template.thisMapping || {}).forEach((keyOrPath) => {
|
|
211
211
|
if (!keyOrPath || !template.thisMapping) {
|
|
212
212
|
return;
|
|
213
213
|
}
|
|
214
|
-
const
|
|
215
|
-
|
|
214
|
+
const filteringContextKey = template.thisMapping[keyOrPath];
|
|
215
|
+
filteringContext[filteringContextKey] = (0, exports.deep_value)(that, keyOrPath);
|
|
216
216
|
});
|
|
217
|
-
return
|
|
217
|
+
return filteringContext;
|
|
218
218
|
};
|
|
219
|
-
exports.
|
|
219
|
+
exports.extractFilteringContextFromArgs = extractFilteringContextFromArgs;
|
|
220
220
|
// { argMapping: { 0: "method", "1.instance": "instance", "3": "cow" }}
|
|
221
221
|
// raise("TestMethod", {instance: "123"}, "boo", 999)
|
|
222
222
|
// withSpan("...", { method: "TestMethod", "instance": "123", cow: 999 })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/traces/utils/index.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,sFAA4E;AAC5E,kEAQuC;AAEvC,wDAAoD;
|
|
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
|
@@ -25,28 +25,32 @@ export interface Settings {
|
|
|
25
25
|
failOnInitError?: boolean;
|
|
26
26
|
/**
|
|
27
27
|
* If provided, this value will be added to the metrics and span attributes
|
|
28
|
-
* and to the span filtering context (see 'filters').
|
|
28
|
+
* and to the span filtering context (see 'filters' in TracesSettings).
|
|
29
29
|
*/
|
|
30
30
|
platformVersion?: string;
|
|
31
31
|
/**
|
|
32
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
|
|
33
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library with
|
|
34
|
+
* a different setting.
|
|
34
35
|
*/
|
|
35
36
|
serviceName?: string;
|
|
36
37
|
/**
|
|
37
38
|
* 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
|
|
39
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library with
|
|
40
|
+
* a different setting.
|
|
39
41
|
*/
|
|
40
42
|
serviceId?: string;
|
|
41
43
|
/**
|
|
42
44
|
* 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
|
|
45
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library with
|
|
46
|
+
* a different setting.
|
|
44
47
|
* attribute.
|
|
45
48
|
*/
|
|
46
49
|
serviceVersion?: string;
|
|
47
50
|
/**
|
|
48
51
|
* 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
|
|
52
|
+
* unless an OTEL service object (e.g. TraceProvider) has been provided to the library with
|
|
53
|
+
* a different setting.
|
|
50
54
|
*/
|
|
51
55
|
userId?: string;
|
|
52
56
|
traces?: TracesSettings;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PropagationInfo, PropagationInfoCarrier,
|
|
1
|
+
import { PropagationInfo, PropagationInfoCarrier, FilteringContext, WithSpanCallback } from "../../traces/types";
|
|
2
2
|
export declare class TracesWithSpanValidator {
|
|
3
|
-
validate<T>(source: string,
|
|
3
|
+
validate<T>(source: string, filteringContextOrCallback: FilteringContext | WithSpanCallback<T> | null, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T> | null, callback?: WithSpanCallback<T>): void;
|
|
4
4
|
}
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TracesWithSpanValidator = void 0;
|
|
4
4
|
const utils_1 = require("../../traces/utils");
|
|
5
5
|
class TracesWithSpanValidator {
|
|
6
|
-
validate(source,
|
|
6
|
+
validate(source, filteringContextOrCallback, propagationInfoOrCallback, callback) {
|
|
7
7
|
if (!source) {
|
|
8
8
|
throw new Error("Missing required argument 'source' in withSpan(). Expected a string.");
|
|
9
9
|
}
|
|
10
10
|
if (!callback &&
|
|
11
|
-
!(0, utils_1.isFunctionType)(
|
|
11
|
+
!(0, utils_1.isFunctionType)(filteringContextOrCallback) &&
|
|
12
12
|
!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
|
|
13
13
|
throw new Error("Missing required argument 'callback' in withSpan(). Expected a function.");
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withSpan.js","sourceRoot":"","sources":["../../../src/validation/traces/withSpan.ts"],"names":[],"mappings":";;;AAMA,8CAAoD;AAEpD,MAAa,uBAAuB;IAC3B,QAAQ,CACb,MAAc,EACd,
|
|
1
|
+
{"version":3,"file":"withSpan.js","sourceRoot":"","sources":["../../../src/validation/traces/withSpan.ts"],"names":[],"mappings":";;;AAMA,8CAAoD;AAEpD,MAAa,uBAAuB;IAC3B,QAAQ,CACb,MAAc,EACd,0BAAyE,EACzE,yBAAiG,EACjG,QAA8B;QAE9B,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;SACzF;QACD,IACE,CAAC,QAAQ;YACT,CAAC,IAAA,sBAAc,EAAC,0BAA0B,CAAC;YAC3C,CAAC,IAAA,sBAAc,EAAC,yBAAyB,CAAC,EAC1C;YACA,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;SAC7F;IACH,CAAC;CACF;AAlBD,0DAkBC"}
|