Merge branch 'main' into main

open-telemetry · Jun 20, 2021 · e7914ff · e7914ff
2 parents 137f925 + 621f014
commit e7914ff
Show file tree

Hide file tree

Showing 65 changed files with 105 additions and 81 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file. Do not remo
 
 ## Unreleased
 
+## 0.21.0
+
+#### :bug: Bug Fix
+* [#524](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/524) [Hapi example] Fix undefined api.statusCode ([@GradedJestRisk](https://github.com/GradedJestRisk))
+
+#### :rocket: Enhancement
+* `opentelemetry-host-metrics`, `opentelemetry-id-generator-aws-xray`, `opentelemetry-test-utils`
+  * [#529](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/529) chore: update core and api to 0.21.0 ([@dyladan](https://github.com/dyladan))
+  * [#522](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/522) chore: move api into peer dependency ([@Flarna](https://github.com/Flarna))
+* Other
+  * [#506](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/506) feat: knex instrumentation ([@Rauno56](https://github.com/Rauno56))
+  * [#508](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/508) feat: graphql responseHook support ([@nozik](https://github.com/nozik))
+  * [#484](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/484) feat(instrumentation-document-load): performance paint timing events ([@kkruk-sumo](https://github.com/kkruk-sumo))
+  * [#510](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/510) chore: add node:16 to the test matrix ([@Rauno56](https://github.com/Rauno56))
+  * [#521](https://github.com/open-telemetry/opentelemetry-js-contrib/pull/521) feat: mysql2 instrumentation ([@Rauno56](https://github.com/Rauno56))
+
+#### Committers: 6
+- Daniel Dyla ([@dyladan](https://github.com/dyladan))
+- Gerhard Stöbich ([@Flarna](https://github.com/Flarna))
+- Krystian Kruk ([@kkruk-sumo](https://github.com/kkruk-sumo))
+- Ran Nozik ([@nozik](https://github.com/nozik))
+- Rauno Viskus ([@Rauno56](https://github.com/Rauno56))
+- [@GradedJestRisk](https://github.com/GradedJestRisk)
+
 ## 0.20.0
 
 #### :bug: Bug Fix

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-github",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry SDK resource detector for GitHub",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/detectors/node/opentelemetry-resource-detector-github/src/version.ts b/detectors/node/opentelemetry-resource-detector-github/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git a/lerna.json b/lerna.json
@@ -9,7 +9,7 @@
     "propagators/*",
     "detectors/node/*"
   ],
-  "version": "0.20.0",
+  "version": "0.21.0",
   "changelog": {
     "repo": "open-telemetry/opentelemetry-js-contrib",
     "labels": {

diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
@@ -45,16 +45,16 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.21.0",
-    "@opentelemetry/instrumentation-dns": "^0.20.0",
-    "@opentelemetry/instrumentation-express": "^0.20.0",
-    "@opentelemetry/instrumentation-graphql": "^0.20.0",
+    "@opentelemetry/instrumentation-dns": "^0.21.0",
+    "@opentelemetry/instrumentation-express": "^0.21.0",
+    "@opentelemetry/instrumentation-graphql": "^0.21.0",
     "@opentelemetry/instrumentation-grpc": "^0.21.0",
     "@opentelemetry/instrumentation-http": "^0.21.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.20.0",
-    "@opentelemetry/instrumentation-koa": "^0.20.0",
-    "@opentelemetry/instrumentation-mongodb": "^0.20.0",
-    "@opentelemetry/instrumentation-mysql": "^0.20.0",
-    "@opentelemetry/instrumentation-pg": "^0.20.0",
-    "@opentelemetry/instrumentation-redis": "^0.20.0"
+    "@opentelemetry/instrumentation-ioredis": "^0.21.0",
+    "@opentelemetry/instrumentation-koa": "^0.21.0",
+    "@opentelemetry/instrumentation-mongodb": "^0.21.0",
+    "@opentelemetry/instrumentation-mysql": "^0.21.0",
+    "@opentelemetry/instrumentation-pg": "^0.21.0",
+    "@opentelemetry/instrumentation-redis": "^0.21.0"
   }
 }
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
@@ -60,9 +60,9 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.21.0",
-    "@opentelemetry/instrumentation-document-load": "^0.20.0",
+    "@opentelemetry/instrumentation-document-load": "^0.21.0",
     "@opentelemetry/instrumentation-fetch": "^0.21.0",
-    "@opentelemetry/instrumentation-user-interaction": "^0.20.0",
+    "@opentelemetry/instrumentation-user-interaction": "^0.21.0",
     "@opentelemetry/instrumentation-xml-http-request": "^0.21.0"
   }
 }
diff --git a/metapackages/auto-instrumentations-web/src/version.ts b/metapackages/auto-instrumentations-web/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opentelemetry-contrib",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "This is a repository for OpenTelemetry JavaScript contributions.",
   "repository": {
     "type": "git",

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/host-metrics",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry Host Metrics for Node.js",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/packages/opentelemetry-host-metrics/src/version.ts b/packages/opentelemetry-host-metrics/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/id-generator-aws-xray",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "AWS X-Ray ID generator for OpenTelemetry",
   "main": "build/src/index.js",
   "publishConfig": {

diff --git a/packages/opentelemetry-id-generator-aws-xray/src/version.ts b/packages/opentelemetry-id-generator-aws-xray/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opentelemetry/test-utils",
   "private": true,
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Test utilities.",
   "main": "build/testUtils.js",
   "scripts": {

diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry AWS Lambda automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation": "^0.21.0",
-    "@opentelemetry/propagator-aws-xray": "^0.20.0",
+    "@opentelemetry/propagator-aws-xray": "^0.21.0",
     "@opentelemetry/resources": "^0.21.0",
     "@opentelemetry/semantic-conventions": "^0.21.0",
     "@opentelemetry/tracing": "^0.21.0",

diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/src/version.ts b/plugins/node/opentelemetry-instrumentation-aws-lambda/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry instrumentation for bunyan",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/src/version.ts b/plugins/node/opentelemetry-instrumentation-bunyan/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-dns/src/version.ts b/plugins/node/opentelemetry-instrumentation-dns/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-express/src/version.ts b/plugins/node/opentelemetry-instrumentation-express/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-generic-pool/src/version.ts b/plugins/node/opentelemetry-instrumentation-generic-pool/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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/version.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-hapi/src/version.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry ioredis automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -50,7 +50,7 @@
     "@opentelemetry/api": "0.21.0",
     "@opentelemetry/context-async-hooks": "0.21.0",
     "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/test-utils": "^0.20.0",
+    "@opentelemetry/test-utils": "^0.21.0",
     "@opentelemetry/tracing": "0.21.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.3",

diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/src/version.ts b/plugins/node/opentelemetry-instrumentation-ioredis/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.16.0",
+  "version": "0.21.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-knex/src/version.ts b/plugins/node/opentelemetry-instrumentation-knex/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.16.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-koa/src/version.ts b/plugins/node/opentelemetry-instrumentation-koa/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry mongodb automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/src/version.ts b/plugins/node/opentelemetry-instrumentation-mongodb/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry mysql automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@opentelemetry/api": "0.21.0",
     "@opentelemetry/context-async-hooks": "0.21.0",
-    "@opentelemetry/test-utils": "^0.20.0",
+    "@opentelemetry/test-utils": "^0.21.0",
     "@opentelemetry/tracing": "0.21.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.3",

diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/version.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.0",
   "description": "OpenTelemetry mysql2 automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@opentelemetry/api": "0.20.0",
     "@opentelemetry/context-async-hooks": "0.20.0",
-    "@opentelemetry/test-utils": "0.20.0",
+    "@opentelemetry/test-utils": "^0.21.0",
     "@opentelemetry/tracing": "0.20.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.0",

diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/version.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';
diff --git 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.20.0",
+  "version": "0.21.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-net/src/version.ts b/plugins/node/opentelemetry-instrumentation-net/src/version.ts
@@ -15,4 +15,4 @@
  */
 
 // this is autogenerated file, see scripts/version-update.js
-export const VERSION = '0.20.0';
+export const VERSION = '0.21.0';