Merge branch 'main' into jamie.update-stalebot

open-telemetry · Dec 20, 2023 · 9279f4b · 9279f4b
2 parents 0f00be7 + c59e666
commit 9279f4b
Show file tree

Hide file tree

Showing 298 changed files with 72,025 additions and 1,364 deletions.
diff --git a/.commitlintrc.yml b/.commitlintrc.yml
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -4,6 +4,9 @@ components:
     - legendecas
   detectors/node/opentelemetry-resource-detector-aws:
     - carolabadeer
+  detectors/node/opentelemetry-resource-detector-azure:
+    - jacksonweber
+    - hectorhdzg
   detectors/node/opentelemetry-resource-detector-container:
     - abhee11
   detectors/node/opentelemetry-resource-detector-gcp:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,38 +9,19 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: node:14
-
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'npm'
 
       - name: Lint markdown files
         uses: avto-dev/markdown-lint@v1
         with:
           ignore: "./**/CHANGELOG.md"
           args: "./**/*.md"
 
-      - name: restore lerna
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
-        id: cache
-        with:
-          path: |
-            ./node_modules
-            ./package-lock.json
-            node_modules
-            detectors/node/*/node_modules
-            metapackages/*/node_modules
-            packages/*/node_modules
-            plugins/node/*/node_modules
-            plugins/web/*/node_modules
-            propagators/*/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
-
-      - name: Bootstrap
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install --only=dev --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='gts' --ignore-scripts -- --only=dev
+      - run: npm ci
       - name: Lint
         run: npm run lint
diff --git a/.github/workflows/peer-api.yaml b/.github/workflows/peer-api.yaml
@@ -10,13 +10,13 @@ jobs:
   peer-api-check:
     runs-on: ubuntu-latest
     container:
-      image: node:14
+      image: node:18
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Install script dependencies
-        run: npm install
+        run: npm ci
 
       - name: Check API dependency semantics
         run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
diff --git a/.github/workflows/release-please-validate.yaml b/.github/workflows/release-please-validate.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install lerna
-        run: npm install -g lerna@5.5.2
+        run: npm install -g lerna@6.6.2
 
       - name: Ensure Release Please Config and Manifest are in sync with the repository
         run: node scripts/check-release-please.mjs
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -15,29 +15,14 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Cache Dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            detectors/node/*/node_modules
-            metapackages/*/node_modules
-            packages/*/node_modules
-            plugins/node/*/node_modules
-            plugins/web/*/node_modules
-            propagators/*/node_modules
-          key: release-${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
-
-      - name: Build Packages
+      - name: Install packages
         run: |
-          npm install
-          npx lerna bootstrap --no-ci
+          npm ci
 
       - uses: google-github-actions/release-please-action@v3
         id: release
@@ -46,6 +31,39 @@ jobs:
           token: ${{secrets.RELEASE_PR_TOKEN}}
           default-branch: main
 
+      # get release PR as we're currently on main
+      - name: Checkout release PR
+        # only checkout if a PR has been created, otherwise this will fail
+        if: ${{ steps.release.outputs.pr }}
+        uses: actions/checkout@v4
+        with:
+          ref: release-please--branches--main
+          # use a token so that workflows on the PR run when we push later
+          token: ${{ secrets.RELEASE_PR_TOKEN }}
+
+      # release-please does not do this on its own, so we do it here instead
+      - name: Update package-lock.json in PR
+        # only update if a PR has been created
+        if: ${{ steps.release.outputs.pr }}
+        run: |
+          npm install --ignore-scripts --package-lock-only
+          git add package-lock.json
+          git config user.name opentelemetrybot
+          git config user.email [email protected]
+          git commit -m "chore: sync package-lock.json"
+          git push
+
+      # get main again
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Rebuild Packages
+        run: |
+          npm ci
+          npm run compile
+
       # Release Please has already incremented versions and published tags, so we just
       # need to publish all unpublished versions to npm here
       # See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package

diff --git a/.github/workflows/test-all-versions.pr.yml b/.github/workflows/test-all-versions.pr.yml
@@ -16,22 +16,19 @@ jobs:
     env:
       PR_LABELS: ${{ toJSON(github.event.pull_request.labels.*.name) }}
     outputs:
-      args: ${{ steps.lerna-args.outputs.args }}
+      args: ${{ steps.npm-workspace-args.outputs.args }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        # Need lerna to list all packages
-      - name: Install lerna
-        run: npm install -g [email protected]
-      - name: Parse labels into lerna scope arguments
-        id: lerna-args
+      - name: Parse labels into npm workspace arguments
+        id: npm-workspace-args
         run: |
-          OUTPUT=`node scripts/parse-lerna-scopes.mjs "$PR_LABELS"`
+          OUTPUT=`node scripts/pr-labels-to-npm-workspace-args.mjs "$PR_LABELS"`
           echo "args=$OUTPUT" >> $GITHUB_OUTPUT
 
   tav:
     uses: ./.github/workflows/test-all-versions.yml
     needs: parse-labels
     with:
-      lerna-args: ${{ needs.parse-labels.outputs.args }}
+      npm-workspace-args: ${{ needs.parse-labels.outputs.args }}
     if: ${{ needs.parse-labels.outputs.args != '' }}
diff --git a/.github/workflows/test-all-versions.push.yml b/.github/workflows/test-all-versions.push.yml
@@ -10,4 +10,4 @@ jobs:
   tav:
     uses: ./.github/workflows/test-all-versions.yml
     with:
-      lerna-args: ""
+      npm-workspace-args: ""
diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -4,11 +4,11 @@ on:
     - cron: "30 4 * * *"
   workflow_dispatch:
     inputs:
-      lerna-args:
+      npm-workspace-args:
         type: string
   workflow_call:
     inputs:
-      lerna-args:
+      npm-workspace-args:
         required: true
         type: string
 
@@ -110,36 +110,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Set MySQL variables
         run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
-      - name: Cache Dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            detectors/node/*/node_modules
-            detectors/node/*/package-lock.json
-            metapackages/*/node_modules
-            metapackages/*/package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            plugins/node/*/node_modules
-            plugins/node/*/package-lock.json
-            plugins/web/*/node_modules
-            plugins/web/*/package-lock.json
-            propagators/*/node_modules
-            propagators/*/package-lock.json
-          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package.json', 'detectors/node/*/package.json', 'metapackages/*/package.json', 'packages/*/package.json', 'plugins/node/*/package.json', 'plugins/web/*/package.json', 'propagators/*/package.json') }}
-      - name: Legacy Peer Dependencies for npm 7
-        if: matrix.node == '16'
-        run: npm config set legacy-peer-deps=true
-      - name: Install Root Dependencies
-        run: npm install --ignore-scripts
-      - name: Bootstrap Dependencies
-        run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
+      - name: Update npm to a version that supports workspaces (v7 or later)
+        if: ${{ matrix.node < 16 }}
+        run: npm install -g npm@9 # npm@9 supports node >=14.17.0
+      - name: Install
+        run: npm ci
+      - name: Build
+        run: npm run compile
       - name: Run test-all-versions
-        run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
+        run: npm run --if-present --workspaces test-all-versions ${{ inputs.npm-workspace-args }}
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -118,43 +118,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - name: Set MySQL variables
         run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
-      - name: Cache Dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            detectors/node/*/node_modules
-            detectors/node/*/package-lock.json
-            metapackages/*/node_modules
-            metapackages/*/package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            plugins/node/*/node_modules
-            plugins/node/*/package-lock.json
-            plugins/web/*/node_modules
-            plugins/web/*/package-lock.json
-            propagators/*/node_modules
-            propagators/*/package-lock.json
-          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package.json', 'detectors/node/*/package.json', 'metapackages/*/package.json', 'packages/*/package.json', 'plugins/node/*/package.json', 'plugins/web/*/package.json', 'propagators/*/package.json') }}
-      - name: Legacy Peer Dependencies for npm 7
-        if: matrix.node == '16'
-        run: npm config set legacy-peer-deps=true
-      - name: Install Root Dependencies
-        run: npm install --ignore-scripts
-      - name: Bootstrap Dependencies
-        run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
+      - name: Update npm to a version that supports workspaces (v7 or later)
+        if: ${{ matrix.node < 16 }}
+        run: npm install -g npm@9 # npm@9 supports node >=14.17.0
+      - name: Install
+        run: npm ci
+      - name: Build
+        run: npm run compile
       - name: Unit tests (Full)
         if: matrix.code-coverage
-        run: npm run test -- ${{ matrix.lerna-extra-args }}
+        run: npm run test
       - name: Unit tests (Delta)
         if: ${{ !matrix.code-coverage }}
-        run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
+        run: npm run test:ci:changed
       - name: Build examples
         run: npm run compile:examples
       - name: Report Coverage
@@ -177,32 +158,16 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Cache Dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            package-lock.json
-            detectors/node/*/node_modules
-            detectors/node/*/package-lock.json
-            metapackages/*/node_modules
-            metapackages/*/package-lock.json
-            packages/*/node_modules
-            packages/*/package-lock.json
-            plugins/node/*/node_modules
-            plugins/node/*/package-lock.json
-            plugins/web/*/node_modules
-            plugins/web/*/package-lock.json
-            propagators/*/node_modules
-            propagators/*/package-lock.json
-          key: ${{ runner.os }}${{ matrix.node }}-browser-${{ hashFiles('package.json', 'detectors/node/*/package.json', 'metapackages/*/package.json', 'packages/*/package.json', 'plugins/node/*/package.json', 'plugins/web/*/package.json', 'propagators/*/package.json') }}
-      - name: Install Root Dependencies
-        run: npm install --ignore-scripts
-      - name: Bootstrap Dependencies
-        run: npx lerna bootstrap --no-ci
+      - name: Update npm to a version that supports workspaces (v7 or later)
+        if: ${{ matrix.node < 16 }}
+        run: npm install -g npm@9 # npm@9 supports node >=14.17.0
+      - name: Install
+        run: npm ci
+      - name: Build
+        run: npm run compile
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage

diff --git a/.gitignore b/.gitignore
@@ -60,9 +60,7 @@ typings/
 
 # lock files
 yarn.lock
-package-lock.json
 packages/**/yarn.lock
-packages/**/package-lock.json
 
 # docs files
 docs

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+lockfile-version=2