Merge branch 'main' into remove-semver

open-telemetry · Oct 5, 2021 · 8b4d290 · 8b4d290
2 parents 94d6236 + 0f5a5bc
commit 8b4d290
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -47,23 +47,25 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a
 
 ## Compatibility Matrix
 
-| API Version | Core version | Contrib Version         |
-| ----------- |--------------|-------------------------|
-| 1.0.x       | 0.25.x       | ------                  |
-| 1.0.x       | 0.24.x       | 0.24.x                  |
-| 1.0.x       | 0.23.x       | 0.23.x                  |
-| 1.0.x       | 0.22.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                  |
-| 0.18.x      | 0.18.x       | 0.14.x                  |
-|             | 0.17.x       | ------                  |
-|             | 0.16.x       | ------                  |
-|             | 0.15.x       | 0.13.x                  |
-|             | 0.14.x       | 0.12.x                  |
-|             | 0.13.x       | ------                  |
-|             | 0.12.x       | 0.11.x                  |
-|             | 0.11.x       | 0.10.x                  |
+| API Version | Core version | Experimental Packages | Contrib Version         |
+| ----------- |--------------| --------------------- |-------------------------|
+| 1.0.x       | 1.x          | 0.26.x                | ------                  |
+| 1.0.x       | 0.26.x       | -----                 | ------                  |
+| 1.0.x       | 0.25.x       | -----                 | ------                  |
+| 1.0.x       | 0.24.x       | -----                 | 0.24.x                  |
+| 1.0.x       | 0.23.x       | -----                 | 0.23.x                  |
+| 1.0.x       | 0.22.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                  |
+| 0.18.x      | 0.18.x       | -----                 | 0.14.x                  |
+|             | 0.17.x       | -----                 | ------                  |
+|             | 0.16.x       | -----                 | ------                  |
+|             | 0.15.x       | -----                 | 0.13.x                  |
+|             | 0.14.x       | -----                 | 0.12.x                  |
+|             | 0.13.x       | -----                 | ------                  |
+|             | 0.12.x       | -----                 | 0.11.x                  |
+|             | 0.11.x       | -----                 | 0.10.x                  |
 
 ## Versioning
 

diff --git a/experimental/backwards-compatability/node10/package.json b/experimental/backwards-compatability/node10/package.json
@@ -8,7 +8,7 @@
     "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.25.0",
+    "@opentelemetry/sdk-node": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0"
   },
   "devDependencies": {

diff --git a/experimental/backwards-compatability/node12/package.json b/experimental/backwards-compatability/node12/package.json
@@ -8,7 +8,7 @@
     "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.25.0",
+    "@opentelemetry/sdk-node": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0"
   },
   "devDependencies": {

diff --git a/experimental/backwards-compatability/node8/package.json b/experimental/backwards-compatability/node8/package.json
@@ -8,7 +8,7 @@
     "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.25.0",
+    "@opentelemetry/sdk-node": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0"
   },
   "devDependencies": {

diff --git a/experimental/lerna.json b/experimental/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.13.4",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "npmClient": "npm",
   "packages": [
     "packages/*",

diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-metrics",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

diff --git a/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-otlp-grpc",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.15.0",
     "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.11",
     "@types/sinon": "10.0.2",
@@ -70,9 +70,9 @@
     "@grpc/grpc-js": "^1.3.7",
     "@grpc/proto-loader": "^0.6.4",
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/exporter-otlp-http": "0.25.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0",
+    "@opentelemetry/exporter-otlp-http": "0.26.0",
     "@opentelemetry/resources": "1.0.0",
+    "@opentelemetry/sdk-metrics-base": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-otlp-http",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -86,10 +86,10 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@opentelemetry/core": "1.0.0",
     "@opentelemetry/resources": "1.0.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0",
+    "@opentelemetry/sdk-metrics-base": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-otlp-proto",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.15.0",
     "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.11",
     "@types/sinon": "10.0.2",
@@ -69,9 +69,9 @@
   "dependencies": {
     "@grpc/proto-loader": "^0.6.4",
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/exporter-otlp-http": "0.25.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0",
+    "@opentelemetry/exporter-otlp-http": "0.26.0",
     "@opentelemetry/resources": "1.0.0",
+    "@opentelemetry/sdk-metrics-base": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0",
     "protobufjs": "^6.9.0"
   }

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-prometheus",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -57,8 +57,8 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0"
+    "@opentelemetry/sdk-metrics-base": "0.26.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-fetch",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry fetch automatic instrumentation package.",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/sdk-trace-web": "1.0.0",
     "@opentelemetry/semantic-conventions": "1.0.0"
   }

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-grpc",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry grpc automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -69,8 +69,8 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/semantic-conventions": "1.0.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-http",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry http/https automatic instrumentation package.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/semantic-conventions": "1.0.0",
     "semver": "^7.3.5"
   }

diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-xml-http-request",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/sdk-trace-web": "1.0.0",
     "@opentelemetry/semantic-conventions": "1.0.0"
   }

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "Base class for node which OpenTelemetry instrumentation modules extend",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
@@ -61,7 +61,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "require-in-the-middle": "^5.0.3",
     "semver": "^7.3.2",
     "shimmer": "^1.2.1"

diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/sdk-metrics-base",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry metrics SDK",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -63,7 +63,7 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@opentelemetry/core": "1.0.0",
     "@opentelemetry/resources": "1.0.0",
     "lodash.merge": "^4.6.2"

diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/sdk-node",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "OpenTelemetry SDK for Node.js",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -42,13 +42,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.25.0",
+    "@opentelemetry/api-metrics": "0.26.0",
     "@opentelemetry/core": "1.0.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/resource-detector-aws": "0.24.0",
     "@opentelemetry/resource-detector-gcp": "0.24.0",
     "@opentelemetry/resources": "1.0.0",
-    "@opentelemetry/sdk-metrics-base": "0.25.0",
+    "@opentelemetry/sdk-metrics-base": "0.26.0",
     "@opentelemetry/sdk-trace-base": "1.0.0",
     "@opentelemetry/sdk-trace-node": "1.0.0"
   },