diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bd97d7ebe9..b9f4e142f7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,6 +9,8 @@ on: jobs: build: runs-on: ubuntu-latest + container: + image: node:14 steps: - uses: actions/checkout@v2 diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000000..e8511eaeaf --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +npx --no-install commitlint --edit $1 diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b3b5ff06be..ec6ddd192a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.2","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.3.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.1","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.27.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.27.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.27.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"} \ No newline at end of file +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.1","detectors/node/opentelemetry-resource-detector-aws":"1.0.2","detectors/node/opentelemetry-resource-detector-gcp":"0.26.1","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.27.0","metapackages/auto-instrumentations-web":"0.27.0","packages/opentelemetry-browser-extension-autoinjection":"0.27.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.28.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.28.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.4.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.27.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.27.0","plugins/node/opentelemetry-instrumentation-connect":"0.27.0","plugins/node/opentelemetry-instrumentation-dns":"0.27.0","plugins/node/opentelemetry-instrumentation-express":"0.27.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.27.0","plugins/node/opentelemetry-instrumentation-graphql":"0.27.0","plugins/node/opentelemetry-instrumentation-hapi":"0.27.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.27.0","plugins/node/opentelemetry-instrumentation-knex":"0.27.0","plugins/node/opentelemetry-instrumentation-koa":"0.28.0","plugins/node/opentelemetry-instrumentation-memcached":"0.27.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.27.0","plugins/node/opentelemetry-instrumentation-mysql":"0.27.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.27.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.28.0","plugins/node/opentelemetry-instrumentation-net":"0.27.0","plugins/node/opentelemetry-instrumentation-pg":"0.27.0","plugins/node/opentelemetry-instrumentation-pino":"0.28.0","plugins/node/opentelemetry-instrumentation-redis":"0.27.0","plugins/node/opentelemetry-instrumentation-restify":"0.27.0","plugins/node/opentelemetry-instrumentation-router":"0.27.0","plugins/node/opentelemetry-instrumentation-winston":"0.27.0","plugins/web/opentelemetry-instrumentation-document-load":"0.27.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.27.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"} \ No newline at end of file diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md index aea53e8fa8..94e8e3f030 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [0.26.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.26.0...resource-detector-alibaba-cloud-v0.26.1) (2021-11-30) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.25.0...resource-detector-alibaba-cloud-v0.26.0) (2021-10-22) @@ -13,4 +22,4 @@ * The following workspace dependencies were updated * devDependencies - * @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0 \ No newline at end of file + * @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0 diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index cfc5dfc167..e7f7837016 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-alibaba-cloud", - "version": "0.26.0", + "version": "0.26.1", "description": "OpenTelemetry resource detector for Alibaba Cloud", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -45,7 +45,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@types/mocha": "8.2.3", "@types/node": "14.17.9", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md index 9edf6aad34..5c55fccdc1 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [1.0.2](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.0.1...resource-detector-aws-v1.0.2) (2021-11-30) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ### [1.0.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.0.0...resource-detector-aws-v1.0.1) (2021-11-01) diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index f8ab3ed507..4f194393fd 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-aws", - "version": "1.0.1", + "version": "1.0.2", "description": "OpenTelemetry SDK resource detector for AWS", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@types/mocha": "8.2.3", "@types/node": "14.17.9", "@types/sinon": "10.0.2", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md index 1d44f092cf..95496bc30b 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [0.26.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.26.0...resource-detector-gcp-v0.26.1) (2021-11-30) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.25.0...resource-detector-gcp-v0.26.0) (2021-10-22) @@ -13,4 +22,4 @@ * The following workspace dependencies were updated * devDependencies - * @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0 \ No newline at end of file + * @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0 diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 89ed2dc46a..7fb44471f8 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-gcp", - "version": "0.26.0", + "version": "0.26.1", "description": "OpenTelemetry SDK resource detector for GCP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,7 +44,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/core": "1.0.1", "@types/mocha": "8.2.3", "@types/node": "14.17.9", diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md index 1fe4960ed6..e75a53b3a2 100644 --- a/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.26.2...auto-instrumentations-node-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-dns bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-express bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-graphql bumped from ^0.26.1 to ^0.27.0 + * @opentelemetry/instrumentation-ioredis bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-koa bumped from ^0.27.0 to ^0.28.0 + * @opentelemetry/instrumentation-mongodb bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-mysql bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-pg bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-redis bumped from ^0.26.0 to ^0.27.0 + ### [0.26.2](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.26.1...auto-instrumentations-node-v0.26.2) (2021-11-19) @@ -39,4 +61,4 @@ * @opentelemetry/instrumentation-mongodb bumped from ^0.25.0 to ^0.26.0 * @opentelemetry/instrumentation-mysql bumped from ^0.25.0 to ^0.26.0 * @opentelemetry/instrumentation-pg bumped from ^0.25.0 to ^0.26.0 - * @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0 + * @opentelemetry/instrumentation-redis bumped from ^0.25.0 to ^0.26.0 \ No newline at end of file diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index d595b9c7cc..4b858af595 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.26.2", + "version": "0.27.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", @@ -46,16 +46,16 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.27.0", - "@opentelemetry/instrumentation-dns": "^0.26.0", - "@opentelemetry/instrumentation-express": "^0.26.0", - "@opentelemetry/instrumentation-graphql": "^0.26.1", + "@opentelemetry/instrumentation-dns": "^0.27.0", + "@opentelemetry/instrumentation-express": "^0.27.0", + "@opentelemetry/instrumentation-graphql": "^0.27.0", "@opentelemetry/instrumentation-grpc": "^0.27.0", "@opentelemetry/instrumentation-http": "^0.27.0", - "@opentelemetry/instrumentation-ioredis": "^0.26.0", - "@opentelemetry/instrumentation-koa": "^0.27.0", - "@opentelemetry/instrumentation-mongodb": "^0.26.0", - "@opentelemetry/instrumentation-mysql": "^0.26.0", - "@opentelemetry/instrumentation-pg": "^0.26.0", - "@opentelemetry/instrumentation-redis": "^0.26.0" + "@opentelemetry/instrumentation-ioredis": "^0.27.0", + "@opentelemetry/instrumentation-koa": "^0.28.0", + "@opentelemetry/instrumentation-mongodb": "^0.27.0", + "@opentelemetry/instrumentation-mysql": "^0.27.0", + "@opentelemetry/instrumentation-pg": "^0.27.0", + "@opentelemetry/instrumentation-redis": "^0.27.0" } } diff --git a/metapackages/auto-instrumentations-web/CHANGELOG.md b/metapackages/auto-instrumentations-web/CHANGELOG.md index 8b7025487a..666a41d22a 100644 --- a/metapackages/auto-instrumentations-web/CHANGELOG.md +++ b/metapackages/auto-instrumentations-web/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.26.0...auto-instrumentations-web-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-document-load bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/instrumentation-user-interaction bumped from ^0.26.0 to ^0.27.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-web-v0.25.0...auto-instrumentations-web-v0.26.0) (2021-10-22) diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 861171037c..0c7444188f 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-web", - "version": "0.26.0", + "version": "0.27.0", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme", @@ -61,9 +61,9 @@ }, "dependencies": { "@opentelemetry/instrumentation": "^0.27.0", - "@opentelemetry/instrumentation-document-load": "^0.26.0", + "@opentelemetry/instrumentation-document-load": "^0.27.0", "@opentelemetry/instrumentation-fetch": "^0.27.0", - "@opentelemetry/instrumentation-user-interaction": "^0.26.0", + "@opentelemetry/instrumentation-user-interaction": "^0.27.0", "@opentelemetry/instrumentation-xml-http-request": "^0.27.0" } } diff --git a/package.json b/package.json index 4289452218..f419ad4f83 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "scripts": { "clean": "lerna run clean", "postinstall": "npm run bootstrap", + "prepare": "husky install", "precompile": "tsc --version && lerna run version", "version:update": "lerna run version:update", "compile": "lerna run compile", @@ -54,16 +55,11 @@ "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.23.4", "gts": "3.1.0", - "husky": "7.0.1", + "husky": "7.0.4", "lerna": "3.22.1", "lerna-changelog": "1.0.1", "typescript": "4.3.5" }, - "husky": { - "hooks": { - "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" - } - }, "changelog": { "labels": { "breaking": ":boom: Breaking Change", diff --git a/packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md b/packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md index ae4f598b94..3d49b02936 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md +++ b/packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/browser-extension-autoinjection-v0.26.0...browser-extension-autoinjection-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-document-load bumped from ^0.26.0 to ^0.27.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/browser-extension-autoinjection-v0.25.0...browser-extension-autoinjection-v0.26.0) (2021-10-22) diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index 3a1c65773d..d8129b60a4 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/browser-extension-autoinjection", - "version": "0.26.0", + "version": "0.27.0", "description": "A browser extension that injects opentelemetry tracers into any website", "scripts": { "clean": "rimraf build/*", @@ -71,7 +71,7 @@ "@opentelemetry/exporter-otlp-http": "0.26.0", "@opentelemetry/exporter-zipkin": "1.0.1", "@opentelemetry/instrumentation": "0.27.0", - "@opentelemetry/instrumentation-document-load": "^0.26.0", + "@opentelemetry/instrumentation-document-load": "^0.27.0", "@opentelemetry/instrumentation-fetch": "0.26.0", "@opentelemetry/instrumentation-xml-http-request": "0.26.0", "@opentelemetry/resources": "1.0.1", diff --git a/packages/opentelemetry-test-utils/CHANGELOG.md b/packages/opentelemetry-test-utils/CHANGELOG.md index a9a066797b..e578bc8d7e 100644 --- a/packages/opentelemetry-test-utils/CHANGELOG.md +++ b/packages/opentelemetry-test-utils/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.27.0...contrib-test-utils-v0.28.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/contrib-test-utils-v0.26.0...contrib-test-utils-v0.27.0) (2021-10-22) diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index d98762bd91..d949309550 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/contrib-test-utils", - "version": "0.27.0", + "version": "0.28.0", "description": "Test utilities for opentelemetry components", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md index a54667bf16..6ddf83b40a 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.27.0...instrumentation-aws-lambda-v0.28.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.26.0...instrumentation-aws-lambda-v0.27.0) (2021-10-22) @@ -30,4 +37,4 @@ ### Bug Fixes * **aws-lambda:** BasicTracerProvider not force flushing ([#661](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/661)) ([76e0d0f](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/76e0d0fbef59e84c42b52d37cb3541e0dc853eb6)) -* Update aws-lambda-instrumentation to SDK v0.25.0 ([#660](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/660)) ([7b0d090](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7b0d0900bfb8475a32d799add4d925d7addbb24d)) \ No newline at end of file +* Update aws-lambda-instrumentation to SDK v0.25.0 ([#660](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/660)) ([7b0d090](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7b0d0900bfb8475a32d799add4d925d7addbb24d)) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 29ba1e1b61..f196c5ad51 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.27.0", + "version": "0.28.0", "description": "OpenTelemetry AWS Lambda automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md index e405daf6e5..7fe1ddef32 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.4.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.3.1...instrumentation-aws-sdk-v0.4.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ### [0.3.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.3.0...instrumentation-aws-sdk-v0.3.1) (2021-11-30) @@ -34,4 +48,4 @@ * The following workspace dependencies were updated * devDependencies - * @opentelemetry/contrib-test-utils bumped from ^0.26.0 to ^0.27.0 + * @opentelemetry/contrib-test-utils bumped from ^0.26.0 to ^0.27.0 \ No newline at end of file diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index c1277b0a9a..9b15eebc0c 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.3.1", + "version": "0.4.0", "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package", "keywords": [ "aws", @@ -70,7 +70,7 @@ "rimraf": "^3.0.2", "sinon": "^12.0.0", "gts": "3.1.0", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "test-all-versions": "^5.0.1", "ts-mocha": "8.0.0", "ts-node": "^9.1.1", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md index 09afa0b0c2..3d9782cd92 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.26.0...instrumentation-bunyan-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.25.0...instrumentation-bunyan-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index c56dae7ad0..f04ce49b52 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry instrumentation for bunyan", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md index fbde09fb68..d720462bbb 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-cassandra/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.26.0...instrumentation-cassandra-driver-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.25.0...instrumentation-cassandra-driver-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index b8fd1ae555..0dede8edbb 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-cassandra-driver", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry instrumentation for cassandra-driver", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -49,7 +49,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md index dd6a57187b..bd15f50dbe 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-connect/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.26.0...instrumentation-connect-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-connect-v0.25.0...instrumentation-connect-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 5175f810e7..04af383fc8 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-connect", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry connect automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md index b754e7273f..e99ca9bf74 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-dns/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.26.0...instrumentation-dns-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-dns-v0.25.0...instrumentation-dns-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index a6b6ecad4c..8a17e6b9ab 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-dns", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry dns automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md index 77ae67315a..375b6cc6d9 100644 --- a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.26.0...instrumentation-express-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.25.0...instrumentation-express-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 6c306a2b1a..2a71a7dd84 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-express", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry express automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md index 2efa28a00c..71c2f65718 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.26.0...instrumentation-generic-pool-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-generic-pool-v0.25.0...instrumentation-generic-pool-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 52620bffb2..7f9828b85b 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-generic-pool", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry Generic Pool automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md index 339ab47070..0af2ab2733 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-graphql/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.26.1...instrumentation-graphql-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ### [0.26.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-graphql-v0.26.0...instrumentation-graphql-v0.26.1) (2021-11-12) diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index bd132abae7..d8579a9f29 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-graphql", - "version": "0.26.1", + "version": "0.27.0", "description": "OpenTelemetry @opentelemetry/instrumentation-graphql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts index e33c7cebee..8804413a60 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts @@ -245,20 +245,24 @@ export class GraphQLInstrumentation extends InstrumentationBase { result?: PromiseOrValue ) { const config = this._getConfig(); - if ( - typeof config.responseHook !== 'function' || - result === undefined || - err - ) { + if (result === undefined || err) { endSpan(span, err); return; } if (result.constructor.name === 'Promise') { (result as Promise).then(resultData => { + if (typeof config.responseHook !== 'function') { + endSpan(span); + return; + } this._executeResponseHook(span, resultData); }); } else { + if (typeof config.responseHook !== 'function') { + endSpan(span); + return; + } this._executeResponseHook(span, result as graphqlTypes.ExecutionResult); } } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts b/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts index 9383869c63..fb3c642181 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts @@ -143,7 +143,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[6]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -163,11 +163,11 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; - const span2 = spans[5]; - const span3 = spans[6]; + const executeSpan = spans[6]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; + const span2 = spans[4]; + const span3 = spans[5]; assertResolveSpan( resolveParentSpan, @@ -203,6 +203,27 @@ describe('graphql', () => { parentId ); }); + + it('should execute with correct timing', async () => { + const PARSE = 0; + const VALIDATE = 1; + const RESOLVE = 2; + const EXECUTE = 6; + + const times = spans.map(s => { + return { + start: s.startTime[0] * 1_000 + s.startTime[1] / 1_000_000, + end: s.endTime[0] * 1_000 + s.endTime[1] / 1_000_000, + }; + }); + + assert.ok(times[PARSE].start <= times[PARSE].end); + assert.ok(times[PARSE].end <= times[VALIDATE].start); + assert.ok(times[VALIDATE].start <= times[VALIDATE].end); + assert.ok(times[VALIDATE].end <= times[EXECUTE].start); + assert.ok(times[EXECUTE].start <= times[RESOLVE].start); + assert.ok(times[RESOLVE].end <= times[EXECUTE].end); + }); }); describe('AND source is query with param', () => { let spans: ReadableSpan[]; @@ -245,7 +266,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -265,9 +286,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, @@ -331,7 +352,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -355,9 +376,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, @@ -487,7 +508,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -574,7 +595,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -594,9 +615,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, @@ -663,7 +684,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -686,9 +707,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, @@ -752,7 +773,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -776,9 +797,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, @@ -847,7 +868,7 @@ describe('graphql', () => { }); it('should instrument execute', () => { - const executeSpan = spans[2]; + const executeSpan = spans[4]; assert.deepStrictEqual( executeSpan.attributes[AttributeNames.SOURCE], @@ -870,9 +891,9 @@ describe('graphql', () => { }); it('should instrument resolvers', () => { - const executeSpan = spans[2]; - const resolveParentSpan = spans[3]; - const span1 = spans[4]; + const executeSpan = spans[4]; + const resolveParentSpan = spans[2]; + const span1 = spans[3]; assertResolveSpan( resolveParentSpan, diff --git a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md index 8c22f3f71d..c24f50723b 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.26.0...instrumentation-hapi-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.25.0...instrumentation-hapi-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 43d18225c3..1c1d93dead 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-hapi", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry Hapi automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md index bc98303cec..fd8d5c9e93 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-ioredis/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.26.0...instrumentation-ioredis-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.25.0...instrumentation-ioredis-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index 885225cba7..551606fd95 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-ioredis", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry ioredis automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -53,7 +53,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md index e1748353b2..91f45162ba 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-knex/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.26.0...instrumentation-knex-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-knex-v0.25.0...instrumentation-knex-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 45f7f5825a..9d0a736330 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-knex", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry Knex automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md index 9dceac7052..fc9b1d59c1 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.27.0...instrumentation-koa-v0.28.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.26.0...instrumentation-koa-v0.27.0) (2021-11-19) diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 6423478ddd..8c29843181 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-koa", - "version": "0.27.0", + "version": "0.28.0", "description": "OpenTelemetry Koa automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md index eabc8df20b..0e1e2a5d00 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-memcached/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.26.0...instrumentation-memcached-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-memcached-v0.25.0...instrumentation-memcached-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index aaf51ad1b4..6d89ab8237 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-memcached", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry memcached automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md index c1c826d63c..6f24b6ea49 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.26.0...instrumentation-mongodb-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.25.0...instrumentation-mongodb-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 03ef659706..a0378907ea 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry mongodb automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ }, "devDependencies": { "@opentelemetry/api": "1.0.2", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/context-async-hooks": "1.0.1", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md index 4c20a46730..cb903874bd 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mysql/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.26.0...instrumentation-mysql-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql-v0.25.0...instrumentation-mysql-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index c5aee34542..e4fd628fee 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry mysql automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -48,7 +48,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md index a60bdf2e32..dcdb774a0e 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.26.0...instrumentation-mysql2-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.25.0...instrumentation-mysql2-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index ab3f1784d8..3810973c1a 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mysql2", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry mysql2 automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -50,7 +50,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@types/mocha": "7.0.2", "@types/node": "14.17.9", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md index 3602b32668..1d428721b0 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.27.0...instrumentation-nestjs-core-v0.28.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-nestjs-core-v0.26.0...instrumentation-nestjs-core-v0.27.0) (2021-11-12) diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 2231624400..b46bbe3160 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-nestjs-core", - "version": "0.27.0", + "version": "0.28.0", "description": "OpenTelemetry NestJS automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md index f1eb8ff716..8ec46d8b93 100644 --- a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.26.0...instrumentation-net-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.25.0...instrumentation-net-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 37c77dbfb4..2e4b5af3e2 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-net", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry net module automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md index 5a7c48ed2c..92380703b6 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.26.0...instrumentation-pg-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.25.0...instrumentation-pg-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 9d088768ef..aab6f95f18 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pg", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry postgres automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -56,7 +56,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md index c33954365a..1cb8943204 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.28.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.27.0...instrumentation-pino-v0.28.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.26.0...instrumentation-pino-v0.27.0) (2021-11-19) diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 170c22ee4b..8b66b42d45 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pino", - "version": "0.27.0", + "version": "0.28.0", "description": "OpenTelemetry instrumentation for pino", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md index ffa7629de4..134df61410 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-redis/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.26.0...instrumentation-redis-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + + +### Dependencies + +* The following workspace dependencies were updated + * devDependencies + * @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0 + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-redis-v0.25.0...instrumentation-redis-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index b23219b43c..496d2315c5 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-redis", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry redis automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -52,7 +52,7 @@ "devDependencies": { "@opentelemetry/api": "1.0.2", "@opentelemetry/context-async-hooks": "1.0.1", - "@opentelemetry/contrib-test-utils": "^0.27.0", + "@opentelemetry/contrib-test-utils": "^0.28.0", "@opentelemetry/sdk-trace-base": "1.0.1", "@opentelemetry/sdk-trace-node": "1.0.1", "@types/mocha": "7.0.2", diff --git a/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md index b6c24ad284..85b2ded252 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-restify/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.26.0...instrumentation-restify-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-restify-v0.25.0...instrumentation-restify-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 6e3095e0a4..9d65fc0c75 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-restify", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry restify automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md index b83953f711..dc208679c4 100644 --- a/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-router/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.26.0...instrumentation-router-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-router-v0.25.0...instrumentation-router-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index d174008214..37b3e3f84e 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-router", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry Router automatic instrumentation package", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md index e1709a87da..c0ad4bb098 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-winston/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.26.0...instrumentation-winston-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.25.0...instrumentation-winston-v0.26.0) (2021-10-22) diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 74f0f1915c..f5ec7b73f0 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-winston", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry instrumentation for winston", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md b/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md index 73954892b8..61a2e68ca7 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md +++ b/plugins/web/opentelemetry-instrumentation-document-load/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.26.0...instrumentation-document-load-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-document-load-v0.25.0...instrumentation-document-load-v0.26.0) (2021-10-22) diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index c542873872..e8a43bf20c 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-document-load", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry document-load automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md b/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md index b60b2445c7..dcd4938ee9 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.26.0...instrumentation-user-interaction-v0.27.0) (2021-11-30) + + +### Features + +* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4)) + ## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-user-interaction-v0.25.0...instrumentation-user-interaction-v0.26.0) (2021-10-22) diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index a42452d335..731c456c3e 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-user-interaction", - "version": "0.26.0", + "version": "0.27.0", "description": "OpenTelemetry UserInteraction automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts index ae30ea092d..8317eef58e 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/src/instrumentation.ts @@ -259,14 +259,19 @@ export class UserInteractionInstrumentation extends InstrumentationBase */ private _patchAddEventListener() { const plugin = this; - return (original: Function) => { + return (original: EventTarget['addEventListener']) => { return function addEventListenerPatched( this: HTMLElement, - type: any, - listener: any, - useCapture: any + type: string, + listener: EventListenerOrEventListenerObject | null, + useCapture?: boolean | AddEventListenerOptions ) { - const once = useCapture && useCapture.once; + // Forward calls with listener = null + if (!listener) { + return original.call(this, type, listener, useCapture); + } + + const once = typeof useCapture === 'object' && useCapture.once; const patchedListener = function (this: HTMLElement, ...args: any[]) { let parentSpan: api.Span | undefined; const event: Event | undefined = args[0]; diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts index 38c3cd240b..155a913c02 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/test/userInteraction.nozone.test.ts @@ -546,6 +546,14 @@ describe('UserInteractionInstrumentation', () => { }); }); + it('should handle null event listener argument', () => { + // @ts-expect-error Typescript typings report null listener as error + // while allowed by EventTarget['addEventListener'] and js engines + document.addEventListener('click', null); + // @ts-expect-error see above + document.removeEventListener('click', null); + }); + it('should handle disable', () => { assert.strictEqual( isWrapped(HTMLElement.prototype.addEventListener),