@opentelemetry/api 1.0.1 → 1.0.2
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/CHANGELOG.md +25 -0
- package/README.md +1 -2
- package/build/esm/api/trace.js +5 -2
- package/build/esm/api/trace.js.map +1 -1
- package/build/esm/internal/semver.js +13 -1
- package/build/esm/internal/semver.js.map +1 -1
- package/build/esm/trace/ProxyTracer.js +2 -1
- package/build/esm/trace/ProxyTracer.js.map +1 -1
- package/build/esm/trace/tracer.d.ts +30 -29
- package/build/esm/version.d.ts +1 -1
- package/build/esm/version.js +1 -1
- package/build/src/api/trace.js +5 -2
- package/build/src/api/trace.js.map +1 -1
- package/build/src/internal/semver.js +13 -1
- package/build/src/internal/semver.js.map +1 -1
- package/build/src/trace/ProxyTracer.js +2 -1
- package/build/src/trace/ProxyTracer.js.map +1 -1
- package/build/src/trace/tracer.d.ts +30 -29
- package/build/src/version.d.ts +1 -1
- package/build/src/version.js +1 -1
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,31 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
|
|
5
|
+
## 1.0.2
|
|
6
|
+
|
|
7
|
+
### :bug: Bug Fix
|
|
8
|
+
|
|
9
|
+
* [#105](https://github.com/open-telemetry/opentelemetry-js-api/pull/105) fix: set delegate after successful registration ([@Flarna](https://github.com/Flarna))
|
|
10
|
+
* [#94](https://github.com/open-telemetry/opentelemetry-js-api/pull/94) fix: enforce strict equality on prerelease versions ([@dyladan](https://github.com/dyladan))
|
|
11
|
+
|
|
12
|
+
### :memo: Documentation
|
|
13
|
+
|
|
14
|
+
* [#106](https://github.com/open-telemetry/opentelemetry-js-api/pull/106) docs: fix crash in README example ([@trentm](https://github.com/trentm))
|
|
15
|
+
* [#101](https://github.com/open-telemetry/opentelemetry-js-api/pull/101) docs: Format example for tracer.startActiveSpan ([@ad-m](https://github.com/ad-m))
|
|
16
|
+
* [#99](https://github.com/open-telemetry/opentelemetry-js-api/pull/99) chore: fix link to API docs ([@dyladan](https://github.com/dyladan))
|
|
17
|
+
|
|
18
|
+
### :house: Internal
|
|
19
|
+
|
|
20
|
+
* [#109](https://github.com/open-telemetry/opentelemetry-js-api/pull/109) internal: add missing approvers from core ([@dyladan](https://github.com/dyladan))
|
|
21
|
+
* [#103](https://github.com/open-telemetry/opentelemetry-js-api/pull/103) chore: reuse NoopTracer in ProxyTracer ([@Flarna](https://github.com/Flarna))
|
|
22
|
+
|
|
23
|
+
### Committers: 4
|
|
24
|
+
|
|
25
|
+
* Adam Dobrawy ([@ad-m](https://github.com/ad-m))
|
|
26
|
+
* Daniel Dyla ([@dyladan](https://github.com/dyladan))
|
|
27
|
+
* Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
|
|
28
|
+
* Trent Mick ([@trentm](https://github.com/trentm))
|
|
29
|
+
|
|
5
30
|
## 1.0.1
|
|
6
31
|
|
|
7
32
|
### :bug: Bug Fix
|
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
---
|
|
3
3
|
<p align="center">
|
|
4
4
|
<strong>
|
|
5
|
-
<a href="https://open-telemetry.github.io/opentelemetry-js">API Documentation<a/>
|
|
5
|
+
<a href="https://open-telemetry.github.io/opentelemetry-js-api">API Documentation<a/>
|
|
6
6
|
•
|
|
7
7
|
<a href="https://github.com/open-telemetry/opentelemetry-js/discussions">Getting In Touch (GitHub Discussions)<a/>
|
|
8
8
|
</strong>
|
|
@@ -87,7 +87,6 @@ async function operation() {
|
|
|
87
87
|
})
|
|
88
88
|
|
|
89
89
|
span.end();
|
|
90
|
-
return output;
|
|
91
90
|
}
|
|
92
91
|
|
|
93
92
|
async function main() {
|
package/build/esm/api/trace.js
CHANGED
|
@@ -47,8 +47,11 @@ var TraceAPI = /** @class */ (function () {
|
|
|
47
47
|
* @returns true if the tracer provider was successfully registered, else false
|
|
48
48
|
*/
|
|
49
49
|
TraceAPI.prototype.setGlobalTracerProvider = function (provider) {
|
|
50
|
-
this._proxyTracerProvider.
|
|
51
|
-
|
|
50
|
+
var success = registerGlobal(API_NAME, this._proxyTracerProvider, DiagAPI.instance());
|
|
51
|
+
if (success) {
|
|
52
|
+
this._proxyTracerProvider.setDelegate(provider);
|
|
53
|
+
}
|
|
54
|
+
return success;
|
|
52
55
|
};
|
|
53
56
|
/**
|
|
54
57
|
* Returns the global tracer provider.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/api/trace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,cAAc,EACd,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,eAAe,GAChB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,UAAU,EACV,OAAO,EACP,cAAc,EACd,OAAO,EACP,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,IAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB;;GAEG;AACH;IAKE,+FAA+F;IAC/F;QAHQ,yBAAoB,GAAG,IAAI,mBAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/api/trace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,cAAc,EACd,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,eAAe,GAChB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,UAAU,EACV,OAAO,EACP,cAAc,EACd,OAAO,EACP,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,IAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB;;GAEG;AACH;IAKE,+FAA+F;IAC/F;QAHQ,yBAAoB,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAmDlD,oBAAe,GAAG,eAAe,CAAC;QAElC,uBAAkB,GAAG,kBAAkB,CAAC;QAExC,eAAU,GAAG,UAAU,CAAC;QAExB,YAAO,GAAG,OAAO,CAAC;QAElB,mBAAc,GAAG,cAAc,CAAC;QAEhC,YAAO,GAAG,OAAO,CAAC;QAElB,mBAAc,GAAG,cAAc,CAAC;IA5DhB,CAAC;IAExB,kDAAkD;IACpC,oBAAW,GAAzB;QACE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;SACjC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACI,0CAAuB,GAA9B,UAA+B,QAAwB;QACrD,IAAM,OAAO,GAAG,cAAc,CAC5B,QAAQ,EACR,IAAI,CAAC,oBAAoB,EACzB,OAAO,CAAC,QAAQ,EAAE,CACnB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACI,oCAAiB,GAAxB;QACE,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC;IAC1D,CAAC;IAED;;OAEG;IACI,4BAAS,GAAhB,UAAiB,IAAY,EAAE,OAAgB;QAC7C,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,wCAAwC;IACjC,0BAAO,GAAd;QACE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,IAAI,mBAAmB,EAAE,CAAC;IACxD,CAAC;IAeH,eAAC;AAAD,CAAC,AAnED,IAmEC"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { VERSION } from '../version';
|
|
17
|
-
var re = /^(\d+)\.(\d+)\.(\d+)(
|
|
17
|
+
var re = /^(\d+)\.(\d+)\.(\d+)(-(.+))?$/;
|
|
18
18
|
/**
|
|
19
19
|
* Create a function to test an API version to see if it is compatible with the provided ownVersion.
|
|
20
20
|
*
|
|
@@ -43,7 +43,14 @@ export function _makeCompatibilityCheck(ownVersion) {
|
|
|
43
43
|
major: +myVersionMatch[1],
|
|
44
44
|
minor: +myVersionMatch[2],
|
|
45
45
|
patch: +myVersionMatch[3],
|
|
46
|
+
prerelease: myVersionMatch[4],
|
|
46
47
|
};
|
|
48
|
+
// if ownVersion has a prerelease tag, versions must match exactly
|
|
49
|
+
if (ownVersionParsed.prerelease != null) {
|
|
50
|
+
return function isExactmatch(globalVersion) {
|
|
51
|
+
return globalVersion === ownVersion;
|
|
52
|
+
};
|
|
53
|
+
}
|
|
47
54
|
function _reject(v) {
|
|
48
55
|
rejectedVersions.add(v);
|
|
49
56
|
return false;
|
|
@@ -69,7 +76,12 @@ export function _makeCompatibilityCheck(ownVersion) {
|
|
|
69
76
|
major: +globalVersionMatch[1],
|
|
70
77
|
minor: +globalVersionMatch[2],
|
|
71
78
|
patch: +globalVersionMatch[3],
|
|
79
|
+
prerelease: globalVersionMatch[4],
|
|
72
80
|
};
|
|
81
|
+
// if globalVersion has a prerelease tag, versions must match exactly
|
|
82
|
+
if (globalVersionParsed.prerelease != null) {
|
|
83
|
+
return _reject(globalVersion);
|
|
84
|
+
}
|
|
73
85
|
// major versions must match
|
|
74
86
|
if (ownVersionParsed.major !== globalVersionParsed.major) {
|
|
75
87
|
return _reject(globalVersion);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../../src/internal/semver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,IAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../../src/internal/semver.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { NoopTracer } from './NoopTracer';
|
|
17
|
+
var NOOP_TRACER = new NoopTracer();
|
|
17
18
|
/**
|
|
18
19
|
* Proxy tracer provided by the proxy tracer provider
|
|
19
20
|
*/
|
|
@@ -40,7 +41,7 @@ var ProxyTracer = /** @class */ (function () {
|
|
|
40
41
|
}
|
|
41
42
|
var tracer = this._provider.getDelegateTracer(this.name, this.version);
|
|
42
43
|
if (!tracer) {
|
|
43
|
-
return
|
|
44
|
+
return NOOP_TRACER;
|
|
44
45
|
}
|
|
45
46
|
this._delegate = tracer;
|
|
46
47
|
return this._delegate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyTracer.js","sourceRoot":"","sources":["../../../src/trace/ProxyTracer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C;;GAEG;AACH;IAIE,qBACU,SAA8B,EACtB,IAAY,EACZ,OAAgB;QAFxB,cAAS,GAAT,SAAS,CAAqB;QACtB,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,+BAAS,GAAT,UAAU,IAAY,EAAE,OAAqB,EAAE,OAAiB;QAC9D,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,qCAAe,GAAf,UACE,KAAa,EACb,QAAyB,EACzB,QAAsB,EACtB,GAAO;QAEP,IAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACK,gCAAU,GAAlB;QACE,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QAED,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,
|
|
1
|
+
{"version":3,"file":"ProxyTracer.js","sourceRoot":"","sources":["../../../src/trace/ProxyTracer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,IAAM,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;AAErC;;GAEG;AACH;IAIE,qBACU,SAA8B,EACtB,IAAY,EACZ,OAAgB;QAFxB,cAAS,GAAT,SAAS,CAAqB;QACtB,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,+BAAS,GAAT,UAAU,IAAY,EAAE,OAAqB,EAAE,OAAiB;QAC9D,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,qCAAe,GAAf,UACE,KAAa,EACb,QAAyB,EACzB,QAAsB,EACtB,GAAO;QAEP,IAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACK,gCAAU,GAAlB;QACE,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QAED,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,WAAW,CAAC;SACpB;QAED,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACH,kBAAC;AAAD,CAAC,AA1CD,IA0CC"}
|
|
@@ -32,36 +32,37 @@ export interface Tracer {
|
|
|
32
32
|
* @param fn function called in the context of the span and receives the newly created span as an argument
|
|
33
33
|
* @returns return value of fn
|
|
34
34
|
* @example
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
35
|
+
* const something = tracer.startActiveSpan('op', span => {
|
|
36
|
+
* try {
|
|
37
|
+
* do some work
|
|
38
|
+
* span.setStatus({code: SpanStatusCode.OK});
|
|
39
|
+
* return something;
|
|
40
|
+
* } catch (err) {
|
|
41
|
+
* span.setStatus({
|
|
42
|
+
* code: SpanStatusCode.ERROR,
|
|
43
|
+
* message: err.message,
|
|
44
|
+
* });
|
|
45
|
+
* throw err;
|
|
46
|
+
* } finally {
|
|
47
|
+
* span.end();
|
|
48
|
+
* }
|
|
49
|
+
* });
|
|
50
|
+
*
|
|
50
51
|
* @example
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
*
|
|
54
|
-
*
|
|
55
|
-
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
*
|
|
52
|
+
* const span = tracer.startActiveSpan('op', span => {
|
|
53
|
+
* try {
|
|
54
|
+
* do some work
|
|
55
|
+
* return span;
|
|
56
|
+
* } catch (err) {
|
|
57
|
+
* span.setStatus({
|
|
58
|
+
* code: SpanStatusCode.ERROR,
|
|
59
|
+
* message: err.message,
|
|
60
|
+
* });
|
|
61
|
+
* throw err;
|
|
62
|
+
* }
|
|
63
|
+
* });
|
|
64
|
+
* do some more work
|
|
65
|
+
* span.end();
|
|
65
66
|
*/
|
|
66
67
|
startActiveSpan<F extends (span: Span) => unknown>(name: string, fn: F): ReturnType<F>;
|
|
67
68
|
startActiveSpan<F extends (span: Span) => unknown>(name: string, options: SpanOptions, fn: F): ReturnType<F>;
|
package/build/esm/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "1.0.
|
|
1
|
+
export declare const VERSION = "1.0.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/build/esm/version.js
CHANGED
package/build/src/api/trace.js
CHANGED
|
@@ -50,8 +50,11 @@ var TraceAPI = /** @class */ (function () {
|
|
|
50
50
|
* @returns true if the tracer provider was successfully registered, else false
|
|
51
51
|
*/
|
|
52
52
|
TraceAPI.prototype.setGlobalTracerProvider = function (provider) {
|
|
53
|
-
this._proxyTracerProvider.
|
|
54
|
-
|
|
53
|
+
var success = global_utils_1.registerGlobal(API_NAME, this._proxyTracerProvider, diag_1.DiagAPI.instance());
|
|
54
|
+
if (success) {
|
|
55
|
+
this._proxyTracerProvider.setDelegate(provider);
|
|
56
|
+
}
|
|
57
|
+
return success;
|
|
55
58
|
};
|
|
56
59
|
/**
|
|
57
60
|
* Returns the global tracer provider.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/api/trace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yDAIkC;AAClC,oEAAmE;AACnE,gEAGoC;AAGpC,wDAMgC;AAChC,+BAAiC;AAEjC,IAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB;;GAEG;AACH;IAKE,+FAA+F;IAC/F;QAHQ,yBAAoB,GAAG,IAAI,yCAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/api/trace.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yDAIkC;AAClC,oEAAmE;AACnE,gEAGoC;AAGpC,wDAMgC;AAChC,+BAAiC;AAEjC,IAAM,QAAQ,GAAG,OAAO,CAAC;AAEzB;;GAEG;AACH;IAKE,+FAA+F;IAC/F;QAHQ,yBAAoB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QAmDlD,oBAAe,GAAG,mCAAe,CAAC;QAElC,uBAAkB,GAAG,sCAAkB,CAAC;QAExC,eAAU,GAAG,0BAAU,CAAC;QAExB,YAAO,GAAG,uBAAO,CAAC;QAElB,mBAAc,GAAG,8BAAc,CAAC;QAEhC,YAAO,GAAG,uBAAO,CAAC;QAElB,mBAAc,GAAG,8BAAc,CAAC;IA5DhB,CAAC;IAExB,kDAAkD;IACpC,oBAAW,GAAzB;QACE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;SACjC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACI,0CAAuB,GAA9B,UAA+B,QAAwB;QACrD,IAAM,OAAO,GAAG,6BAAc,CAC5B,QAAQ,EACR,IAAI,CAAC,oBAAoB,EACzB,cAAO,CAAC,QAAQ,EAAE,CACnB,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACI,oCAAiB,GAAxB;QACE,OAAO,wBAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC;IAC1D,CAAC;IAED;;OAEG;IACI,4BAAS,GAAhB,UAAiB,IAAY,EAAE,OAAgB;QAC7C,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,wCAAwC;IACjC,0BAAO,GAAd;QACE,+BAAgB,CAAC,QAAQ,EAAE,cAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,oBAAoB,GAAG,IAAI,yCAAmB,EAAE,CAAC;IACxD,CAAC;IAeH,eAAC;AAAD,CAAC,AAnED,IAmEC;AAnEY,4BAAQ"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.isCompatible = exports._makeCompatibilityCheck = void 0;
|
|
19
19
|
var version_1 = require("../version");
|
|
20
|
-
var re = /^(\d+)\.(\d+)\.(\d+)(
|
|
20
|
+
var re = /^(\d+)\.(\d+)\.(\d+)(-(.+))?$/;
|
|
21
21
|
/**
|
|
22
22
|
* Create a function to test an API version to see if it is compatible with the provided ownVersion.
|
|
23
23
|
*
|
|
@@ -46,7 +46,14 @@ function _makeCompatibilityCheck(ownVersion) {
|
|
|
46
46
|
major: +myVersionMatch[1],
|
|
47
47
|
minor: +myVersionMatch[2],
|
|
48
48
|
patch: +myVersionMatch[3],
|
|
49
|
+
prerelease: myVersionMatch[4],
|
|
49
50
|
};
|
|
51
|
+
// if ownVersion has a prerelease tag, versions must match exactly
|
|
52
|
+
if (ownVersionParsed.prerelease != null) {
|
|
53
|
+
return function isExactmatch(globalVersion) {
|
|
54
|
+
return globalVersion === ownVersion;
|
|
55
|
+
};
|
|
56
|
+
}
|
|
50
57
|
function _reject(v) {
|
|
51
58
|
rejectedVersions.add(v);
|
|
52
59
|
return false;
|
|
@@ -72,7 +79,12 @@ function _makeCompatibilityCheck(ownVersion) {
|
|
|
72
79
|
major: +globalVersionMatch[1],
|
|
73
80
|
minor: +globalVersionMatch[2],
|
|
74
81
|
patch: +globalVersionMatch[3],
|
|
82
|
+
prerelease: globalVersionMatch[4],
|
|
75
83
|
};
|
|
84
|
+
// if globalVersion has a prerelease tag, versions must match exactly
|
|
85
|
+
if (globalVersionParsed.prerelease != null) {
|
|
86
|
+
return _reject(globalVersion);
|
|
87
|
+
}
|
|
76
88
|
// major versions must match
|
|
77
89
|
if (ownVersionParsed.major !== globalVersionParsed.major) {
|
|
78
90
|
return _reject(globalVersion);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../../src/internal/semver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,sCAAqC;AAErC,IAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"semver.js","sourceRoot":"","sources":["../../../src/internal/semver.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.ProxyTracer = void 0;
|
|
19
19
|
var NoopTracer_1 = require("./NoopTracer");
|
|
20
|
+
var NOOP_TRACER = new NoopTracer_1.NoopTracer();
|
|
20
21
|
/**
|
|
21
22
|
* Proxy tracer provided by the proxy tracer provider
|
|
22
23
|
*/
|
|
@@ -43,7 +44,7 @@ var ProxyTracer = /** @class */ (function () {
|
|
|
43
44
|
}
|
|
44
45
|
var tracer = this._provider.getDelegateTracer(this.name, this.version);
|
|
45
46
|
if (!tracer) {
|
|
46
|
-
return
|
|
47
|
+
return NOOP_TRACER;
|
|
47
48
|
}
|
|
48
49
|
this._delegate = tracer;
|
|
49
50
|
return this._delegate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyTracer.js","sourceRoot":"","sources":["../../../src/trace/ProxyTracer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,2CAA0C;AAM1C;;GAEG;AACH;IAIE,qBACU,SAA8B,EACtB,IAAY,EACZ,OAAgB;QAFxB,cAAS,GAAT,SAAS,CAAqB;QACtB,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,+BAAS,GAAT,UAAU,IAAY,EAAE,OAAqB,EAAE,OAAiB;QAC9D,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,qCAAe,GAAf,UACE,KAAa,EACb,QAAyB,EACzB,QAAsB,EACtB,GAAO;QAEP,IAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACK,gCAAU,GAAlB;QACE,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QAED,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,
|
|
1
|
+
{"version":3,"file":"ProxyTracer.js","sourceRoot":"","sources":["../../../src/trace/ProxyTracer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAGH,2CAA0C;AAM1C,IAAM,WAAW,GAAG,IAAI,uBAAU,EAAE,CAAC;AAErC;;GAEG;AACH;IAIE,qBACU,SAA8B,EACtB,IAAY,EACZ,OAAgB;QAFxB,cAAS,GAAT,SAAS,CAAqB;QACtB,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEJ,+BAAS,GAAT,UAAU,IAAY,EAAE,OAAqB,EAAE,OAAiB;QAC9D,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,qCAAe,GAAf,UACE,KAAa,EACb,QAAyB,EACzB,QAAsB,EACtB,GAAO;QAEP,IAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED;;;OAGG;IACK,gCAAU,GAAlB;QACE,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;SACvB;QAED,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,WAAW,CAAC;SACpB;QAED,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACH,kBAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,kCAAW"}
|
|
@@ -32,36 +32,37 @@ export interface Tracer {
|
|
|
32
32
|
* @param fn function called in the context of the span and receives the newly created span as an argument
|
|
33
33
|
* @returns return value of fn
|
|
34
34
|
* @example
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
35
|
+
* const something = tracer.startActiveSpan('op', span => {
|
|
36
|
+
* try {
|
|
37
|
+
* do some work
|
|
38
|
+
* span.setStatus({code: SpanStatusCode.OK});
|
|
39
|
+
* return something;
|
|
40
|
+
* } catch (err) {
|
|
41
|
+
* span.setStatus({
|
|
42
|
+
* code: SpanStatusCode.ERROR,
|
|
43
|
+
* message: err.message,
|
|
44
|
+
* });
|
|
45
|
+
* throw err;
|
|
46
|
+
* } finally {
|
|
47
|
+
* span.end();
|
|
48
|
+
* }
|
|
49
|
+
* });
|
|
50
|
+
*
|
|
50
51
|
* @example
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
*
|
|
54
|
-
*
|
|
55
|
-
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
*
|
|
52
|
+
* const span = tracer.startActiveSpan('op', span => {
|
|
53
|
+
* try {
|
|
54
|
+
* do some work
|
|
55
|
+
* return span;
|
|
56
|
+
* } catch (err) {
|
|
57
|
+
* span.setStatus({
|
|
58
|
+
* code: SpanStatusCode.ERROR,
|
|
59
|
+
* message: err.message,
|
|
60
|
+
* });
|
|
61
|
+
* throw err;
|
|
62
|
+
* }
|
|
63
|
+
* });
|
|
64
|
+
* do some more work
|
|
65
|
+
* span.end();
|
|
65
66
|
*/
|
|
66
67
|
startActiveSpan<F extends (span: Span) => unknown>(name: string, fn: F): ReturnType<F>;
|
|
67
68
|
startActiveSpan<F extends (span: Span) => unknown>(name: string, options: SpanOptions, fn: F): ReturnType<F>;
|
package/build/src/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "1.0.
|
|
1
|
+
export declare const VERSION = "1.0.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/build/src/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentelemetry/api",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2",
|
|
4
4
|
"description": "Public API for OpenTelemetry",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"module": "build/esm/index.js",
|
|
@@ -56,13 +56,13 @@
|
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@types/mocha": "8.2.2",
|
|
59
|
-
"@types/node": "14.17.
|
|
59
|
+
"@types/node": "14.17.4",
|
|
60
60
|
"@types/sinon": "10.0.2",
|
|
61
61
|
"@types/webpack-env": "1.16.0",
|
|
62
|
-
"@typescript-eslint/eslint-plugin": "4.
|
|
63
|
-
"@typescript-eslint/parser": "4.
|
|
62
|
+
"@typescript-eslint/eslint-plugin": "4.28.1",
|
|
63
|
+
"@typescript-eslint/parser": "4.28.1",
|
|
64
64
|
"codecov": "3.8.2",
|
|
65
|
-
"eslint": "7.
|
|
65
|
+
"eslint": "7.30.0",
|
|
66
66
|
"eslint-plugin-header": "3.1.1",
|
|
67
67
|
"eslint-plugin-import": "2.23.4",
|
|
68
68
|
"gh-pages": "3.2.0",
|
|
@@ -81,8 +81,8 @@
|
|
|
81
81
|
"sinon": "11.1.1",
|
|
82
82
|
"ts-loader": "8.2.0",
|
|
83
83
|
"ts-mocha": "8.0.0",
|
|
84
|
-
"typedoc": "0.21.
|
|
85
|
-
"typescript": "4.3.
|
|
84
|
+
"typedoc": "0.21.2",
|
|
85
|
+
"typescript": "4.3.5",
|
|
86
86
|
"webpack": "4.46.0"
|
|
87
87
|
}
|
|
88
88
|
}
|