Merge branch 'main' into note-fetch-instrumentation

open-telemetry · Nov 9, 2023 · bc180bb · bc180bb
2 parents 4795cda + f665499
commit bc180bb
Show file tree

Hide file tree

Showing 106 changed files with 64,613 additions and 1,071 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -25,27 +25,11 @@ jobs:
 
       - run: npm install -g npm@latest
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
-
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+        run: npm ci
 
       - name: Build 🔧
-        run: |
-          npm run compile
+        run: npm run compile
 
       - name: Benchmark tests
         run: |

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -15,31 +15,9 @@ jobs:
         with:
           node-version: '18'
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
-        id: cache
-        with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
-          path: |
-            package-lock.json
-            packages/*/package-lock.json
-            backwards-compatibility/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
-      - name: Install and Build (cache miss) 🔧
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
-          npm run compile
-
-      - name: Install and Build (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
+      - name: Install and Build 🔧
         run: |
-          npm ci --ignore-scripts
-          npx lerna bootstrap --hoist --nohoist='zone.js'
+          npm ci
           npm run compile
 
       - name: Build Docs

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -34,24 +34,8 @@ jobs:
           args: "./**/*.md"
           ignore: './CHANGELOG.md ./experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos ./experimental/packages/opentelemetry-exporter-metrics-otlp-proto/protos ./packages/exporter-trace-otlp-grpc/protos ./packages/exporter-trace-otlp-proto/protos'
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04142022
-
-      # On a cache miss, install dependencies
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
+        run: npm ci
 
       - name: Lint
         run: |

diff --git a/.github/workflows/peer-api.yml b/.github/workflows/peer-api.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install lerna
-        run: npm install -g lerna
+        run: npm install -g lerna@6.6.2
 
       - name: Install semver
         run: npm install semver

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -33,31 +33,11 @@ jobs:
       - run: npm install -g npm@"<10.0.0"
         if: ${{ matrix.node_version == '14' || matrix.node_version == '16' }}
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
-
-      # temporary fix for https://github.com/nrwl/nx/issues/19022
-      - run: npm install --save-dev nx@16.7.4 @nx/devkit@16.7.4
-        if: ${{ matrix.node_version == '14' }}
-
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+        run: npm ci
 
       - name: Build 🔧
-        run: |
-          npm run compile
+        run: npm run compile
 
       - name: Unit tests
         run: |
@@ -83,23 +63,8 @@ jobs:
 
       - run: npm install -g npm@latest
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-windows-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}
-
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+        run: npm ci
 
       - name: Build 🔧
         run: |
@@ -122,27 +87,11 @@ jobs:
         with:
           node-version: 16
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: browser-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
-
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+        run: npm ci
 
       - name: Build 🔧
-        run: |
-          npm run compile
+        run: npm run compile
 
       - name: Unit tests
         run: npm run test:browser
@@ -159,27 +108,11 @@ jobs:
         with:
           node-version: 16
 
-      - name: restore lerna
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: webworker-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
-
       - name: Bootstrap
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
+        run: npm ci
 
       - name: Build 🔧
-        run: |
-          npm run compile
+        run: npm run compile
 
       - name: Unit tests
         run: npm run test:webworker

diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml
@@ -18,33 +18,11 @@ jobs:
         with:
           node-version: '16'
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
-        id: cache
-        with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
-          path: |
-            package-lock.json
-            packages/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}
-
-      - name: Install and Bootstrap (cache miss) 🔧
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --scope=propagation-validation-server --include-dependencies
-
-      - name: Install and Bootstrap (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
-        run: |
-          npm ci --ignore-scripts
-          npx lerna bootstrap --hoist --scope=propagation-validation-server --include-dependencies
+      - name: Install and Bootstrap 🔧
+        run: npm ci
 
       - name: Generate version.ts files
-        run: lerna run version
+        run: npm run version:update
 
       - name: Build 🔧
         run: npm run compile

diff --git a/.gitignore b/.gitignore
@@ -66,7 +66,6 @@ typings/
 
 # lock files
 yarn.lock
-package-lock.json
 
 # docs files
 docs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,16 +11,34 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :rocket: (Enhancement)
 
-* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas
+### :books: (Refine Doc)
 
-### :bug: (Bug Fix)
+### :house: (Internal)
 
+### :bug: (Bug Fix)
 * fix(sdk-trace): Allow fetch instrumentation to be used with native NodeJS fetch [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
 
-### :books: (Refine Doc)
+## 1.18.1
+
+### :bug: (Bug Fix)
+
+* fix(sdk-metrics): hand-roll MetricAdvice type as older API versions do not include it #4260
+
+## 1.18.0
+
+### :rocket: (Enhancement)
+
+* feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas
+
+### :bug: (Bug Fix)
+
+* fix(core): remove re-export of `version.ts` [#4225](https://github.com/open-telemetry/opentelemetry-js/pull/4225) @david-luna
 
 ### :house: (Internal)
 
+* chore: track package-lock.json [#4238](https://github.com/open-telemetry/opentelemetry-js/pull/4238) @legendecas
+  * Switched to npm workspaces to bootstrap dependencies.
+
 ## 1.17.1
 
 ### :bug: (Bug Fix)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -161,7 +161,7 @@ Most of the commands needed for development are accessed as [npm scripts](https:
 
 ### Install dependencies
 
-This will install all dependencies for the root project and all modules managed by `lerna`. By default, a `postinstall` script will run `lerna bootstrap` automatically after an install. This can be avoided using the `--ignore-scripts` option if desired.
+This will install all dependencies for the root project and all modules managed by `npm workspaces`.
 
 ```sh
 npm install

diff --git a/README.md b/README.md
@@ -143,7 +143,8 @@ The below table describes which versions of each set of packages are expected to
 
 | Stable Packages                                                 | Experimental Packages |
 |-----------------------------------------------------------------|-----------------------|
-| 1.17.x                                                          | 0.43.x                |
+| 1.18.x                                                          | 0.45.x                |
+| 1.17.x                                                          | 0.44.x                |
 | 1.16.x                                                          | 0.42.x                |
 | 1.15.x                                                          | 0.41.x                |
 | 1.14.x                                                          | 0.40.x                |

diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 1.7.0
+
 ### :rocket: (Enhancement)
 
 * feat(metrics): prototype experimental advice support [#3876](https://github.com/open-telemetry/opentelemetry-js/pull/3876) @legendecas
+* feat(api): publish api esnext target [#4231](https://github.com/open-telemetry/opentelemetry-js/pull/4231) @legendecas
 
 ## 1.6.0
 

diff --git a/api/package.json b/api/package.json
@@ -1,13 +1,15 @@
 {
   "name": "@opentelemetry/api",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Public API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
+  "esnext": "build/esnext/index.js",
   "types": "build/src/index.d.ts",
   "browser": {
     "./src/platform/index.ts": "./src/platform/browser/index.ts",
     "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
+    "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
     "./build/src/platform/index.js": "./build/src/platform/browser/index.js"
   },
   "repository": "open-telemetry/opentelemetry-js",
@@ -51,6 +53,9 @@
     "build/esm/**/*.js",
     "build/esm/**/*.js.map",
     "build/esm/**/*.d.ts",
+    "build/esnext/**/*.js",
+    "build/esnext/**/*.js.map",
+    "build/esnext/**/*.d.ts",
     "build/src/**/*.js",
     "build/src/**/*.js.map",
     "build/src/**/*.d.ts",
@@ -61,23 +66,23 @@
     "access": "public"
   },
   "devDependencies": {
-    "@types/mocha": "10.0.2",
+    "@types/mocha": "10.0.3",
     "@types/node": "18.6.5",
-    "@types/sinon": "10.0.19",
-    "@types/webpack": "4.41.34",
+    "@types/sinon": "10.0.20",
+    "@types/webpack": "4.41.35",
     "@types/webpack-env": "1.16.3",
+    "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
     "cross-var": "1.1.0",
     "dpdm": "3.13.1",
-    "babel-plugin-istanbul": "6.1.1",
     "karma": "6.4.2",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
     "karma-mocha-webworker": "1.3.0",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "4.0.2",
-    "lerna": "7.1.5",
+    "lerna": "6.6.2",
     "memfs": "3.5.3",
     "mocha": "10.2.0",
     "nyc": "15.1.0",

diff --git a/api/test/tree-shaking/tree-shaking.test.ts b/api/test/tree-shaking/tree-shaking.test.ts
@@ -95,7 +95,7 @@ describe('tree-shaking', () => {
           if (err) {
             return reject(err);
           }
-          resolve(stats);
+          resolve(stats!);
         });
       });
       assert.deepStrictEqual(stats.compilation.errors, []);