Merge branch 'main' into feature/console-metrics-exporter-temp

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -84,7 +84,7 @@ body:
             "start": "node -r tracing.js app.js"
           },
           "dependencies": {
-            "@opentelemetry/api": "^1.2.0",
+            "@opentelemetry/api": "^1.3.0",
             "@opentelemetry/sdk-trace-base": "~1.3.1",
             ...
           }

CHANGELOG.md

@@ -2,10 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+For API changes, see the [API CHANGELOG](api/CHANGELOG.md).
+For experimental package changes, see the [experimental CHANGELOG](experimental/CHANGELOG.md).
+
 ## Unreleased
 
 ### :boom: Breaking Change
 
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 1.8.0
+
+* `@opentelemetry/sdk-metrics` has been promoted to stable
+* `@opentelemetry/api-metrics` has been merged into `@opentelemetry/api` and deprecated
+
+### :boom: Breaking Change
+
 * feat(api): merge api-metrics into api [#3374](https://github.com/open-telemetry/opentelemetry-js/pull/3374) @legendecas
 
 ### :rocket: (Enhancement)
@@ -37,6 +55,11 @@ All notable changes to this project will be documented in this file.
 Metrics API is now stable and generally available.
 There are no changes between 1.0.0 and the previous 0.33.0 version.
 
+### :boom: Breaking Change
+
+* Add semver check to metrics API [#3357](https://github.com/open-telemetry/opentelemetry-js/pull/3357) @dyladan
+  * Previously API versions were only considered compatible if the API was exactly the same
+
 ## 1.7.0
 
 ### :bug: (Bug Fix)

api/CHANGELOG.md

@@ -2,10 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
-## Unreleased
-
-### Features
+## [1.3.0](https://www.github.com/open-telemetry/opentelemetry-js-api/compare/v1.2.0...v1.3.0)
 
+* feat(api): merge api-metrics into api [#3374](https://github.com/open-telemetry/opentelemetry-js/pull/3374) @legendecas
 * Optionally suppress warning about logger being overwritten ([#3366](https://www.github.com/open-telemetry/opentelemetry-js-api/pull/3366))
 
 ## [1.2.0](https://www.github.com/open-telemetry/opentelemetry-js-api/compare/v1.1.0...v1.2.0) (2022-08-09)

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Public API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.7.0",
-    "@opentelemetry/exporter-zipkin": "1.7.0",
-    "@opentelemetry/instrumentation": "0.33.0",
-    "@opentelemetry/instrumentation-http": "0.33.0",
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0",
-    "@opentelemetry/sdk-trace-node": "1.7.0",
-    "@opentelemetry/semantic-conventions": "1.7.0"
+    "@opentelemetry/exporter-jaeger": "1.8.0",
+    "@opentelemetry/exporter-zipkin": "1.8.0",
+    "@opentelemetry/instrumentation": "0.34.0",
+    "@opentelemetry/instrumentation-http": "0.34.0",
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0",
+    "@opentelemetry/sdk-trace-node": "1.8.0",
+    "@opentelemetry/semantic-conventions": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

examples/opentelemetry-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -42,20 +42,20 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.2.0",
-    "@opentelemetry/context-zone": "1.7.0",
-    "@opentelemetry/core": "1.7.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.33.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.33.0",
-    "@opentelemetry/exporter-zipkin": "1.7.0",
-    "@opentelemetry/instrumentation": "0.33.0",
-    "@opentelemetry/instrumentation-fetch": "0.33.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.33.0",
-    "@opentelemetry/propagator-b3": "1.7.0",
-    "@opentelemetry/sdk-metrics": "0.33.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0",
-    "@opentelemetry/sdk-trace-web": "1.7.0",
-    "@opentelemetry/semantic-conventions": "1.7.0"
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/context-zone": "1.8.0",
+    "@opentelemetry/core": "1.8.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.34.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.34.0",
+    "@opentelemetry/exporter-zipkin": "1.8.0",
+    "@opentelemetry/instrumentation": "0.34.0",
+    "@opentelemetry/instrumentation-fetch": "0.34.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.34.0",
+    "@opentelemetry/propagator-b3": "1.8.0",
+    "@opentelemetry/sdk-metrics": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0",
+    "@opentelemetry/sdk-trace-web": "1.8.0",
+    "@opentelemetry/semantic-conventions": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }

examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -28,18 +28,18 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.2.0",
-    "@opentelemetry/core": "1.7.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.33.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.33.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.33.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.33.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.33.0",
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/sdk-metrics": "0.33.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0",
-    "@opentelemetry/semantic-conventions": "1.7.0"
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/core": "1.8.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.34.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.34.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.34.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.34.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.34.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.34.0",
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/sdk-metrics": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0",
+    "@opentelemetry/semantic-conventions": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

experimental/CHANGELOG.md

@@ -6,8 +6,18 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
-* Add semver check to metrics API [#3357](https://github.com/open-telemetry/opentelemetry-js/pull/3357) @dyladan
-  * Previously API versions were only considered compatible if the API was exactly the same
+### :rocket: (Enhancement)
+
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :house: (Internal)
+
+## 0.34.0
+
+* `@opentelemetry/sdk-metrics` moved to [packages/sdk-metrics](../packages/sdk-metrics)
+* `@opentelemetry/api-metrics` deprecated and merged into [api](../api)
 
 ### :rocket: (Enhancement)
 

experimental/backwards-compatability/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "private": true,
   "description": "Backwards compatability app for node 14 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.33.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0"
+    "@opentelemetry/sdk-node": "0.34.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

experimental/backwards-compatability/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "private": true,
   "description": "Backwards compatability app for node 16 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.33.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0"
+    "@opentelemetry/sdk-node": "0.34.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

experimental/examples/prometheus/package.json

@@ -1,6 +1,7 @@
 {
   "name": "prometheus-example",
-  "version": "0.33.0",
+  "version": "0.34.0",
+  "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
   "scripts": {
@@ -9,8 +10,8 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@opentelemetry/api": "^1.2.0",
-    "@opentelemetry/exporter-prometheus": "0.33.0",
-    "@opentelemetry/sdk-metrics": "0.33.0"
+    "@opentelemetry/api": "^1.3.0",
+    "@opentelemetry/exporter-prometheus": "0.34.0",
+    "@opentelemetry/sdk-metrics": "1.8.0"
   }
 }

experimental/packages/api-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-logs",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Public logs API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

experimental/packages/exporter-trace-otlp-grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-grpc",
-  "version": "0.33.0",
+  "version": "0.34.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",
@@ -50,7 +50,7 @@
     "@babel/core": "7.16.0",
     "@grpc/proto-loader": "^0.7.3",
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/otlp-exporter-base": "0.33.0",
+    "@opentelemetry/otlp-exporter-base": "0.34.0",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",
@@ -69,11 +69,11 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.7.1",
-    "@opentelemetry/core": "1.7.0",
-    "@opentelemetry/otlp-grpc-exporter-base": "0.33.0",
-    "@opentelemetry/otlp-transformer": "0.33.0",
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0"
+    "@opentelemetry/core": "1.8.0",
+    "@opentelemetry/otlp-grpc-exporter-base": "0.34.0",
+    "@opentelemetry/otlp-transformer": "0.34.0",
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc",
   "sideEffects": false

experimental/packages/exporter-trace-otlp-http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-http",
-  "version": "0.33.0",
+  "version": "0.34.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,11 +94,11 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.7.0",
-    "@opentelemetry/otlp-exporter-base": "0.33.0",
-    "@opentelemetry/otlp-transformer": "0.33.0",
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0"
+    "@opentelemetry/core": "1.8.0",
+    "@opentelemetry/otlp-exporter-base": "0.34.0",
+    "@opentelemetry/otlp-transformer": "0.34.0",
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http",
   "sideEffects": false

experimental/packages/exporter-trace-otlp-proto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/exporter-trace-otlp-proto",
-  "version": "0.33.0",
+  "version": "0.34.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,12 +66,12 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "1.7.0",
-    "@opentelemetry/otlp-exporter-base": "0.33.0",
-    "@opentelemetry/otlp-proto-exporter-base": "0.33.0",
-    "@opentelemetry/otlp-transformer": "0.33.0",
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/sdk-trace-base": "1.7.0"
+    "@opentelemetry/core": "1.8.0",
+    "@opentelemetry/otlp-exporter-base": "0.34.0",
+    "@opentelemetry/otlp-proto-exporter-base": "0.34.0",
+    "@opentelemetry/otlp-transformer": "0.34.0",
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/sdk-trace-base": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto",
   "sideEffects": false

experimental/packages/opentelemetry-browser-detector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/opentelemetry-browser-detector",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "OpenTelemetry Resource Detector for Browser",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -70,8 +70,8 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/resources": "1.7.0",
-    "@opentelemetry/semantic-conventions": "1.7.0"
+    "@opentelemetry/resources": "1.8.0",
+    "@opentelemetry/semantic-conventions": "1.8.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector"
 }