Merge branch 'main' into patch-1

open-telemetry · Jun 17, 2021 · 541e3f1 · 541e3f1
2 parents ae7fb41 + 7860344
commit 541e3f1
Show file tree

Hide file tree

Showing 81 changed files with 288 additions and 267 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.22.0
+
+### :rocket: (Enhancement)
+
+* `opentelemetry-tracing`
+  * [#2243](https://github.com/open-telemetry/opentelemetry-js/pull/2243) feat(tracing): auto flush BatchSpanProcessor on browser ([@kkruk-sumo](https://github.com/kkruk-sumo))
+* `opentelemetry-resource-detector-aws`, `opentelemetry-semantic-conventions`
+  * [#2268](https://github.com/open-telemetry/opentelemetry-js/pull/2268) feat(semantic-conventions): upgrade semantic conventions to version 1… ([@weyert](https://github.com/weyert))
+* `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`
+  * [#2276](https://github.com/open-telemetry/opentelemetry-js/pull/2276) chore(deps): update dependency @opentelemetry/api to v1 ([@renovate-bot](https://github.com/renovate-bot))
+
+### :books: (Refine Doc)
+
+* [#2287](https://github.com/open-telemetry/opentelemetry-js/pull/2287) chore(doc): update compatibility matrix ([@vmarchaud](https://github.com/vmarchaud))
+
+### Committers: 3
+
+* Krystian Kruk ([@kkruk-sumo](https://github.com/kkruk-sumo))
+* Valentin Marchaud ([@vmarchaud](https://github.com/vmarchaud))
+* Weyert de Boer ([@weyert](https://github.com/weyert))
+
 ## 0.21.0
 
 ### :rocket: (Enhancement)

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 | API Version | Core version | Contrib Version         |
 | ----------- |--------------|-------------------------|
-| 1.0.0       | ------       | ------                  |
+| 1.0.x       | 0.22.x       | ------                  |
 | 0.21.x      | 0.21.x       | 0.21.x                  |
 | 0.20.x      | 0.20.x       | 0.20.x                  |
 | v1.0.0-rc.3 | 0.19.x       | 0.16.x                  |

diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json
@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node10",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "10.17.59",

diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json
@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node12",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "12.20.11",

diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json
@@ -1,15 +1,15 @@
 {
   "name": "backcompat-node8",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
   "scripts": {
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/sdk-node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

diff --git a/examples/basic-tracer-node/package.json b/examples/basic-tracer-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-basic-tracer-node",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/tracing in Node.js",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/examples/collector-exporter-node/package.json b/examples/collector-exporter-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-collector-exporter-node",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/core": "0.21.0",
-    "@opentelemetry/exporter-collector": "0.21.0",
-    "@opentelemetry/exporter-collector-grpc": "0.21.0",
-    "@opentelemetry/exporter-collector-proto": "0.21.0",
-    "@opentelemetry/metrics": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/core": "0.22.0",
+    "@opentelemetry/exporter-collector": "0.22.0",
+    "@opentelemetry/exporter-collector-grpc": "0.22.0",
+    "@opentelemetry/exporter-collector-proto": "0.22.0",
+    "@opentelemetry/metrics": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/examples/grpc-js/package.json b/examples/grpc-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc-js-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of @grpc/grpc-js integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-grpc": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-grpc": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
     "google-protobuf": "^3.9.2"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

diff --git a/examples/grpc/package.json b/examples/grpc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of gRPC integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-grpc": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-grpc": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
     "google-protobuf": "^3.9.2",
     "grpc": "^1.23.3",
     "node-pre-gyp": "0.14.0"

diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -28,13 +28,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-http": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-http": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -29,13 +29,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-http": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-http": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
   "devDependencies": {

diff --git a/examples/metrics/package.json b/examples/metrics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-metrics",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/metrics",
   "main": "index.js",
   "scripts": {
@@ -26,9 +26,9 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/core": "0.21.0",
-    "@opentelemetry/exporter-prometheus": "0.21.0",
-    "@opentelemetry/metrics": "0.21.0"
+    "@opentelemetry/core": "0.22.0",
+    "@opentelemetry/exporter-prometheus": "0.22.0",
+    "@opentelemetry/metrics": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/examples/opentracing-shim/package.json b/examples/opentracing-shim/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opentracing-shim",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/shim-opentracing in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,12 +29,12 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/exporter-jaeger": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/node": "0.21.0",
-    "@opentelemetry/shim-opentracing": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
+    "@opentelemetry/exporter-jaeger": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/node": "0.22.0",
+    "@opentelemetry/shim-opentracing": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
     "opentracing": "^0.14.4"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",

diff --git a/examples/prometheus/package.json b/examples/prometheus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/metrics and  @opentelemetry/exporter-prometheus",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@opentelemetry/exporter-prometheus": "0.21.0",
-    "@opentelemetry/metrics": "0.21.0"
+    "@opentelemetry/exporter-prometheus": "0.22.0",
+    "@opentelemetry/metrics": "0.22.0"
   }
 }
diff --git a/examples/tracer-web/package.json b/examples/tracer-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web-tracer-example",
   "private": true,
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Example of using @opentelemetry/web in browser",
   "main": "index.js",
   "scripts": {
@@ -34,18 +34,18 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@opentelemetry/api": "^0.21.0",
-    "@opentelemetry/context-zone": "0.21.0",
-    "@opentelemetry/core": "0.21.0",
-    "@opentelemetry/exporter-collector": "0.21.0",
-    "@opentelemetry/exporter-zipkin": "0.21.0",
-    "@opentelemetry/instrumentation": "0.21.0",
-    "@opentelemetry/instrumentation-fetch": "0.21.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.21.0",
-    "@opentelemetry/metrics": "0.21.0",
-    "@opentelemetry/propagator-b3": "0.21.0",
-    "@opentelemetry/tracing": "0.21.0",
-    "@opentelemetry/web": "0.21.0"
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/context-zone": "0.22.0",
+    "@opentelemetry/core": "0.22.0",
+    "@opentelemetry/exporter-collector": "0.22.0",
+    "@opentelemetry/exporter-zipkin": "0.22.0",
+    "@opentelemetry/instrumentation": "0.22.0",
+    "@opentelemetry/instrumentation-fetch": "0.22.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.22.0",
+    "@opentelemetry/metrics": "0.22.0",
+    "@opentelemetry/propagator-b3": "0.22.0",
+    "@opentelemetry/tracing": "0.22.0",
+    "@opentelemetry/web": "0.22.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/getting-started/example/package.json b/getting-started/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/getting-started-example",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "This repository provides everything required to follow the OpenTelemetry Getting Started Guide",
   "main": "app.js",
   "scripts": {