Merge branch 'main' into oc-shim-producer

.github/workflows/codeql-analysis.yml

@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
 
 on:
   workflow_dispatch:
-  schedule:
-    #        ┌───────────── minute (0 - 59)
-    #        │  ┌───────────── hour (0 - 23)
-    #        │  │ ┌───────────── day of the month (1 - 31)
-    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        │  │ │ │ │
-    #        *  * * * *
-    - cron: '30 1 * * *'
+  push:
+    branches: [ main ]
+  pull_request:
 
 jobs:
   CodeQL-Build:

CHANGELOG.md

@@ -17,6 +17,14 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+## 1.17.0
+
+### :bug: (Bug Fix)
+
+* Revert "feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071)"
+  * This feature was an unintentional breaking change introduced with API 1.5.0
+  * This PR updates all SDK packages to allow API 1.6.0, where this change has been reverted.
+
 ## 1.16.0
 
 ### :rocket: (Enhancement)

api/CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 1.6.0
+
 ### :bug: (Bug Fix)
 
 * Revert "feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071)"

api/package.json

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

examples/esm-http-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.42.0",
+  "version": "0.43.0",
   "description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
   "main": "build/index.js",
   "type": "module",
@@ -30,13 +30,13 @@
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
   "dependencies": {
-    "@opentelemetry/api": "1.5.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.42.0",
-    "@opentelemetry/instrumentation": "0.42.0",
-    "@opentelemetry/instrumentation-http": "0.42.0",
-    "@opentelemetry/resources": "1.16.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0",
-    "@opentelemetry/sdk-trace-node": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0"
+    "@opentelemetry/api": "1.6.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
+    "@opentelemetry/instrumentation": "0.43.0",
+    "@opentelemetry/instrumentation-http": "0.43.0",
+    "@opentelemetry/resources": "1.17.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0",
+    "@opentelemetry/sdk-trace-node": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.0"
   }
 }

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.42.0",
+  "version": "0.43.0",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -29,14 +29,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "1.16.0",
-    "@opentelemetry/exporter-zipkin": "1.16.0",
-    "@opentelemetry/instrumentation": "0.42.0",
-    "@opentelemetry/instrumentation-http": "0.42.0",
-    "@opentelemetry/resources": "1.16.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0",
-    "@opentelemetry/sdk-trace-node": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0"
+    "@opentelemetry/exporter-jaeger": "1.17.0",
+    "@opentelemetry/exporter-zipkin": "1.17.0",
+    "@opentelemetry/instrumentation": "0.43.0",
+    "@opentelemetry/instrumentation-http": "0.43.0",
+    "@opentelemetry/resources": "1.17.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0",
+    "@opentelemetry/sdk-trace-node": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.42.0",
+  "version": "0.43.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.16.0",
-    "@opentelemetry/exporter-zipkin": "1.16.0",
-    "@opentelemetry/instrumentation": "0.42.0",
-    "@opentelemetry/instrumentation-http": "0.42.0",
-    "@opentelemetry/resources": "1.16.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0",
-    "@opentelemetry/sdk-trace-node": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0"
+    "@opentelemetry/exporter-jaeger": "1.17.0",
+    "@opentelemetry/exporter-zipkin": "1.17.0",
+    "@opentelemetry/instrumentation": "0.43.0",
+    "@opentelemetry/instrumentation-http": "0.43.0",
+    "@opentelemetry/resources": "1.17.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0",
+    "@opentelemetry/sdk-trace-node": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.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.42.0",
+  "version": "0.43.0",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -43,20 +43,20 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.16.0",
-    "@opentelemetry/core": "1.16.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.42.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.42.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.42.0",
-    "@opentelemetry/exporter-zipkin": "1.16.0",
-    "@opentelemetry/instrumentation": "0.42.0",
-    "@opentelemetry/instrumentation-fetch": "0.42.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.42.0",
-    "@opentelemetry/propagator-b3": "1.16.0",
-    "@opentelemetry/sdk-metrics": "1.16.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0",
-    "@opentelemetry/sdk-trace-web": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0"
+    "@opentelemetry/context-zone": "1.17.0",
+    "@opentelemetry/core": "1.17.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.43.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.43.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
+    "@opentelemetry/exporter-zipkin": "1.17.0",
+    "@opentelemetry/instrumentation": "0.43.0",
+    "@opentelemetry/instrumentation-fetch": "0.43.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.43.0",
+    "@opentelemetry/propagator-b3": "1.17.0",
+    "@opentelemetry/sdk-metrics": "1.17.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0",
+    "@opentelemetry/sdk-trace-web": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.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.42.0",
+  "version": "0.43.0",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/core": "1.16.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.42.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.42.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.42.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.42.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.42.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.42.0",
-    "@opentelemetry/resources": "1.16.0",
-    "@opentelemetry/sdk-metrics": "1.16.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0"
+    "@opentelemetry/core": "1.17.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.43.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.43.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.43.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.43.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.43.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.43.0",
+    "@opentelemetry/resources": "1.17.0",
+    "@opentelemetry/sdk-metrics": "1.17.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

experimental/CHANGELOG.md

@@ -8,6 +8,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :boom: Breaking Change
 
+* fix(exporter-logs-otlp-proto): change OTLPLogExporter to OTLPLogExporter [#4140](https://github.com/open-telemetry/opentelemetry-js/pull/4140) @Vunovati
+
 ### :rocket: (Enhancement)
 
 ### :bug: (Bug Fix)
@@ -16,6 +18,14 @@ All notable changes to experimental packages in this project will be documented
 
 ### :house: (Internal)
 
+## 0.43.0
+
+### :bug: (Bug Fix)
+
+* Revert "feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071)"
+  * This feature was an unintentional breaking change introduced with API 1.5.0
+  * This PR updates all experimental packages to allow API 1.6.0, where this change has been reverted.
+
 ## 0.42.0
 
 ### :boom: Breaking Change

experimental/backwards-compatibility/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "private": true,
   "description": "Backwards compatibility 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.42.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0"
+    "@opentelemetry/sdk-node": "0.43.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

experimental/backwards-compatibility/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "private": true,
   "description": "Backwards compatibility 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.42.0",
-    "@opentelemetry/sdk-trace-base": "1.16.0"
+    "@opentelemetry/sdk-node": "0.43.0",
+    "@opentelemetry/sdk-trace-base": "1.17.0"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

experimental/examples/logs/package.json

@@ -1,12 +1,12 @@
 {
   "name": "logs-example",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "private": true,
   "scripts": {
     "start": "ts-node index.ts"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.5.0",
+    "@opentelemetry/api": "^1.6.0",
     "@opentelemetry/api-logs": "0.41.0",
     "@opentelemetry/sdk-logs": "0.41.0"
   },

experimental/examples/opencensus-shim/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencensus-shim",
   "private": true,
-  "version": "0.42.0",
+  "version": "0.43.0",
   "description": "Example of using @opentelemetry/shim-opencensus in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,12 +29,12 @@
   "dependencies": {
     "@opencensus/core": "0.1.0",
     "@opencensus/nodejs-base": "0.1.0",
-    "@opentelemetry/api": "1.5.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.42.0",
-    "@opentelemetry/resources": "1.16.0",
-    "@opentelemetry/sdk-trace-node": "1.16.0",
-    "@opentelemetry/semantic-conventions": "1.16.0",
-    "@opentelemetry/shim-opencensus": "0.42.0"
+    "@opentelemetry/api": "1.6.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.43.0",
+    "@opentelemetry/resources": "1.17.0",
+    "@opentelemetry/sdk-trace-node": "1.17.0",
+    "@opentelemetry/semantic-conventions": "1.17.0",
+    "@opentelemetry/shim-opencensus": "0.43.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
 }

experimental/examples/prometheus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-prometheus": "0.42.0",
-    "@opentelemetry/sdk-metrics": "1.16.0"
+    "@opentelemetry/exporter-prometheus": "0.43.0",
+    "@opentelemetry/sdk-metrics": "1.17.0"
   }
 }

experimental/packages/api-events/package.json

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

experimental/packages/api-logs/package.json

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