[AutoMerge] Merge Staged changes to main

### Auto resolving 101 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 4 DD (Deleted <=> Deleted): 40 AA (Added <=> Added): 55 UD (Updated <=> Deleted): 1 AU (Added <=> Updated): 1 - (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json - Removed from both - (UA) auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/tsconfig.base.esnext.json - Unmerged, added by them => checkout theirs - (DD) auto-merge/js/api/karma.conf.js - Removed from both - (DD) auto-merge/js/api/karma.worker.js - Removed from both - (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/api/tsconfig.esnext.json - Removed from both - (DD) auto-merge/js/api/tsconfig.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/tsconfig.esm.json - Removed from both - (DD) auto-merge/js/experimental/packages/api-logs/tsconfig.esnext.json - Removed from both - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both - (DD) auto-merge/js/experimental/packages/otlp-proto-exporter-base/.npmignore - Removed from both - (DD) auto-merge/js/experimental/packages/sdk-logs/.npmignore - Removed from both ...truncated... Identifying and fixing merge issues from staged repos
open-telemetry · Nov 17, 2023 · 2d6aaeb · 2d6aaeb
2 parents d8fab86 + ff04688
commit 2d6aaeb
Show file tree

Hide file tree

Showing 367 changed files with 134,015 additions and 3,458 deletions.
diff --git a/auto-merge/contrib/.github/component_owners.yml b/auto-merge/contrib/.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/auto-merge/contrib/.github/workflows/lint.yml b/auto-merge/contrib/.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/auto-merge/contrib/.github/workflows/peer-api.yaml b/auto-merge/contrib/.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/auto-merge/contrib/.github/workflows/release-please-validate.yaml b/auto-merge/contrib/.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/auto-merge/contrib/.github/workflows/release-please.yml b/auto-merge/contrib/.github/workflows/release-please.yml
@@ -15,29 +15,15 @@ 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
         run: |
-          npm install
-          npx lerna bootstrap --no-ci
+          npm ci
+          npm run compile
 
       - uses: google-github-actions/release-please-action@v3
         id: release

diff --git a/auto-merge/contrib/.github/workflows/test-all-versions.pr.yml b/auto-merge/contrib/.github/workflows/test-all-versions.pr.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
         # Need lerna to list all packages
       - name: Install lerna
-        run: npm install -g lerna@5.5.2
+        run: npm install -g lerna@6.6.2
       - name: Parse labels into lerna scope arguments
         id: lerna-args
         run: |

diff --git a/auto-merge/contrib/.github/workflows/test-all-versions.yml b/auto-merge/contrib/.github/workflows/test-all-versions.yml
@@ -110,36 +110,20 @@ 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
diff --git a/auto-merge/contrib/.github/workflows/unit-test.yml b/auto-merge/contrib/.github/workflows/unit-test.yml
@@ -118,37 +118,21 @@ 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 }}
@@ -177,32 +161,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/auto-merge/contrib/.gitignore b/auto-merge/contrib/.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/auto-merge/contrib/.npmrc b/auto-merge/contrib/.npmrc
@@ -0,0 +1 @@
+lockfile-version=2
diff --git a/auto-merge/contrib/.release-please-manifest.json b/auto-merge/contrib/.release-please-manifest.json
@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.2","detectors/node/opentelemetry-resource-detector-aws":"1.3.2","detectors/node/opentelemetry-resource-detector-container":"0.3.2","detectors/node/opentelemetry-resource-detector-gcp":"0.29.2","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.2","metapackages/auto-instrumentations-node":"0.39.4","metapackages/auto-instrumentations-web":"0.33.2","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.2","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.2","plugins/node/instrumentation-amqplib":"0.33.2","plugins/node/instrumentation-cucumber":"0.1.1","plugins/node/instrumentation-dataloader":"0.5.2","plugins/node/instrumentation-fs":"0.8.2","plugins/node/instrumentation-lru-memoizer":"0.33.2","plugins/node/instrumentation-mongoose":"0.33.2","plugins/node/instrumentation-socket.io":"0.34.2","plugins/node/instrumentation-tedious":"0.6.2","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.1","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.2","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.2","plugins/node/opentelemetry-instrumentation-dns":"0.32.3","plugins/node/opentelemetry-instrumentation-express":"0.33.2","plugins/node/opentelemetry-instrumentation-fastify":"0.32.3","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.3","plugins/node/opentelemetry-instrumentation-graphql":"0.35.2","plugins/node/opentelemetry-instrumentation-hapi":"0.33.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.2","plugins/node/opentelemetry-instrumentation-knex":"0.32.2","plugins/node/opentelemetry-instrumentation-koa":"0.36.1","plugins/node/opentelemetry-instrumentation-memcached":"0.32.2","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.2","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.2","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.2","plugins/node/opentelemetry-instrumentation-net":"0.32.2","plugins/node/opentelemetry-instrumentation-pg":"0.36.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.2","plugins/node/opentelemetry-instrumentation-redis":"0.35.2","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.3","plugins/node/opentelemetry-instrumentation-restify":"0.34.1","plugins/node/opentelemetry-instrumentation-router":"0.33.2","plugins/node/opentelemetry-instrumentation-winston":"0.32.2","plugins/web/opentelemetry-instrumentation-document-load":"0.33.2","plugins/web/opentelemetry-instrumentation-long-task":"0.33.2","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.2","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.3","detectors/node/opentelemetry-resource-detector-aws":"1.3.3","detectors/node/opentelemetry-resource-detector-azure":"0.2.0","detectors/node/opentelemetry-resource-detector-container":"0.3.3","detectors/node/opentelemetry-resource-detector-gcp":"0.29.3","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.3","metapackages/auto-instrumentations-node":"0.40.0","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.33.2","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.3","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.3","plugins/node/instrumentation-amqplib":"0.33.3","plugins/node/instrumentation-cucumber":"0.1.2","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.3","plugins/node/instrumentation-mongoose":"0.33.3","plugins/node/instrumentation-socket.io":"0.34.3","plugins/node/instrumentation-tedious":"0.6.3","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.33.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.33.3","plugins/node/opentelemetry-instrumentation-fastify":"0.32.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.3","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.2","plugins/node/opentelemetry-instrumentation-memcached":"0.32.3","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.2","plugins/node/opentelemetry-instrumentation-mysql":"0.34.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.3","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.3","plugins/node/opentelemetry-instrumentation-pg":"0.37.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.3","plugins/node/opentelemetry-instrumentation-redis":"0.35.3","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.4","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
diff --git a/auto-merge/contrib/CONTRIBUTING.md b/auto-merge/contrib/CONTRIBUTING.md
@@ -51,7 +51,7 @@ You will receive the following error :
 ✖   type must be one of [ci, feat, fix, docs, style, refactor, perf, test, revert, chore] [type-enum]
 ```
 
-Here an exemple that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
+Here an example that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
 
 ### Fork
 

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.npmignore b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.npmignore
diff --git a/...ntrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/...ntrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -42,6 +42,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.34.2 to ^0.34.3
+
 ## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)
 
 

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -12,7 +12,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
     "prewatch": "npm run precompile",
-    "prepare": "npm run compile",
+    "prepublishOnly": "npm run compile",
     "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",
     "watch": "tsc -w"
@@ -33,17 +33,14 @@
   "files": [
     "build/src/**/*.js",
     "build/src/**/*.js.map",
-    "build/src/**/*.d.ts",
-    "doc",
-    "LICENSE",
-    "README.md"
+    "build/src/**/*.d.ts"
   ],
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.34.2",
+    "@opentelemetry/contrib-test-utils": "^0.34.3",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/.npmignore b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/.npmignore
diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -42,6 +42,12 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.34.2 to ^0.34.3
+
 ## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.0...resource-detector-aws-v1.3.1) (2023-08-14)