@interopio/otel 0.0.26 → 0.0.28
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/traces/manager.js +14 -18
- package/dist/traces/manager.js.map +1 -1
- package/dist/traces/nullTracesManager.js +1 -1
- package/dist/traces/nullTracesManager.js.map +1 -1
- package/dist/traces/nullTracingState.d.ts +2 -1
- package/dist/traces/nullTracingState.js +3 -2
- package/dist/traces/nullTracingState.js.map +1 -1
- package/dist/traces/traces.d.ts +2 -1
- package/dist/traces/traces.js +7 -4
- package/dist/traces/traces.js.map +1 -1
- package/dist/traces/tracingState.d.ts +2 -1
- package/dist/traces/tracingState.js +9 -2
- package/dist/traces/tracingState.js.map +1 -1
- package/dist/traces/types.d.ts +25 -7
- package/dist/traces/types.js.map +1 -1
- package/package.json +1 -1
package/dist/traces/manager.js
CHANGED
|
@@ -49,7 +49,7 @@ class TracesManager {
|
|
|
49
49
|
traces_1.default.instance = this;
|
|
50
50
|
}
|
|
51
51
|
withSpan(source, filteringContextOrCallback, propagationInfoOrCallback, callback) {
|
|
52
|
-
var _a, _b, _c, _d, _e, _f;
|
|
52
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
53
53
|
const validator = new withSpan_1.TracesWithSpanValidator();
|
|
54
54
|
validator.validate(source, filteringContextOrCallback, propagationInfoOrCallback, callback);
|
|
55
55
|
let filteringContext = {};
|
|
@@ -118,17 +118,14 @@ class TracesManager {
|
|
|
118
118
|
}
|
|
119
119
|
if (enabled) {
|
|
120
120
|
const tracer = api_1.trace.getTracer(source);
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
var _a, _b, _c;
|
|
125
|
-
const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION);
|
|
121
|
+
return tracer.startActiveSpan(source, (_h = (_e = match === null || match === void 0 ? void 0 : match.spanOptions) !== null && _e !== void 0 ? _e : (_g = (_f = this.settings) === null || _f === void 0 ? void 0 : _f.default) === null || _g === void 0 ? void 0 : _g.spanOptions) !== null && _h !== void 0 ? _h : {}, activeContext, (otelSpan) => {
|
|
122
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
123
|
+
const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION, (_d = (_a = match === null || match === void 0 ? void 0 : match.disablePropagation) !== null && _a !== void 0 ? _a : (_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.disablePropagation) !== null && _d !== void 0 ? _d : false);
|
|
126
124
|
traces_1.default.currentTracingState = tracingState;
|
|
127
125
|
if (this.settings.platformVersion) {
|
|
128
126
|
(0, utils_1.saveDataInAttribute)({ platformVersion: this.settings.platformVersion }, otelSpan);
|
|
129
127
|
}
|
|
130
|
-
if ((match
|
|
131
|
-
(!match && ((_a = this.settings.default) === null || _a === void 0 ? void 0 : _a.addContextToTrace) !== false)) {
|
|
128
|
+
if ((_g = (_e = match === null || match === void 0 ? void 0 : match.addContextToTrace) !== null && _e !== void 0 ? _e : (_f = this.settings.default) === null || _f === void 0 ? void 0 : _f.addContextToTrace) !== null && _g !== void 0 ? _g : true) {
|
|
132
129
|
(0, utils_1.saveDataInAttribute)(fullFilteringContext, otelSpan);
|
|
133
130
|
}
|
|
134
131
|
try {
|
|
@@ -137,10 +134,9 @@ class TracesManager {
|
|
|
137
134
|
if (result instanceof Promise) {
|
|
138
135
|
return result
|
|
139
136
|
.then((resultResult) => {
|
|
140
|
-
var _a, _b;
|
|
137
|
+
var _a, _b, _c, _d;
|
|
141
138
|
if (tracingState.status.code === api_1.SpanStatusCode.UNSET) {
|
|
142
|
-
if ((match
|
|
143
|
-
(!match && ((_b = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.default) === null || _b === void 0 ? void 0 : _b.autoSetSuccessStatus))) {
|
|
139
|
+
if ((_d = (_a = match === null || match === void 0 ? void 0 : match.autoSetSuccessStatus) !== null && _a !== void 0 ? _a : (_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.autoSetSuccessStatus) !== null && _d !== void 0 ? _d : true) {
|
|
144
140
|
otelSpan.setStatus({ code: api_1.SpanStatusCode.OK });
|
|
145
141
|
}
|
|
146
142
|
}
|
|
@@ -153,11 +149,13 @@ class TracesManager {
|
|
|
153
149
|
});
|
|
154
150
|
otelSpan.recordException(err);
|
|
155
151
|
throw err;
|
|
152
|
+
})
|
|
153
|
+
.finally(() => {
|
|
154
|
+
otelSpan.end();
|
|
156
155
|
});
|
|
157
156
|
}
|
|
158
157
|
if (tracingState.status.code === api_1.SpanStatusCode.UNSET) {
|
|
159
|
-
if ((match
|
|
160
|
-
(!match && ((_c = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.autoSetSuccessStatus))) {
|
|
158
|
+
if ((_l = (_h = match === null || match === void 0 ? void 0 : match.autoSetSuccessStatus) !== null && _h !== void 0 ? _h : (_k = (_j = this.settings) === null || _j === void 0 ? void 0 : _j.default) === null || _k === void 0 ? void 0 : _k.autoSetSuccessStatus) !== null && _l !== void 0 ? _l : true) {
|
|
161
159
|
otelSpan.setStatus({ code: api_1.SpanStatusCode.OK });
|
|
162
160
|
}
|
|
163
161
|
}
|
|
@@ -170,19 +168,17 @@ class TracesManager {
|
|
|
170
168
|
code: api_1.SpanStatusCode.ERROR,
|
|
171
169
|
});
|
|
172
170
|
otelSpan.recordException(err);
|
|
171
|
+
otelSpan.end();
|
|
173
172
|
throw err;
|
|
174
173
|
}
|
|
175
174
|
finally {
|
|
176
|
-
// we implicitly call otelSpan.end()
|
|
177
|
-
otelSpan.end();
|
|
178
175
|
traces_1.default.currentTracingState = null;
|
|
179
176
|
}
|
|
180
177
|
});
|
|
181
178
|
}
|
|
182
179
|
else {
|
|
183
180
|
let extractedPI = null;
|
|
184
|
-
if ((match === null || match === void 0 ? void 0 : match.
|
|
185
|
-
((match === null || match === void 0 ? void 0 : match.stopPropagation) !== false && ((_f = (_e = this.settings) === null || _e === void 0 ? void 0 : _e.default) === null || _f === void 0 ? void 0 : _f.stopPropagation))) {
|
|
181
|
+
if ((_m = (_j = match === null || match === void 0 ? void 0 : match.stopPropagationIfSpanIsDisabled) !== null && _j !== void 0 ? _j : (_l = (_k = this.settings) === null || _k === void 0 ? void 0 : _k.default) === null || _l === void 0 ? void 0 : _l.stopPropagationIfSpanIsDisabled) !== null && _m !== void 0 ? _m : false) {
|
|
186
182
|
if (propagationInfoOrCallback) {
|
|
187
183
|
let propagationInfoCarrier = {};
|
|
188
184
|
if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
|
|
@@ -191,7 +187,7 @@ class TracesManager {
|
|
|
191
187
|
extractedPI = traces_1.default.extractPropagationInfo(propagationInfoCarrier);
|
|
192
188
|
}
|
|
193
189
|
}
|
|
194
|
-
const nts = new nullTracingState_1.NullTracingState(source, extractedPI);
|
|
190
|
+
const nts = new nullTracingState_1.NullTracingState(source, extractedPI, (_q = (_p = (_o = this.settings) === null || _o === void 0 ? void 0 : _o.default) === null || _p === void 0 ? void 0 : _p.disablePropagation) !== null && _q !== void 0 ? _q : false);
|
|
195
191
|
traces_1.default.currentTracingState = nts;
|
|
196
192
|
try {
|
|
197
193
|
return Promise.resolve(actualCallback(nts));
|
|
@@ -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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"}
|
|
@@ -44,7 +44,7 @@ class NullTracesManager extends nullManager_1.NullManager {
|
|
|
44
44
|
// extractedPI = Traces.currentTracingState?.getPropagationInfo() || null;
|
|
45
45
|
// }
|
|
46
46
|
// const nts = new NullTracingState(source, extractedPI);
|
|
47
|
-
const nts = new nullTracingState_1.NullTracingState(source, null);
|
|
47
|
+
const nts = new nullTracingState_1.NullTracingState(source, null, true);
|
|
48
48
|
traces_1.default.currentTracingState = nts;
|
|
49
49
|
try {
|
|
50
50
|
return Promise.resolve(actualCallback(nts));
|
|
@@ -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,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,yEAAyE;QACzE,WAAW;QACX,4EAA4E;QAC5E,IAAI;QAEJ,yDAAyD;QACzD,MAAM,GAAG,GAAG,IAAI,mCAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;
|
|
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,yEAAyE;QACzE,WAAW;QACX,4EAA4E;QAC5E,IAAI;QAEJ,yDAAyD;QACzD,MAAM,GAAG,GAAG,IAAI,mCAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAErD,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"}
|
|
@@ -3,7 +3,8 @@ import { Exception, TimeInput, Attributes } from "@opentelemetry/api";
|
|
|
3
3
|
export declare class NullTracingState implements ITracingState {
|
|
4
4
|
source: string;
|
|
5
5
|
private propagationInfo;
|
|
6
|
-
|
|
6
|
+
private disablePropagation;
|
|
7
|
+
constructor(source: string, propagationInfo: PropagationInfo | null, disablePropagation: boolean);
|
|
7
8
|
level: "OFF";
|
|
8
9
|
endSpan(): Promise<void>;
|
|
9
10
|
get enabled(): boolean;
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NullTracingState = void 0;
|
|
4
4
|
class NullTracingState {
|
|
5
|
-
constructor(source, propagationInfo) {
|
|
5
|
+
constructor(source, propagationInfo, disablePropagation) {
|
|
6
6
|
this.source = source;
|
|
7
7
|
this.propagationInfo = propagationInfo;
|
|
8
|
+
this.disablePropagation = disablePropagation;
|
|
8
9
|
this.level = "OFF";
|
|
9
10
|
}
|
|
10
11
|
endSpan() {
|
|
@@ -46,7 +47,7 @@ class NullTracingState {
|
|
|
46
47
|
// return propagationInfo;
|
|
47
48
|
}
|
|
48
49
|
injectPropagationInfo(carrier) {
|
|
49
|
-
if (this.propagationInfo) {
|
|
50
|
+
if (this.propagationInfo && !this.disablePropagation) {
|
|
50
51
|
carrier.__interopIOTracePropagationInfo = this.propagationInfo;
|
|
51
52
|
}
|
|
52
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nullTracingState.js","sourceRoot":"","sources":["../../src/traces/nullTracingState.ts"],"names":[],"mappings":";;;AAeA,MAAa,gBAAgB;IAC3B,
|
|
1
|
+
{"version":3,"file":"nullTracingState.js","sourceRoot":"","sources":["../../src/traces/nullTracingState.ts"],"names":[],"mappings":";;;AAeA,MAAa,gBAAgB;IAC3B,YACS,MAAc,EACb,eAAuC,EACvC,kBAA2B;QAF5B,WAAM,GAAN,MAAM,CAAQ;QACb,oBAAe,GAAf,eAAe,CAAwB;QACvC,uBAAkB,GAAlB,kBAAkB,CAAS;QAErC,UAAK,GAAG,KAAc,CAAC;IAFiB,CAAC;IAIlC,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,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACpD,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC,eAAe,CAAC;SAChE;IACH,CAAC;CACF;AA7DD,4CA6DC"}
|
package/dist/traces/traces.d.ts
CHANGED
|
@@ -10,7 +10,8 @@ export default class Traces {
|
|
|
10
10
|
private static _currentTracingState;
|
|
11
11
|
static get currentTracingState(): TracingState;
|
|
12
12
|
static set currentTracingState(value: TracingState | null);
|
|
13
|
-
static
|
|
13
|
+
static removePropagationInfo(propagationInfoCarrier: PropagationInfo | PropagationInfoCarrier | null | undefined): PropagationInfo | PropagationInfoCarrier | null | undefined;
|
|
14
|
+
static extractPropagationInfo(propagationInfoCarrier: PropagationInfo | PropagationInfoCarrier | null | undefined, deleteProperty?: boolean | undefined): PropagationInfo | null;
|
|
14
15
|
static withSpan(root: string, decoratorOptions?: {
|
|
15
16
|
argMapping?: {
|
|
16
17
|
[x: string]: string;
|
package/dist/traces/traces.js
CHANGED
|
@@ -18,17 +18,20 @@ class Traces {
|
|
|
18
18
|
Traces._instance = value;
|
|
19
19
|
}
|
|
20
20
|
static get currentTracingState() {
|
|
21
|
-
return Traces._currentTracingState || new nullTracingState_1.NullTracingState("unknown", null);
|
|
21
|
+
return Traces._currentTracingState || new nullTracingState_1.NullTracingState("unknown", null, true);
|
|
22
22
|
}
|
|
23
23
|
static set currentTracingState(value) {
|
|
24
24
|
Traces._currentTracingState = value;
|
|
25
25
|
}
|
|
26
|
+
static removePropagationInfo(propagationInfoCarrier) {
|
|
27
|
+
Traces.extractPropagationInfo(propagationInfoCarrier, true);
|
|
28
|
+
return propagationInfoCarrier;
|
|
29
|
+
}
|
|
26
30
|
static extractPropagationInfo(propagationInfoCarrier, deleteProperty) {
|
|
27
|
-
if (propagationInfoCarrier.traceparent) {
|
|
31
|
+
if (propagationInfoCarrier === null || propagationInfoCarrier === void 0 ? void 0 : propagationInfoCarrier.traceparent) {
|
|
28
32
|
return propagationInfoCarrier;
|
|
29
33
|
}
|
|
30
|
-
const nestedPropagationInfo = propagationInfoCarrier
|
|
31
|
-
.__interopIOTracePropagationInfo;
|
|
34
|
+
const nestedPropagationInfo = propagationInfoCarrier === null || propagationInfoCarrier === void 0 ? void 0 : propagationInfoCarrier.__interopIOTracePropagationInfo;
|
|
32
35
|
if (nestedPropagationInfo) {
|
|
33
36
|
if (deleteProperty === true) {
|
|
34
37
|
delete propagationInfoCarrier.__interopIOTracePropagationInfo;
|
|
@@ -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,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;
|
|
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,EAAE,IAAI,CAAC,CAAC;IACpF,CAAC;IACM,MAAM,KAAK,mBAAmB,CAAC,KAA0B;QAC9D,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,sBAAmF;QAC9G,MAAM,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QAC5D,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,sBAAsB,CAC3B,sBAAmF,EACnF,cAAoC;QAEpC,IAAK,sBAA0C,aAA1C,sBAAsB,uBAAtB,sBAAsB,CAAsB,WAAW,EAAE;YAC5D,OAAO,sBAAyC,CAAC;SAClD;QACD,MAAM,qBAAqB,GAAI,sBAAiD,aAAjD,sBAAsB,uBAAtB,sBAAsB,CAA6B,+BAA+B,CAAC;QAClH,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;;AAlGH,yBAmGC;AAjGgB,gBAAS,GAAkB,IAAI,qCAAiB,EAAE,CAAC;AAmGvD,QAAA,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC"}
|
|
@@ -7,8 +7,9 @@ export declare class TracingState implements ITracingState {
|
|
|
7
7
|
span: Span;
|
|
8
8
|
private logger;
|
|
9
9
|
private version;
|
|
10
|
+
private disablePropagation;
|
|
10
11
|
private currentSpanStatus;
|
|
11
|
-
constructor(source: string, level: keyof typeof Verbosity, span: Span, logger: Logger, version: string);
|
|
12
|
+
constructor(source: string, level: keyof typeof Verbosity, span: Span, logger: Logger, version: string, disablePropagation: boolean);
|
|
12
13
|
endSpan(): Promise<void>;
|
|
13
14
|
get enabled(): boolean;
|
|
14
15
|
private hasEnded;
|
|
@@ -5,12 +5,13 @@ const types_1 = require("./types");
|
|
|
5
5
|
const api_1 = require("@opentelemetry/api");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
class TracingState {
|
|
8
|
-
constructor(source, level, span, logger, version) {
|
|
8
|
+
constructor(source, level, span, logger, version, disablePropagation) {
|
|
9
9
|
this.source = source;
|
|
10
10
|
this.level = level;
|
|
11
11
|
this.span = span;
|
|
12
12
|
this.logger = logger;
|
|
13
13
|
this.version = version;
|
|
14
|
+
this.disablePropagation = disablePropagation;
|
|
14
15
|
this.currentSpanStatus = { code: api_1.SpanStatusCode.UNSET };
|
|
15
16
|
this.hasEnded = false;
|
|
16
17
|
this.spanContextField = span.spanContext();
|
|
@@ -84,7 +85,13 @@ class TracingState {
|
|
|
84
85
|
return propagationInfo;
|
|
85
86
|
}
|
|
86
87
|
injectPropagationInfo(carrier) {
|
|
87
|
-
|
|
88
|
+
if (this.disablePropagation) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
const pi = this.getPropagationInfo();
|
|
92
|
+
if (pi) {
|
|
93
|
+
carrier.__interopIOTracePropagationInfo = pi;
|
|
94
|
+
}
|
|
88
95
|
}
|
|
89
96
|
}
|
|
90
97
|
exports.TracingState = TracingState;
|
|
@@ -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;
|
|
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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Attributes, Span, SpanStatus, TimeInput, TracerProvider } from "@opentelemetry/api";
|
|
1
|
+
import { Attributes, Span, SpanOptions, SpanStatus, TimeInput, TracerProvider } from "@opentelemetry/api";
|
|
2
2
|
import { Logger } from "../logger/types";
|
|
3
3
|
import { Manager } from "../types";
|
|
4
4
|
import { OTLPExporterNodeConfigBase } from "@opentelemetry/otlp-exporter-base";
|
|
@@ -101,10 +101,12 @@ export interface Filter {
|
|
|
101
101
|
*/
|
|
102
102
|
enabled?: boolean;
|
|
103
103
|
/**
|
|
104
|
-
* If
|
|
105
|
-
* of
|
|
104
|
+
* If a tracing span is disabled by filter, setting this to "true" will stop the propagation
|
|
105
|
+
* of trace nesting info across it.
|
|
106
|
+
*
|
|
107
|
+
* If not specified, see 'TracesDefaultsSettings'.
|
|
106
108
|
*/
|
|
107
|
-
|
|
109
|
+
stopPropagationIfSpanIsDisabled?: boolean;
|
|
108
110
|
/**
|
|
109
111
|
* The attribute verbosity level of matched spans.
|
|
110
112
|
*
|
|
@@ -125,6 +127,14 @@ export interface Filter {
|
|
|
125
127
|
* If not specified, see 'TracesDefaultsSettings'.
|
|
126
128
|
*/
|
|
127
129
|
autoSetSuccessStatus?: boolean;
|
|
130
|
+
/**
|
|
131
|
+
* Whether the span will not inject its propagation info into data
|
|
132
|
+
* transfer objects for span nesting across system boundaries.
|
|
133
|
+
*
|
|
134
|
+
* If not specified, see 'TracesDefaultsSettings'.
|
|
135
|
+
*/
|
|
136
|
+
disablePropagation?: boolean;
|
|
137
|
+
spanOptions?: SpanOptions;
|
|
128
138
|
}
|
|
129
139
|
/**
|
|
130
140
|
* Used for spans that didn't match a Filter or SamplingSettings entry,
|
|
@@ -138,10 +148,10 @@ export interface TracesDefaultsSettings {
|
|
|
138
148
|
*/
|
|
139
149
|
enabled?: boolean;
|
|
140
150
|
/**
|
|
141
|
-
* If
|
|
142
|
-
* of
|
|
151
|
+
* If a tracing span is disabled by filter, setting this to "true" will stop the propagation
|
|
152
|
+
* of trace nesting info across it.
|
|
143
153
|
*/
|
|
144
|
-
|
|
154
|
+
stopPropagationIfSpanIsDisabled?: boolean;
|
|
145
155
|
/**
|
|
146
156
|
* Default span attribute verbosity level. See 'Filter'.
|
|
147
157
|
*
|
|
@@ -168,6 +178,14 @@ export interface TracesDefaultsSettings {
|
|
|
168
178
|
* Defaults to 'true'.
|
|
169
179
|
*/
|
|
170
180
|
sample?: number | boolean;
|
|
181
|
+
/**
|
|
182
|
+
* Whether the span will not inject its propagation info into data
|
|
183
|
+
* transfer objects for span nesting across system boundaries.
|
|
184
|
+
*
|
|
185
|
+
* Defaults to 'false'.
|
|
186
|
+
*/
|
|
187
|
+
disablePropagation?: boolean;
|
|
188
|
+
spanOptions?: SpanOptions;
|
|
171
189
|
}
|
|
172
190
|
export interface TracesSettings {
|
|
173
191
|
/**
|
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":";;;AAqGA,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"}
|