Merge branch 'main' into santi/instrumentation_fix

open-telemetry · May 28, 2022 · e8c65da · e8c65da
2 parents eec579a + eda0b09
commit e8c65da
Show file tree

Hide file tree

Showing 42 changed files with 223 additions and 199 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ All notable changes to this project will be documented in this file.
 
 ### :boom: Breaking Change
 
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.3.0
+
+### :boom: Breaking Change
+
 * chore: remove unused InstrumentationConfig#path [#2944](https://github.com/open-telemetry/opentelemetry-js/pull/2944) @flarna
 
 ### :rocket: (Enhancement)

diff --git a/examples/otlp-exporter-node/package.json b/examples/otlp-exporter-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,18 +29,18 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/api-metrics": "0.28.0",
+    "@opentelemetry/api-metrics": "0.29.0",
     "@opentelemetry/core": "1.1.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.28.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.28.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.28.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.29.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.29.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.29.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.29.0",
     "@opentelemetry/resources": "1.1.1",
-    "@opentelemetry/semantic-conventions": "1.1.1",
-    "@opentelemetry/sdk-metrics-base": "0.28.0",
-    "@opentelemetry/sdk-trace-base": "1.1.1"
+    "@opentelemetry/sdk-metrics-base": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.1.1",
+    "@opentelemetry/semantic-conventions": "1.1.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md
@@ -6,6 +6,18 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 0.29.0
+
+### :boom: Breaking Change
+
 * feat(metrics): metric readers and exporters now select aggregation temporality based on instrument type #2902 @seemk
 * refactor(metrics-sdk): rename InstrumentationLibrary -> InstrumentationScope #2959 @pichlermarc
 * feat(metrics): multi-instrument async callback support #2966 @legendecas

diff --git a/experimental/backwards-compatability/node10/package.json b/experimental/backwards-compatability/node10/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node10",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "10.17.60",

diff --git a/experimental/backwards-compatability/node12/package.json b/experimental/backwards-compatability/node12/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node12",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "12.20.37",

diff --git a/experimental/backwards-compatability/node8/package.json b/experimental/backwards-compatability/node8/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node8",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "private": true,
   "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.28.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/sdk-node": "0.29.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   },
   "devDependencies": {
     "@types/node": "8.10.66",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "0.28.0",
+  "version": "0.29.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.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -67,12 +67,12 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.2.0",
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   }
 }
diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -94,10 +94,10 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-transformer": "0.28.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0"
   }
 }
diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "0.28.0",
+  "version": "0.29.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",
@@ -66,13 +66,13 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.1.1",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-proto-exporter-base": "0.28.0",
-    "protobufjs": "^6.9.0",
-    "@opentelemetry/otlp-transformer": "0.28.0"
+    "@opentelemetry/core": "1.1.1",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0",
+    "protobufjs": "^6.9.0"
   }
 }
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.28.0",
+  "version": "0.29.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-grpc",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-metrics": "0.28.0",
+    "@opentelemetry/api-metrics": "0.29.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -69,11 +69,11 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-metrics-base": "0.28.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.29.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-metrics-base": "0.29.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-http",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -94,11 +94,11 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.28.0",
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-metrics-base": "0.28.0"
+    "@opentelemetry/api-metrics": "0.29.0",
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-metrics-base": "0.29.0"
   }
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-metrics-otlp-proto",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics 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.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-metrics": "0.28.0",
+    "@opentelemetry/api-metrics": "0.29.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -68,13 +68,13 @@
   },
   "dependencies": {
     "@grpc/proto-loader": "0.6.9",
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
-    "@opentelemetry/otlp-proto-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-exporter-base": "0.28.0",
-    "@opentelemetry/otlp-transformer": "0.28.0",
-    "@opentelemetry/resources": "1.2.0",
-    "@opentelemetry/sdk-metrics-base": "0.28.0",
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.29.0",
+    "@opentelemetry/otlp-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.29.0",
+    "@opentelemetry/otlp-transformer": "0.29.0",
+    "@opentelemetry/resources": "1.3.0",
+    "@opentelemetry/sdk-metrics-base": "0.29.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.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -59,8 +59,8 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.28.0",
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/sdk-metrics-base": "0.28.0"
+    "@opentelemetry/api-metrics": "0.29.0",
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/sdk-metrics-base": "0.29.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.28.0",
+  "version": "0.29.0",
   "description": "OpenTelemetry fetch automatic instrumentation package.",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -56,9 +56,9 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/context-zone": "1.2.0",
-    "@opentelemetry/propagator-b3": "1.2.0",
-    "@opentelemetry/sdk-trace-base": "1.2.0",
+    "@opentelemetry/context-zone": "1.3.0",
+    "@opentelemetry/propagator-b3": "1.3.0",
+    "@opentelemetry/sdk-trace-base": "1.3.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.33",
     "@types/sinon": "10.0.6",
@@ -87,9 +87,9 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.2.0",
-    "@opentelemetry/instrumentation": "0.28.0",
-    "@opentelemetry/sdk-trace-web": "1.2.0",
-    "@opentelemetry/semantic-conventions": "1.2.0"
+    "@opentelemetry/core": "1.3.0",
+    "@opentelemetry/instrumentation": "0.29.0",
+    "@opentelemetry/sdk-trace-web": "1.3.0",
+    "@opentelemetry/semantic-conventions": "1.3.0"
   }
 }