Merge branch 'main' into fix/4130

open-telemetry · Sep 12, 2023 · 4adcd28 · 4adcd28
2 parents 11051ce + 4f28f90
commit 4adcd28
Show file tree

Hide file tree

Showing 83 changed files with 562 additions and 510 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -15,7 +15,7 @@ jobs:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Check for CHANGELOG changes
         run: |

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,25 +2,17 @@ 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:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           node-version: '16'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Lint changelog file
         uses: avto-dev/markdown-lint@v1

diff --git a/.github/workflows/peer-api.yml b/.github/workflows/peer-api.yml
@@ -14,7 +14,7 @@ jobs:
       image: node:20
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install lerna
         run: npm install -g lerna

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -20,7 +20,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
@@ -75,7 +75,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
@@ -116,7 +116,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
@@ -154,7 +154,7 @@ jobs:
       NPM_CONFIG_UNSAFE_PERM: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
       - uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -196,7 +196,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,24 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
-* feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071)
+### :bug: (Bug Fix)
+
+### :books: (Refine Doc)
+
+### :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)
+
 * feat(sdk-metrics): implement MetricProducer specification [#4007](https://github.com/open-telemetry/opentelemetry-js/pull/4007)
 * feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass
 
@@ -27,8 +44,6 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 * docs(guidelines): add dependencies guidelines [#4040](https://github.com/open-telemetry/opentelemetry-js/pull/4040)
 
-### :house: (Internal)
-
 ## 1.15.2
 
 ### :bug: (Bug Fix)

diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
@@ -4,6 +4,15 @@ 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)"
+  * This feature was an unintentional breaking change introduced with 1.5.0
+
+## 1.5.0
+
 ### :rocket: (Enhancement)
 
 * feat(api): add attributes argument to recordException API [#4071](https://github.com/open-telemetry/opentelemetry-js/pull/4071)

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

diff --git a/api/src/trace/NonRecordingSpan.ts b/api/src/trace/NonRecordingSpan.ts
@@ -71,9 +71,5 @@ export class NonRecordingSpan implements Span {
   }
 
   // By default does nothing
-  recordException(
-    _exception: Exception,
-    _attributesOrStartTime?: SpanAttributes | TimeInput,
-    _time?: TimeInput
-  ): void {}
+  recordException(_exception: Exception, _time?: TimeInput): void {}
 }
diff --git a/api/src/trace/span.ts b/api/src/trace/span.ts
@@ -126,17 +126,4 @@ export interface Span {
    *     use the current time.
    */
   recordException(exception: Exception, time?: TimeInput): void;
-
-  /**
-   * Sets exception as a span event
-   * @param exception the exception the only accepted values are string or Error
-   * @param [attributes] the attributes that will be added to the error event.
-   * @param [time] the time to set as Span's event time. If not provided,
-   *     use the current time.
-   */
-  recordException(
-    exception: Exception,
-    attributes?: SpanAttributes,
-    time?: TimeInput
-  ): void;
 }
diff --git a/examples/esm-http-ts/package.json b/examples/esm-http-ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "esm-http-ts",
   "private": true,
-  "version": "0.41.2",
+  "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.4.1",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
-    "@opentelemetry/instrumentation": "0.41.2",
-    "@opentelemetry/instrumentation-http": "0.41.2",
-    "@opentelemetry/resources": "1.15.2",
-    "@opentelemetry/sdk-trace-base": "1.15.2",
-    "@opentelemetry/sdk-trace-node": "1.15.2",
-    "@opentelemetry/semantic-conventions": "1.15.2"
+    "@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"
   }
 }
diff --git a/examples/http/package.json b/examples/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.41.2",
+  "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.15.2",
-    "@opentelemetry/exporter-zipkin": "1.15.2",
-    "@opentelemetry/instrumentation": "0.41.2",
-    "@opentelemetry/instrumentation-http": "0.41.2",
-    "@opentelemetry/resources": "1.15.2",
-    "@opentelemetry/sdk-trace-base": "1.15.2",
-    "@opentelemetry/sdk-trace-node": "1.15.2",
-    "@opentelemetry/semantic-conventions": "1.15.2"
+    "@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": {

diff --git a/examples/https/package.json b/examples/https/package.json
@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.41.2",
+  "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.15.2",
-    "@opentelemetry/exporter-zipkin": "1.15.2",
-    "@opentelemetry/instrumentation": "0.41.2",
-    "@opentelemetry/instrumentation-http": "0.41.2",
-    "@opentelemetry/resources": "1.15.2",
-    "@opentelemetry/sdk-trace-base": "1.15.2",
-    "@opentelemetry/sdk-trace-node": "1.15.2",
-    "@opentelemetry/semantic-conventions": "1.15.2"
+    "@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": {

diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.41.2",
+  "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.15.2",
-    "@opentelemetry/core": "1.15.2",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.41.2",
-    "@opentelemetry/exporter-trace-otlp-http": "0.41.2",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
-    "@opentelemetry/exporter-zipkin": "1.15.2",
-    "@opentelemetry/instrumentation": "0.41.2",
-    "@opentelemetry/instrumentation-fetch": "0.41.2",
-    "@opentelemetry/instrumentation-xml-http-request": "0.41.2",
-    "@opentelemetry/propagator-b3": "1.15.2",
-    "@opentelemetry/sdk-metrics": "1.15.2",
-    "@opentelemetry/sdk-trace-base": "1.15.2",
-    "@opentelemetry/sdk-trace-web": "1.15.2",
-    "@opentelemetry/semantic-conventions": "1.15.2"
+    "@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"
 }
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.41.2",
+  "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.15.2",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.41.2",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.41.2",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.41.2",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.41.2",
-    "@opentelemetry/exporter-trace-otlp-http": "0.41.2",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.41.2",
-    "@opentelemetry/resources": "1.15.2",
-    "@opentelemetry/sdk-metrics": "1.15.2",
-    "@opentelemetry/sdk-trace-base": "1.15.2",
-    "@opentelemetry/semantic-conventions": "1.15.2"
+    "@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"
 }