@opentelemetry/propagation-utils 0.27.0 → 0.29.0

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/README.md CHANGED
@@ -1,8 +1,6 @@
1
1
  # OpenTelemetry Propagation Utils
2
2
 
3
3
  [![NPM Published Version][npm-img]][npm-url]
4
- [![dependencies][dependencies-image]][dependencies-url]
5
- [![devDependencies][devDependencies-image]][devDependencies-url]
6
4
  [![Apache License][license-image]][license-image]
7
5
 
8
6
  A collection of propagation utils for opentelemetry.
@@ -53,9 +51,5 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
53
51
  [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
54
52
  [license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE
55
53
  [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
56
- [dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js-contrib.svg?path=packages%2Fopentelemetry-propagation-utils
57
- [dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fopentelemetry-propagation-utils
58
- [devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js-contrib.svg?path=packages%2Fopentelemetry-propagation-utils&type=dev
59
- [devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fopentelemetry-propagation-utils&type=dev
60
54
  [npm-url]: https://www.npmjs.com/package/@opentelemetry/propagation-utils
61
55
  [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fpropagation-utils.svg
@@ -43,6 +43,11 @@ var patchArrayFilter = function (messages, tracer, loopContext) {
43
43
  value: patchedFunc,
44
44
  });
45
45
  };
46
+ function isPromise(value) {
47
+ var _a;
48
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
49
+ return typeof ((_a = value) === null || _a === void 0 ? void 0 : _a.then) === 'function';
50
+ }
46
51
  var patchArrayFunction = function (messages, functionName, tracer, loopContext) {
47
52
  var origFunc = messages[functionName];
48
53
  var patchedFunc = function () {
@@ -64,11 +69,19 @@ var patchArrayFunction = function (messages, functionName, tracer, loopContext)
64
69
  return callback.apply(this, callbackArgs);
65
70
  var res = context.with(trace.setSpan(loopContext, messageSpan), function () {
66
71
  var _a;
72
+ var result;
67
73
  try {
68
- return callback.apply(_this, callbackArgs);
74
+ result = callback.apply(_this, callbackArgs);
75
+ if (isPromise(result)) {
76
+ var endSpan = function () { var _a; return (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message); };
77
+ result.then(endSpan, endSpan);
78
+ }
79
+ return result;
69
80
  }
70
81
  finally {
71
- (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message);
82
+ if (!isPromise(result)) {
83
+ (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message);
84
+ }
72
85
  }
73
86
  });
74
87
  if (typeof res === 'object') {
@@ -1 +1 @@
1
- {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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"}
@@ -30,6 +30,11 @@ const patchArrayFilter = (messages, tracer, loopContext) => {
30
30
  value: patchedFunc,
31
31
  });
32
32
  };
33
+ function isPromise(value) {
34
+ var _a;
35
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
36
+ return typeof ((_a = value) === null || _a === void 0 ? void 0 : _a.then) === 'function';
37
+ }
33
38
  const patchArrayFunction = (messages, functionName, tracer, loopContext) => {
34
39
  const origFunc = messages[functionName];
35
40
  const patchedFunc = function (...arrFuncArgs) {
@@ -42,11 +47,19 @@ const patchArrayFunction = (messages, functionName, tracer, loopContext) => {
42
47
  return callback.apply(this, callbackArgs);
43
48
  const res = api_1.context.with(api_1.trace.setSpan(loopContext, messageSpan), () => {
44
49
  var _a;
50
+ let result;
45
51
  try {
46
- return callback.apply(this, callbackArgs);
52
+ result = callback.apply(this, callbackArgs);
53
+ if (isPromise(result)) {
54
+ const endSpan = () => { var _a; return (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message); };
55
+ result.then(endSpan, endSpan);
56
+ }
57
+ return result;
47
58
  }
48
59
  finally {
49
- (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message);
60
+ if (!isPromise(result)) {
61
+ (_a = message[END_SPAN_FUNCTION]) === null || _a === void 0 ? void 0 : _a.call(message);
62
+ }
50
63
  }
51
64
  });
52
65
  if (typeof res === 'object') {
@@ -1 +1 @@
1
- {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pubsub-propagation.js","sourceRoot":"","sources":["../../src/pubsub-propagation.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=pubsub-propagation.test.d.ts.map
@@ -0,0 +1,103 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ /*
4
+ * Copyright The OpenTelemetry Authors
5
+ *
6
+ * Licensed under the Apache License, Version 2.0 (the "License");
7
+ * you may not use this file except in compliance with the License.
8
+ * You may obtain a copy of the License at
9
+ *
10
+ * https://www.apache.org/licenses/LICENSE-2.0
11
+ *
12
+ * Unless required by applicable law or agreed to in writing, software
13
+ * distributed under the License is distributed on an "AS IS" BASIS,
14
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ * See the License for the specific language governing permissions and
16
+ * limitations under the License.
17
+ */
18
+ const pubsub_propagation_1 = require("../src/pubsub-propagation");
19
+ const contrib_test_utils_1 = require("@opentelemetry/contrib-test-utils");
20
+ const api_1 = require("@opentelemetry/api");
21
+ const expect = require("expect");
22
+ contrib_test_utils_1.registerInstrumentationTestingProvider();
23
+ const tracer = api_1.trace.getTracer('test');
24
+ afterEach(() => {
25
+ contrib_test_utils_1.resetMemoryExporter();
26
+ });
27
+ describe('Pubsub propagation', () => {
28
+ it('Span ends immediately when the function returns a non-promise', () => {
29
+ const messages = [{}];
30
+ pubsub_propagation_1.default.patchMessagesArrayToStartProcessSpans({
31
+ messages,
32
+ tracer,
33
+ parentContext: api_1.ROOT_CONTEXT,
34
+ messageToSpanDetails: () => ({
35
+ name: 'test',
36
+ parentContext: api_1.ROOT_CONTEXT,
37
+ attributes: {},
38
+ }),
39
+ });
40
+ pubsub_propagation_1.default.patchArrayForProcessSpans(messages, tracer, api_1.ROOT_CONTEXT);
41
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(0);
42
+ messages.map(x => x);
43
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(1);
44
+ expect(contrib_test_utils_1.getTestSpans()[0]).toMatchObject({ name: 'test process' });
45
+ });
46
+ it('Span ends on promise-resolution', () => {
47
+ const messages = [{}];
48
+ pubsub_propagation_1.default.patchMessagesArrayToStartProcessSpans({
49
+ messages,
50
+ tracer,
51
+ parentContext: api_1.ROOT_CONTEXT,
52
+ messageToSpanDetails: () => ({
53
+ name: 'test',
54
+ parentContext: api_1.ROOT_CONTEXT,
55
+ attributes: {},
56
+ }),
57
+ });
58
+ pubsub_propagation_1.default.patchArrayForProcessSpans(messages, tracer, api_1.ROOT_CONTEXT);
59
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(0);
60
+ let resolve;
61
+ messages.map(() => new Promise(res => {
62
+ resolve = res;
63
+ }));
64
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(0);
65
+ // @ts-expect-error Typescript thinks this value is used before assignment
66
+ resolve(undefined);
67
+ // We use setTimeout here to make sure our assertations run
68
+ // after the promise resolves
69
+ return new Promise(res => setTimeout(res, 0)).then(() => {
70
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(1);
71
+ expect(contrib_test_utils_1.getTestSpans()[0]).toMatchObject({ name: 'test process' });
72
+ });
73
+ });
74
+ it('Span ends on promise-rejection', () => {
75
+ const messages = [{}];
76
+ pubsub_propagation_1.default.patchMessagesArrayToStartProcessSpans({
77
+ messages,
78
+ tracer,
79
+ parentContext: api_1.ROOT_CONTEXT,
80
+ messageToSpanDetails: () => ({
81
+ name: 'test',
82
+ parentContext: api_1.ROOT_CONTEXT,
83
+ attributes: {},
84
+ }),
85
+ });
86
+ pubsub_propagation_1.default.patchArrayForProcessSpans(messages, tracer, api_1.ROOT_CONTEXT);
87
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(0);
88
+ let reject;
89
+ messages.map(() => new Promise((_, rej) => {
90
+ reject = rej;
91
+ }));
92
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(0);
93
+ // @ts-expect-error Typescript thinks this value is used before assignment
94
+ reject(new Error('Failed'));
95
+ // We use setTimeout here to make sure our assertations run
96
+ // after the promise resolves
97
+ return new Promise(res => setTimeout(res, 0)).then(() => {
98
+ expect(contrib_test_utils_1.getTestSpans().length).toBe(1);
99
+ expect(contrib_test_utils_1.getTestSpans()[0]).toMatchObject({ name: 'test process' });
100
+ });
101
+ });
102
+ });
103
+ //# sourceMappingURL=pubsub-propagation.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pubsub-propagation.test.js","sourceRoot":"","sources":["../../test/pubsub-propagation.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opentelemetry/propagation-utils",
3
- "version": "0.27.0",
3
+ "version": "0.29.0",
4
4
  "description": "Propagation utilities for opentelemetry instrumentations",
5
5
  "main": "build/src/index.js",
6
6
  "types": "build/src/index.d.ts",
@@ -12,10 +12,11 @@
12
12
  "compile": "tsc --build tsconfig.json tsconfig.esm.json",
13
13
  "lint": "eslint . --ext .ts",
14
14
  "lint:fix": "eslint . --ext .ts --fix",
15
- "precompile": "tsc --version && lerna run version --scope @opentelemetry/propagation-utils --include-dependencies",
15
+ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagation-utils --include-dependencies",
16
16
  "prepare": "npm run compile",
17
17
  "prewatch": "npm run precompile",
18
- "version": "node ../../scripts/version-update.js",
18
+ "tdd": "npm run test -- --watch-extensions ts --watch",
19
+ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
19
20
  "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
20
21
  },
21
22
  "repository": "open-telemetry/opentelemetry-js-contrib",
@@ -32,18 +33,29 @@
32
33
  ],
33
34
  "author": "OpenTelemetry Authors",
34
35
  "license": "Apache-2.0",
36
+ "engines": {
37
+ "node": ">=14"
38
+ },
35
39
  "bugs": {
36
40
  "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
37
41
  },
38
- "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
42
+ "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-propagation-utils#readme",
39
43
  "peerDependencies": {
40
- "@opentelemetry/api": "^1.0.1"
44
+ "@opentelemetry/api": "^1.0.0"
41
45
  },
42
46
  "devDependencies": {
43
- "@opentelemetry/api": "1.0.1",
47
+ "@opentelemetry/api": "^1.0.0",
48
+ "@opentelemetry/contrib-test-utils": "^0.31.0",
49
+ "@types/mocha": "^9.1.1",
44
50
  "@types/node": "16.11.21",
51
+ "@types/sinon": "^10.0.11",
52
+ "expect": "27.4.2",
45
53
  "gts": "3.1.0",
54
+ "mocha": "7.2.0",
55
+ "nyc": "15.1.0",
56
+ "sinon": "13.0.1",
57
+ "ts-mocha": "10.0.0",
46
58
  "typescript": "4.3.5"
47
59
  },
48
- "gitHead": "78717b6dda677bf737811c34df21ef0ec88c31a3"
60
+ "gitHead": "35226602b92a7587f16a1eb959e4f3b3948f6e9d"
49
61
  }
package/CHANGELOG.md DELETED
@@ -1,14 +0,0 @@
1
- # Changelog
2
-
3
- ## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/propagation-utils-v0.26.0...propagation-utils-v0.27.0) (2022-03-02)
4
-
5
-
6
- ### Features
7
-
8
- * **instrumentation-aws-sdk:** upstream aws-sdk instrumentation from ext-js ([#678](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/678)) ([f5851e7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f5851e72512117dbce571a42930a90c560dbf63d))
9
- * upstream mocha instrumentation testing plugin from ext-js [#621](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/621) ([#669](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/669)) ([a5170c4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5170c494706a2bec3ba51e59966d0ca8a41d00e))
10
-
11
-
12
- ### Bug Fixes
13
-
14
- * rename lerna's --include-filtered-dependencies option ([#817](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/817)) ([cf268e7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/cf268e7a92b7800ad6dbec9ca77466f9ee03ee1a))
@@ -1,2 +0,0 @@
1
- export declare const VERSION = "0.27.0";
2
- //# sourceMappingURL=version.d.ts.map
@@ -1,18 +0,0 @@
1
- /*
2
- * Copyright The OpenTelemetry Authors
3
- *
4
- * Licensed under the Apache License, Version 2.0 (the "License");
5
- * you may not use this file except in compliance with the License.
6
- * You may obtain a copy of the License at
7
- *
8
- * https://www.apache.org/licenses/LICENSE-2.0
9
- *
10
- * Unless required by applicable law or agreed to in writing, software
11
- * distributed under the License is distributed on an "AS IS" BASIS,
12
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- * See the License for the specific language governing permissions and
14
- * limitations under the License.
15
- */
16
- // this is autogenerated file, see scripts/version-update.js
17
- export var VERSION = '0.27.0';
18
- //# sourceMappingURL=version.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,4DAA4D;AAC5D,MAAM,CAAC,IAAM,OAAO,GAAG,QAAQ,CAAC"}
@@ -1,2 +0,0 @@
1
- export declare const VERSION = "0.27.0";
2
- //# sourceMappingURL=version.d.ts.map
@@ -1,21 +0,0 @@
1
- "use strict";
2
- /*
3
- * Copyright The OpenTelemetry Authors
4
- *
5
- * Licensed under the Apache License, Version 2.0 (the "License");
6
- * you may not use this file except in compliance with the License.
7
- * You may obtain a copy of the License at
8
- *
9
- * https://www.apache.org/licenses/LICENSE-2.0
10
- *
11
- * Unless required by applicable law or agreed to in writing, software
12
- * distributed under the License is distributed on an "AS IS" BASIS,
13
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
- * See the License for the specific language governing permissions and
15
- * limitations under the License.
16
- */
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.VERSION = void 0;
19
- // this is autogenerated file, see scripts/version-update.js
20
- exports.VERSION = '0.27.0';
21
- //# sourceMappingURL=version.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4DAA4D;AAC/C,QAAA,OAAO,GAAG,QAAQ,CAAC"}