From 947595153b9294bf0115ed54b8efe1155c7f6db0 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 14:37:53 +0700 Subject: [PATCH 01/20] chore: update lerna to v7 and migrate to npm workspace --- .github/workflows/lint.yml | 1 - .github/workflows/release-please.yml | 1 - .github/workflows/test-all-versions.yml | 4 +--- .github/workflows/unit-test.yml | 8 ++------ .../package.json | 2 +- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 1 - .../package.json | 3 +-- .../package.json | 1 - .../auto-instrumentations-node/package.json | 3 +-- .../auto-instrumentations-web/package.json | 3 +-- package.json | 19 +++++++++++++------ .../opentelemetry-host-metrics/package.json | 3 +-- .../package.json | 5 ++--- .../package.json | 3 +-- .../opentelemetry-redis-common/package.json | 1 - .../package.json | 4 +--- .../opentelemetry-sql-common/package.json | 1 - .../opentelemetry-test-utils/package.json | 1 - .../node/instrumentation-amqplib/package.json | 3 +-- .../instrumentation-dataloader/package.json | 1 - plugins/node/instrumentation-fs/package.json | 3 +-- .../instrumentation-lru-memoizer/package.json | 1 - .../instrumentation-mongoose/package.json | 1 - .../instrumentation-socket.io/package.json | 1 - .../node/instrumentation-tedious/package.json | 1 - .../package.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 1 - .../src/utils.ts | 1 + .../package.json | 1 - .../package.json | 1 - .../package.json | 3 +-- .../package.json | 5 ++--- .../package.json | 1 - .../package.json | 3 +-- .../package.json | 1 - .../package.json | 1 - .../package.json | 3 +-- .../package.json | 1 - .../package.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 1 - .../package.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 6 ++---- .../tsconfig.esm.json | 1 - .../package.json | 3 +-- .../src/internal-types.ts | 1 + .../tsconfig.esm.json | 1 - .../tsconfig.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- .../package.json | 1 - .../package.json | 3 +-- .../package.json | 3 +-- scripts/update-core-deps.js | 2 +- 69 files changed, 57 insertions(+), 118 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b7fc1072a3..23afe0cd52 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -41,6 +41,5 @@ jobs: 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 - name: Lint run: npm run lint diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 6cd76a49ea..dc81fcb06a 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -37,7 +37,6 @@ jobs: - name: Build Packages run: | npm install - npx lerna bootstrap --no-ci - uses: google-github-actions/release-please-action@v3 id: release diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index f272f039a5..fbbcfeb7ea 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -144,8 +144,6 @@ jobs: 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' + run: npm install - 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/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 57c9f4e143..d52d364894 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -149,9 +149,7 @@ jobs: 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' + run: npm install - name: Unit tests run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples @@ -199,9 +197,7 @@ jobs: 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 + run: npm install - name: Unit tests run: npm run test:browser - name: Report Coverage diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json index e6037e840a..fbe10964fa 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/archive/opentelemetry-browser-extension-autoinjection/package.json @@ -35,7 +35,7 @@ "@types/mocha": "8.2.3", "@types/react": "17.0.16", "@types/react-dom": "18.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/sinon-chrome": "2.2.11", "@typescript-eslint/eslint-plugin": "5.8.1", "@typescript-eslint/parser": "5.8.1", diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 66585dcf06..bd234caad2 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -12,7 +12,6 @@ "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", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "tsc -w" @@ -46,7 +45,7 @@ "@opentelemetry/contrib-test-utils": "^0.33.4", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index dae53b7b63..7aec13eb7e 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "tsc -w" @@ -45,7 +44,7 @@ "@opentelemetry/contrib-test-utils": "^0.33.4", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nock": "12.0.3", "nyc": "15.1.0", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index b5fc5e7357..22cce7b6a8 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/resource-detector-container --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "version:update": "node ../../../scripts/version-update.js", @@ -39,7 +38,7 @@ "@opentelemetry/contrib-test-utils": "^0.33.4", "@types/mocha": "8.2.3", "@types/node": "^18.0.0", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "eslint-plugin-header": "^3.1.1", "mocha": "7.2.0", "nock": "12.0.3", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index a0de2cef03..7639ee88f3 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-gcp --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "tsc -w" diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index 841c90fab3..d5c1bf3355 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-github --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "tsc -w" @@ -48,7 +47,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 4a0963bd7b..6f55a1a554 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-instana --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "tsc -w" diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 95bdd589d9..c1ec413430 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -25,7 +25,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-node --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "yarn test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.ts'", "watch": "tsc -w" @@ -40,7 +39,7 @@ "@opentelemetry/api": "^1.4.1", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 5fd9c2964b..ea0633c1ad 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -22,7 +22,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-web --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, @@ -37,7 +36,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/package.json b/package.json index 4cb48e1ea4..b45e12bb71 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "types": "build/src/index.d.ts", "scripts": { "clean": "lerna run clean", - "postinstall": "npm run bootstrap", + "postinstall": "lerna run compile", "prepare": "husky install", "precompile": "tsc --version && npm run version:update", "version:update": "lerna run version:update", @@ -23,15 +23,12 @@ "test": "lerna run test", "test:ci:changed": "lerna run test --since origin/main", "test:browser": "lerna run test:browser --concurrency 1", - "bootstrap": "lerna bootstrap --no-ci", "bump": "lerna publish", "changelog": "lerna-changelog", - "lerna:link": "lerna link", "lint": "lerna run lint", "lint:fix": "lerna run lint:fix", "lint:examples": "eslint ./examples/**/*.js", - "lint:examples:fix": "eslint ./examples/**/*.js --fix", - "lerna:scope": "lerna bootstrap --include-dependents --include-dependencies --scope" + "lint:examples:fix": "eslint ./examples/**/*.js --fix" }, "keywords": [ "opentelemetry", @@ -56,12 +53,22 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "4.2.1", "husky": "7.0.4", - "lerna": "5.5.2", + "lerna": "7.1.1", "lerna-changelog": "2.2.0", "prettier": "2.8.7", "typescript": "4.4.4", "tslib": "^2.3.1" }, + "workspaces": [ + "packages/*", + "metapackages/*", + "plugins/node/*", + "plugins/node/*/examples", + "plugins/web/*", + "plugins/web/*/examples", + "propagators/*", + "detectors/node/*" + ], "changelog": { "labels": { "breaking": ":boom: Breaking Change", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index d5ba9f3475..68eab484a1 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/host-metrics --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", "version:update": "node ../../scripts/version-update.js", @@ -49,7 +48,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 8f84ed2ca9..2d0caf27df 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -23,8 +23,7 @@ "test:browser": "nyc karma start --single-run", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "opentelemetry", @@ -57,7 +56,7 @@ "@opentelemetry/api": "^1.0.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", "karma": "6.3.16", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 8a442fc0ec..4b85643941 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -13,7 +13,6 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagation-utils --include-dependencies", - "prepare": "npm run compile", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", @@ -48,7 +47,7 @@ "@opentelemetry/contrib-test-utils": "^0.33.4", "@types/mocha": "^9.1.1", "@types/node": "18.11.7", - "@types/sinon": "^10.0.11", + "@types/sinon": "10.0.15", "expect": "29.2.0", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index 51604ed210..f61a88493f 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -13,7 +13,6 @@ "compile": "tsc --build tsconfig.json", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/redis-common --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "watch": "tsc -w" }, diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 0f1a62c51e..868e69cd55 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -34,7 +34,6 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sampler-aws-xray --include-dependencies", "prewatch": "npm run precompile", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../scripts/version-update.js", @@ -55,7 +54,7 @@ "@opentelemetry/contrib-test-utils": "^0.33.1", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.6", + "@types/sinon": "10.0.15", "eslint": "8.7.0", "expect": "29.2.0", "mocha": "7.2.0", @@ -64,7 +63,6 @@ "ts-mocha": "10.0.0", "nyc": "15.1.0", "typescript": "4.4.4", - "gts": "3.1.0", "@typescript-eslint/eslint-plugin": "5.8.1", "@typescript-eslint/parser": "5.8.1" }, diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json index a194f92524..6c6881c20b 100644 --- a/packages/opentelemetry-sql-common/package.json +++ b/packages/opentelemetry-sql-common/package.json @@ -13,7 +13,6 @@ "compile": "tsc --build tsconfig.json", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sql-common --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "watch": "tsc -w" }, diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index 78f1e3af11..5238e8001b 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -13,7 +13,6 @@ "compile": "tsc -p .", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/contrib-test-utils --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "watch": "tsc -w" }, "repository": "open-telemetry/opentelemetry-js-contrib", diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 9c0cfa10b7..10f934fa6f 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -34,7 +34,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-amqplib --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -57,7 +56,7 @@ "@types/amqplib": "^0.5.17", "@types/lodash": "4.14.178", "@types/mocha": "8.2.3", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/node": "18.11.7", "amqplib": "0.8.0", "expect": "29.2.0", diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index e270e078b8..8a9909e900 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dataloader --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index 19422a709e..046891f18c 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-fs --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." }, @@ -49,7 +48,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "^10.0.11", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index 6c569adef1..a50c04aef7 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -14,7 +14,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-lru-memoizer --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." }, diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 9f7c59633f..5814a7cd37 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -15,7 +15,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-mongoose --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." }, diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 17fc26680f..715314d149 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -14,7 +14,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-socket.io --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." }, diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index cf51a7691a..d612e6fd09 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -12,7 +12,6 @@ "lint": "eslint . --ext .ts", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-tedious --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 55fd53b17e..c168c68eaa 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-lambda --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index 2ed8a50c6c..e26f2aac02 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -35,7 +35,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-sdk --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -64,7 +63,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.6", + "@types/sinon": "10.0.15", "aws-sdk": "2.1008.0", "eslint": "8.7.0", "expect": "29.2.0", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 90a3705c3b..ab37d8e071 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-bunyan --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", @@ -53,7 +52,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "bunyan": "1.8.15", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 0de9dec3da..9a7e00189d 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cassandra-driver --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, @@ -54,7 +53,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.11.7", "@types/semver": "7.3.8", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "cassandra-driver": "4.6.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 34d640fe9e..fbf02bd079 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-connect --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", "watch": "tsc -w" diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index d0d5b1be0d..96402e9ccd 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dns --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, @@ -53,7 +52,7 @@ "@types/node": "18.11.7", "@types/semver": "7.3.8", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index 724fa4cb89..947bc77dcc 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -17,7 +17,6 @@ "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", "compile:examples": "cd examples && npm run compile", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ @@ -54,7 +53,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "express": "4.17.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index 946d4939ee..8150cda11e 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -11,7 +11,6 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-fastify --include-dependencies", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", "prewatch": "npm run precompile", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts b/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts index 0ff05492a3..35b5644509 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-fastify/src/utils.ts @@ -42,6 +42,7 @@ export function startSpan( const spans: Span[] = reply[spanRequestSymbol] || []; spans.push(span); + // eslint-disable-next-line @typescript-eslint/no-floating-promises -- as reply have then method, Object.defineProperty(reply) will also return a promise like object Object.defineProperty(reply, spanRequestSymbol, { enumerable: false, configurable: true, diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index a98d5c1cb5..1be9174f74 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -15,7 +15,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 0e6c47c10d..b45dec041b 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-graphql --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index 19eefe7065..b005850238 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -14,8 +14,7 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-hapi --include-dependencies", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepare": "npm run compile" + "compile": "tsc -p ." }, "keywords": [ "hapi", diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index a1507eaa4f..7c0afd18d5 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -18,8 +18,7 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-ioredis --include-dependencies", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepare": "npm run compile" + "compile": "tsc -p ." }, "keywords": [ "instrumentation", @@ -56,7 +55,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "@types/node": "18.11.7", "cross-env": "7.0.3", "ioredis": "5.2.2", diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index e5b1553a6c..872bc9e0c2 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -15,7 +15,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index 18d52a52b6..10dd735f07 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -17,7 +17,6 @@ "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", "compile:examples": "cd examples && npm run compile", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ @@ -56,7 +55,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.9", + "@types/sinon": "10.0.15", "koa": "2.13.1", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 0d4a84bc57..9e305f0338 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-memcached --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test:debug": "cross-env RUN_MEMCACHED_TESTS_LOCAL=true ts-mocha --inspect-brk --no-timeouts -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index e2a54723be..bfd7200c1b 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -21,7 +21,6 @@ "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", "compile:examples": "cd examples && npm run compile", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index d15998bdeb..a0409f1a25 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -12,7 +12,6 @@ "lint": "eslint . --ext .ts", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", @@ -53,7 +52,7 @@ "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.13", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "mysql": "2.18.1", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index 2e627296d5..70783838fa 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -12,7 +12,6 @@ "lint": "eslint . --ext .ts", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql2 --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index 8135edb606..73bf75cbef 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-nestjs-core --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha --timeout 5000 -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index df6bc5974b..b5d9dca7f3 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -13,7 +13,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-net --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, @@ -52,7 +51,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "rimraf": "5.0.0", diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 8f700a563c..f0f88b1133 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -12,7 +12,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pg --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "cross-env IN_TAV=true tav", @@ -60,7 +59,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "cross-env": "7.0.3", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index de187ff65e..d086ef7c59 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -14,7 +14,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pino --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, @@ -54,7 +53,7 @@ "@types/mocha": "7.0.2", "@types/node": "18.11.7", "@types/semver": "7.3.8", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "mocha": "7.2.0", "nyc": "15.1.0", "pino": "8.3.1", diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index 8d84fc5577..4e76c5978d 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -20,8 +20,7 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-redis-4 --include-dependencies", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", - "compile": "tsc -p .", - "prepare": "npm run compile" + "compile": "tsc -p ." }, "keywords": [ "instrumentation", diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 3942689cbf..47a8cf95b0 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -21,8 +21,7 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", - "compile:examples": "cd examples && npm run compile", - "prepare": "npm run compile" + "compile:examples": "cd examples && npm run compile" }, "keywords": [ "instrumentation", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index db1e2b1716..8af66e4189 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -11,7 +11,6 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-restify --include-dependencies", - "prepare": "npm run compile", "prewatch": "npm run precompile", "tdd": "yarn test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index 9f0ac7e26f..465791b7e8 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -15,7 +15,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index 166ffc5522..609cd2aed1 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -14,7 +14,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-winston --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, @@ -53,7 +52,7 @@ "@opentelemetry/sdk-trace-node": "^1.8.0", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/triple-beam": "^1.3.2", "mocha": "7.2.0", "nyc": "15.1.0", diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 463dab2513..b1f87d927c 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -14,7 +14,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build -watch tsconfig.json tsconfig.esm.json" @@ -54,7 +53,7 @@ "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index 6604fafa39..8b14703804 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -14,7 +14,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" @@ -53,7 +52,7 @@ "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", @@ -73,8 +72,7 @@ "typescript": "4.4.4", "webpack": "4.46.0", "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0", - "zone.js": "0.11.4" + "webpack-merge": "5.8.0" }, "dependencies": { "@opentelemetry/core": "^1.8.0", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json b/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json index d903fa3086..379f547a46 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json @@ -5,7 +5,6 @@ "outDir": "build/esm", "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, - "files": [ "node_modules/zone.js/dist/zone.js.d.ts"], "include": [ "src/**/*.ts" ] diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index b4b5909677..57486d511e 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -14,7 +14,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" @@ -55,7 +54,7 @@ "@types/jquery": "3.5.6", "@types/mocha": "7.0.2", "@types/node": "18.11.7", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts b/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts index a845906632..61229732ff 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/src/internal-types.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/// import { HrTime } from '@opentelemetry/api'; import { EventName } from './types'; diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json index 0bbc54d329..2eb13ff857 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json @@ -6,7 +6,6 @@ "skipLibCheck": true, "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" }, - "files": [ "node_modules/zone.js/dist/zone.js.d.ts"], "include": [ "src/**/*.ts" ] diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json index ea1dd61b2c..5c3680dd33 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.json @@ -5,7 +5,6 @@ "outDir": "build", "skipLibCheck": true }, - "files": [ "node_modules/zone.js/dist/zone.js.d.ts"], "include": [ "src/**/*.ts", "test/**/*.ts" diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 99be2797f8..907602c307 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -14,7 +14,6 @@ "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile", "tdd": "karma start", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" @@ -56,7 +55,7 @@ "@types/react-addons-test-utils": "0.14.26", "@types/react-dom": "18.0.2", "@types/shimmer": "1.0.2", - "@types/sinon": "10.0.2", + "@types/sinon": "10.0.15", "@types/webpack-env": "1.16.2", "babel-loader": "8.2.2", "@jsdevtools/coverage-istanbul-loader": "3.0.5", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 237589324c..43e0fb5fd9 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -15,8 +15,7 @@ "test:browser": "nyc karma start --single-run", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "opentelemetry", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index 0eaabc96b5..5a98387ead 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -15,7 +15,6 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-grpc-census-binary --include-dependencies", "prewatch": "npm run precompile", "compile": "tsc -p .", - "prepare": "npm run compile", "watch": "tsc -w" }, "keywords": [ diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index c6434a0b9e..9a38915993 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -15,8 +15,7 @@ "test:browser": "nyc karma start --single-run", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "opentelemetry", diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 9bb140fb36..309f4e0abf 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -15,8 +15,7 @@ "test:browser": "nyc karma start --single-run", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "prepare": "npm run compile" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" }, "keywords": [ "opentelemetry", diff --git a/scripts/update-core-deps.js b/scripts/update-core-deps.js index a16df96317..07aa72061b 100644 --- a/scripts/update-core-deps.js +++ b/scripts/update-core-deps.js @@ -27,7 +27,7 @@ * `CORE_REPOSITORY=../../otel-core node scripts/update-core-deps.js * * Note that this only updates the versions in the package.json for each package - * and you will still need to run `lerna bootstrap` and make any necessary + * and you will still need to run `npm run compile` and make any necessary * code changes. */ From 7226771dd0b0717f3ca010d68e3a6750e6c30513 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 15:37:51 +0700 Subject: [PATCH 02/20] chore: update minimum version of npm in github action --- .github/workflows/unit-test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index d52d364894..c7e8b1397a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -124,6 +124,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + - name: Install minimum npm 7 + if: matrix.node == '14' + run: npm install -g npm@7 - 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 @@ -146,7 +149,6 @@ jobs: 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 @@ -177,6 +179,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + - name: Install minimum npm 7 + if: matrix.node == '14' + run: npm install -g npm@7 - name: Cache Dependencies uses: actions/cache@v3 with: @@ -196,6 +201,8 @@ jobs: 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: Legacy Peer Dependencies for npm 7 + run: npm config set legacy-peer-deps=true - name: Install Root Dependencies run: npm install - name: Unit tests From 0da436e0be7a88d90adc99cf5b637e5a2961a5a4 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 17:35:29 +0700 Subject: [PATCH 03/20] chore: increase max_old_space_size to prevent gc --- .github/workflows/unit-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index c7e8b1397a..30d18763be 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -153,6 +153,8 @@ jobs: - name: Install Root Dependencies run: npm install - name: Unit tests + env: + NODE_OPTIONS: "--max_old_space_size=4096" run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples From 4b7572acaa682b02b616a1d42060eed5a120cc70 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 18:30:41 +0700 Subject: [PATCH 04/20] chore: increase max_old_space_size only on node@18 --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 30d18763be..184294c4aa 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -154,7 +154,7 @@ jobs: run: npm install - name: Unit tests env: - NODE_OPTIONS: "--max_old_space_size=4096" + NODE_OPTIONS: ${{ matrix.node == '18' && '--max_old_space_size=4096' || '' }} run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples From 0caf8a9bfc711d0845d6abc2a9bee4392a6ace23 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 19:32:05 +0700 Subject: [PATCH 05/20] chore: set concurrency to 5 for node@18 --- .github/workflows/unit-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 184294c4aa..292aad94da 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,6 +13,7 @@ jobs: include: - node: "18" lerna-extra-args: >- + --concurrency 5 --ignore @opentelemetry/resource-detector-alibaba-cloud --ignore @opentelemetry/instrumentation-fastify --ignore @opentelemetry/instrumentation-restify @@ -153,8 +154,6 @@ jobs: - name: Install Root Dependencies run: npm install - name: Unit tests - env: - NODE_OPTIONS: ${{ matrix.node == '18' && '--max_old_space_size=4096' || '' }} run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples From 650e2d9aebaeb0bda084ba82656dfa4a65d8a634 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 19:58:13 +0700 Subject: [PATCH 06/20] Revert "chore: set concurrency to 5 for node@18" This reverts commit 0caf8a9bfc711d0845d6abc2a9bee4392a6ace23. --- .github/workflows/unit-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 292aad94da..184294c4aa 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -13,7 +13,6 @@ jobs: include: - node: "18" lerna-extra-args: >- - --concurrency 5 --ignore @opentelemetry/resource-detector-alibaba-cloud --ignore @opentelemetry/instrumentation-fastify --ignore @opentelemetry/instrumentation-restify @@ -154,6 +153,8 @@ jobs: - name: Install Root Dependencies run: npm install - name: Unit tests + env: + NODE_OPTIONS: ${{ matrix.node == '18' && '--max_old_space_size=4096' || '' }} run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples From 9ee604d61903dc151c57f97d51c5f3a536cef54c Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 6 Jul 2023 20:25:03 +0700 Subject: [PATCH 07/20] chore: set max_old_space_size for all node version --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 184294c4aa..122907cdb4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -154,7 +154,7 @@ jobs: run: npm install - name: Unit tests env: - NODE_OPTIONS: ${{ matrix.node == '18' && '--max_old_space_size=4096' || '' }} + NODE_OPTIONS: --max_old_space_size=4096 run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} - name: Build examples run: npm run compile:examples From 3f1698da1e0ab78bfc2701337eb3d3861273eec3 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Mon, 10 Jul 2023 09:57:38 +0700 Subject: [PATCH 08/20] chore: add nx.json to cache some task --- .gitignore | 4 ++++ nx.json | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 nx.json diff --git a/.gitignore b/.gitignore index 547db388f6..7346a08672 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,9 @@ typings/ # Optional eslint cache .eslintcache +# Optional nx task run cache +.nxcache + # Optional REPL history .node_repl_history @@ -85,3 +88,4 @@ package.json.lerna_backup # version.ts file is automatically generated at compile time version.ts /.vs + diff --git a/nx.json b/nx.json new file mode 100644 index 0000000000..04fb3c2d0b --- /dev/null +++ b/nx.json @@ -0,0 +1,54 @@ +{ + "namedInputs": { + "version": ["{projectRoot}/package.json"], + "default": [ + "{projectRoot}/**/*", + "!{projectRoot}/node_modules/**/*", + "!{projectRoot}/build/**/*", + "!{projectRoot}/coverage/**/*", + "!{projectRoot}/.nyc_output/**/*" + ], + "production": ["!{projectRoot}/test/**/*"] + }, + "tasksRunnerOptions": { + "default": { + "runner": "nx/tasks-runners/default", + "options": { + "cacheableOperations": [ + "test", + "compile", + "lint", + "version:update" + ], + "cacheDirectory": ".nxcache" + } + } + }, + "targetDefaults": { + "compile": { + "inputs": ["default", "^production"], + "dependsOn": [ + "^compile", "version:update" + ], + "outputs": [ + "{projectRoot}/build" + ] + }, + "test": { + "inputs": ["default"], + "dependsOn": [ + "^compile" + ], + "outputs": [ + "{projectRoot}/coverage", + "{projectRoot}/.nyc_output" + ] + }, + "version:update": { + "inputs": ["version"], + "outputs": [ + "{projectRoot}/src/version.ts" + ] + } + } +} From 5f9f67e436d0102d720aa8fe03f8471295692f4a Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Mon, 10 Jul 2023 11:33:57 +0700 Subject: [PATCH 09/20] Revert "chore: add nx.json to cache some task" This reverts commit 3f1698da1e0ab78bfc2701337eb3d3861273eec3. --- .gitignore | 4 ---- nx.json | 54 ------------------------------------------------------ 2 files changed, 58 deletions(-) delete mode 100644 nx.json diff --git a/.gitignore b/.gitignore index 7346a08672..547db388f6 100644 --- a/.gitignore +++ b/.gitignore @@ -43,9 +43,6 @@ typings/ # Optional eslint cache .eslintcache -# Optional nx task run cache -.nxcache - # Optional REPL history .node_repl_history @@ -88,4 +85,3 @@ package.json.lerna_backup # version.ts file is automatically generated at compile time version.ts /.vs - diff --git a/nx.json b/nx.json deleted file mode 100644 index 04fb3c2d0b..0000000000 --- a/nx.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "namedInputs": { - "version": ["{projectRoot}/package.json"], - "default": [ - "{projectRoot}/**/*", - "!{projectRoot}/node_modules/**/*", - "!{projectRoot}/build/**/*", - "!{projectRoot}/coverage/**/*", - "!{projectRoot}/.nyc_output/**/*" - ], - "production": ["!{projectRoot}/test/**/*"] - }, - "tasksRunnerOptions": { - "default": { - "runner": "nx/tasks-runners/default", - "options": { - "cacheableOperations": [ - "test", - "compile", - "lint", - "version:update" - ], - "cacheDirectory": ".nxcache" - } - } - }, - "targetDefaults": { - "compile": { - "inputs": ["default", "^production"], - "dependsOn": [ - "^compile", "version:update" - ], - "outputs": [ - "{projectRoot}/build" - ] - }, - "test": { - "inputs": ["default"], - "dependsOn": [ - "^compile" - ], - "outputs": [ - "{projectRoot}/coverage", - "{projectRoot}/.nyc_output" - ] - }, - "version:update": { - "inputs": ["version"], - "outputs": [ - "{projectRoot}/src/version.ts" - ] - } - } -} From 2e07402e5fb7b803f7c921077e17c3df813fe4da Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Tue, 11 Jul 2023 10:35:16 +0700 Subject: [PATCH 10/20] chore: replace custom node_modules cache with standard setup-node cache --- .github/workflows/unit-test.yml | 56 +++++++++++---------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 122907cdb4..96865858fe 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -124,30 +124,20 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + cache: 'npm' + cache-dependency-path: | + '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 minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 - 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 run: npm config set legacy-peer-deps=true - name: Install Root Dependencies @@ -181,28 +171,18 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + cache: 'npm' + cache-dependency-path: | + '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 minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 - - 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: Legacy Peer Dependencies for npm 7 run: npm config set legacy-peer-deps=true - name: Install Root Dependencies From a547b2ef3872dfc56d92b8a69be9b0f27aed1a6e Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Tue, 11 Jul 2023 10:39:40 +0700 Subject: [PATCH 11/20] chore: replace with single glob pattern --- .github/workflows/unit-test.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 96865858fe..2138439f69 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -125,14 +125,7 @@ jobs: with: node-version: ${{ matrix.node }} cache: 'npm' - cache-dependency-path: | - 'package.json' - 'detectors/node/*/package.json' - 'metapackages/*/package.json' - 'packages/*/package.json' - 'plugins/node/*/package.json' - 'plugins/web/*/package.json' - 'propagators/*/package.json' + cache-dependency-path: '**/package.json' - name: Install minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 @@ -172,14 +165,7 @@ jobs: with: node-version: ${{ matrix.node }} cache: 'npm' - cache-dependency-path: | - 'package.json' - 'detectors/node/*/package.json' - 'metapackages/*/package.json' - 'packages/*/package.json' - 'plugins/node/*/package.json' - 'plugins/web/*/package.json' - 'propagators/*/package.json' + cache-dependency-path: '**/package.json' - name: Install minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 From e72fd2125952bb933897eec9507a788dc6890af9 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Tue, 11 Jul 2023 10:47:50 +0700 Subject: [PATCH 12/20] chore: update multiline yml syntax --- .github/workflows/unit-test.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 2138439f69..51ba8366c4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -125,7 +125,14 @@ jobs: with: node-version: ${{ matrix.node }} cache: 'npm' - cache-dependency-path: '**/package.json' + cache-dependency-path: | + 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 minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 @@ -165,7 +172,14 @@ jobs: with: node-version: ${{ matrix.node }} cache: 'npm' - cache-dependency-path: '**/package.json' + cache-dependency-path: | + 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 minimum npm 7 if: matrix.node == '14' run: npm install -g npm@7 From 9ffd5fb90098d526c2e271311fe372d42398e023 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Thu, 13 Jul 2023 14:38:54 +0700 Subject: [PATCH 13/20] chore: remove lerna:link in tav --- plugins/node/instrumentation-lru-memoizer/.tav.yml | 3 --- plugins/node/instrumentation-tedious/.tav.yml | 3 --- plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml | 6 ------ plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml | 3 --- plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml | 3 --- plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml | 6 ------ plugins/node/opentelemetry-instrumentation-pg/.tav.yml | 1 - plugins/node/opentelemetry-instrumentation-pino/.tav.yml | 4 ---- plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml | 3 --- plugins/node/opentelemetry-instrumentation-redis/.tav.yml | 3 --- 10 files changed, 35 deletions(-) diff --git a/plugins/node/instrumentation-lru-memoizer/.tav.yml b/plugins/node/instrumentation-lru-memoizer/.tav.yml index 6402081ee1..bf8a138d1b 100644 --- a/plugins/node/instrumentation-lru-memoizer/.tav.yml +++ b/plugins/node/instrumentation-lru-memoizer/.tav.yml @@ -2,6 +2,3 @@ versions: ">=1.3 <3" commands: - npm test - - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/instrumentation-tedious/.tav.yml b/plugins/node/instrumentation-tedious/.tav.yml index 22db589193..2ebfd15136 100644 --- a/plugins/node/instrumentation-tedious/.tav.yml +++ b/plugins/node/instrumentation-tedious/.tav.yml @@ -2,6 +2,3 @@ tedious: # 4.0.0 is broken: https://github.com/tediousjs/tedious/commit/4eceb48 versions: "1.11.0 || 1.14.0 || 2.7.1 || 3.0.1 || 4.2.0 || ^6.7.0 || 8.3.0 || 9.2.3 || 11.0.9 || 11.2.0 || 11.4.0 || ^11.8.0 || ^12.3.0 || ^13.2.0 || ^14.0.0" commands: npm run test - - # Fix missing `test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml index d905375e40..565fc7382f 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml @@ -4,19 +4,13 @@ versions: ">=2.1266.0 || 2.1262.0 || 2.1219.0 || 2.1048.0 || 2.1012.0 || 2.647.0 || 2.308.0" commands: - npm run test - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link "@aws-sdk/client-s3": versions: ">=3.223.0 || 3.218.0 || 3.216.0 || 3.154.0 || 3.107.0 || 3.54.0 || 3.6.1" commands: - npm run test - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link "@aws-sdk/client-sqs": versions: ">=3.216.0 || 3.171.0 || 3.58.0 || 3.54.0 || 3.43.0 || 3.24.0" commands: - npm run test - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml b/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml index 29bd4413db..754f4359db 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-ioredis/.tav.yml @@ -2,6 +2,3 @@ ioredis: # Ignoring v4.19.0. Tests never ends. Caused by https://github.com/luin/ioredis/pull/1219 versions: "^2.5.0 || ^3.2.2 || 4.14.1 || 4.16.3 || 4.17.3 || 4.18.0 || 4.19.2 || 4.19.4 || 4.22.0 || 4.24.5 || 4.26.0 || 4.27.2 || ^4.27.6 || 5.0.4 || ^5.2.4" commands: npm run test - - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml b/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml index 86a2bf927d..296530bb9d 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-mongodb/.tav.yml @@ -6,6 +6,3 @@ mongodb: commands: npm run test-v4 - versions: ">=5 <6" commands: npm run test-v5 - - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml b/plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml index 3afbb89977..22de7dc8a8 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-mysql2/.tav.yml @@ -1,18 +1,12 @@ mysql2: - versions: <4 >=3.2.0 || 3.1.0 || 3.0.0 commands: npm run test - # Fix missing `test-utils` package - pretest: npm run --prefix ../../../ lerna:link - versions: <3 >=2.3.2 || 2.3.0 || 2.2.5 || 2.1.0 # Skip 2.3.3 which installs types from git which takes 10m on it's own commands: npm run test - # Fix missing `test-utils` package - pretest: npm run --prefix ../../../ lerna:link - versions: 1.4.2 || 1.5.3 || 1.6.4 || 1.6.5 || 1.7.0 # Skip v1.6.2, which is broken commands: npm run test - # Fix missing `test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-pg/.tav.yml b/plugins/node/opentelemetry-instrumentation-pg/.tav.yml index fa1d669474..9f9320f8d5 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-pg/.tav.yml @@ -2,5 +2,4 @@ pg: # a sample from supported versions - versions: "8.5.1 || 8.6.0 || 8.7.1" peerDependencies: pg-pool@^3 - pretest: npm run --prefix ../../../ lerna:link commands: npm run test diff --git a/plugins/node/opentelemetry-instrumentation-pino/.tav.yml b/plugins/node/opentelemetry-instrumentation-pino/.tav.yml index 5ff15066e0..c23dab2f53 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-pino/.tav.yml @@ -3,11 +3,7 @@ pino: node: ">=14" commands: npm run test - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link - versions: "^7.11.0 || 7.8.0 || 7.2.0 || ^6.13.1 || 5.17.0 || 5.14.0" node: ">=8 <14" commands: npm run test - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml b/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml index f478be1116..0940b952ff 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-redis-4/.tav.yml @@ -3,6 +3,3 @@ redis: jobs: - versions: "^4.0.0" commands: npm run test - - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link diff --git a/plugins/node/opentelemetry-instrumentation-redis/.tav.yml b/plugins/node/opentelemetry-instrumentation-redis/.tav.yml index d22ee83fdf..c6b5a4154f 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-redis/.tav.yml @@ -1,6 +1,3 @@ redis: versions: ^2.6.0 || ^3.0.0 commands: npm run test - - # Fix missing `contrib-test-utils` package - pretest: npm run --prefix ../../../ lerna:link From 0e3eca4aa5d95c93699c5259a641bb63cc79c289 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Fri, 21 Jul 2023 07:22:58 +0000 Subject: [PATCH 14/20] chore: --legacy-bundling --- .github/workflows/unit-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 360b78df38..0626442261 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -134,8 +134,8 @@ jobs: 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: Legacy Peer Dependencies for npm 7 run: npm config set legacy-peer-deps=true - - name: Install Root Dependencies - run: npm install + - name: Install Workspaces + run: npm install --legacy-bundling - name: Unit tests env: NODE_OPTIONS: --max_old_space_size=4096 From 64db183099a90a22fce82fcea569094f088adda4 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Fri, 21 Jul 2023 08:01:47 +0000 Subject: [PATCH 15/20] chore: --global-style --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 0626442261..e1ae9ac187 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -135,7 +135,7 @@ jobs: - name: Legacy Peer Dependencies for npm 7 run: npm config set legacy-peer-deps=true - name: Install Workspaces - run: npm install --legacy-bundling + run: npm install --global-style - name: Unit tests env: NODE_OPTIONS: --max_old_space_size=4096 From f2091cf3847ed209582307100c83f4ddc4eb0768 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Fri, 21 Jul 2023 08:24:56 +0000 Subject: [PATCH 16/20] chore: --install-strategy=linked --- .github/workflows/unit-test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e1ae9ac187..c2136793b6 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -127,15 +127,14 @@ jobs: plugins/node/*/package.json plugins/web/*/package.json propagators/*/package.json - - name: Install minimum npm 7 - if: matrix.node == '14' - run: npm install -g npm@7 + - name: Install minimum npm 9 + run: npm install -g npm@9 - 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: Legacy Peer Dependencies for npm 7 run: npm config set legacy-peer-deps=true - name: Install Workspaces - run: npm install --global-style + run: npm install --install-strategy=linked - name: Unit tests env: NODE_OPTIONS: --max_old_space_size=4096 From 709353d8f202bc640687f8cbdc02bd3133d3dca5 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Fri, 21 Jul 2023 10:10:40 +0000 Subject: [PATCH 17/20] remove prepare script --- package.json | 2 +- plugins/node/instrumentation-cucumber/package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index b45e12bb71..5d6c854644 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-prettier": "4.2.1", "husky": "7.0.4", - "lerna": "7.1.1", + "lerna": "7.1.4", "lerna-changelog": "2.2.0", "prettier": "2.8.7", "typescript": "4.4.4", diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index 01015203cd..feca864de8 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -14,7 +14,6 @@ "lint:fix": "eslint . --ext .ts --fix", "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cucumber --include-dependencies", "prewatch": "npm run precompile", - "prepare": "npm run compile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." }, From 075c668d9d6a5bfd9b1d48e5049ca10bbe311341 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Fri, 21 Jul 2023 10:26:39 +0000 Subject: [PATCH 18/20] revert --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index c2136793b6..487cf5be29 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -134,7 +134,7 @@ jobs: - name: Legacy Peer Dependencies for npm 7 run: npm config set legacy-peer-deps=true - name: Install Workspaces - run: npm install --install-strategy=linked + run: npm install - name: Unit tests env: NODE_OPTIONS: --max_old_space_size=4096 From 00c98b59374910d8270fca6d1aa5cf94cd69afc0 Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Mon, 24 Jul 2023 10:20:21 +0700 Subject: [PATCH 19/20] chore: update @babel/core to test Garbage Collector issue --- .../package.json | 2 +- .../package.json | 2 +- .../node/opentelemetry-resource-detector-aws/package.json | 2 +- .../opentelemetry-resource-detector-container/package.json | 2 +- .../node/opentelemetry-resource-detector-gcp/package.json | 2 +- .../node/opentelemetry-resource-detector-github/package.json | 2 +- .../opentelemetry-resource-detector-instana/package.json | 2 +- metapackages/auto-instrumentations-node/package.json | 2 +- metapackages/auto-instrumentations-web/package.json | 4 ++-- packages/opentelemetry-host-metrics/package.json | 2 +- packages/opentelemetry-id-generator-aws-xray/package.json | 2 +- packages/opentelemetry-propagation-utils/package.json | 2 +- packages/opentelemetry-redis-common/package.json | 2 +- packages/opentelemetry-sampler-aws-xray/package.json | 2 +- packages/opentelemetry-sql-common/package.json | 2 +- packages/opentelemetry-test-utils/package.json | 2 +- plugins/node/instrumentation-amqplib/package.json | 2 +- plugins/node/instrumentation-cucumber/package.json | 2 +- plugins/node/instrumentation-dataloader/package.json | 2 +- plugins/node/instrumentation-fs/package.json | 2 +- plugins/node/instrumentation-lru-memoizer/package.json | 2 +- plugins/node/instrumentation-mongoose/package.json | 2 +- plugins/node/instrumentation-socket.io/package.json | 2 +- plugins/node/instrumentation-tedious/package.json | 2 +- .../opentelemetry-instrumentation-aws-lambda/package.json | 2 +- .../node/opentelemetry-instrumentation-aws-sdk/package.json | 2 +- .../node/opentelemetry-instrumentation-bunyan/package.json | 2 +- .../opentelemetry-instrumentation-cassandra/package.json | 2 +- .../node/opentelemetry-instrumentation-connect/package.json | 2 +- plugins/node/opentelemetry-instrumentation-dns/package.json | 2 +- .../node/opentelemetry-instrumentation-express/package.json | 2 +- .../node/opentelemetry-instrumentation-fastify/package.json | 2 +- .../opentelemetry-instrumentation-generic-pool/package.json | 2 +- .../node/opentelemetry-instrumentation-graphql/package.json | 2 +- plugins/node/opentelemetry-instrumentation-hapi/package.json | 2 +- .../node/opentelemetry-instrumentation-ioredis/package.json | 2 +- plugins/node/opentelemetry-instrumentation-knex/package.json | 2 +- plugins/node/opentelemetry-instrumentation-koa/package.json | 2 +- .../opentelemetry-instrumentation-memcached/package.json | 2 +- .../node/opentelemetry-instrumentation-mongodb/package.json | 5 +++-- .../node/opentelemetry-instrumentation-mysql/package.json | 2 +- .../node/opentelemetry-instrumentation-mysql2/package.json | 2 +- .../opentelemetry-instrumentation-nestjs-core/package.json | 2 +- plugins/node/opentelemetry-instrumentation-net/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pg/package.json | 2 +- plugins/node/opentelemetry-instrumentation-pino/package.json | 2 +- .../node/opentelemetry-instrumentation-redis-4/package.json | 2 +- .../node/opentelemetry-instrumentation-redis/package.json | 2 +- .../node/opentelemetry-instrumentation-restify/package.json | 2 +- .../node/opentelemetry-instrumentation-router/package.json | 2 +- .../node/opentelemetry-instrumentation-winston/package.json | 2 +- .../opentelemetry-instrumentation-document-load/package.json | 4 ++-- .../web/opentelemetry-instrumentation-long-task/package.json | 4 ++-- .../package.json | 4 ++-- plugins/web/opentelemetry-plugin-react-load/package.json | 4 ++-- propagators/opentelemetry-propagator-aws-xray/package.json | 2 +- .../opentelemetry-propagator-grpc-census-binary/package.json | 2 +- propagators/opentelemetry-propagator-instana/package.json | 4 ++-- propagators/opentelemetry-propagator-ot-trace/package.json | 2 +- 59 files changed, 67 insertions(+), 66 deletions(-) diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json index fbe10964fa..caa9de3bf9 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/archive/opentelemetry-browser-extension-autoinjection/package.json @@ -10,7 +10,7 @@ "build:mv3": "npx webpack --mode=production --env MV=3", "lint": "eslint .", "lint:fix": "eslint . --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json index 78ddeca70f..ab26fd1474 100644 --- a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json +++ b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json index fd59c2853b..709ff7c2f6 100644 --- a/detectors/node/opentelemetry-resource-detector-aws/package.json +++ b/detectors/node/opentelemetry-resource-detector-aws/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json index 2404b21885..5e9d74a7b6 100644 --- a/detectors/node/opentelemetry-resource-detector-container/package.json +++ b/detectors/node/opentelemetry-resource-detector-container/package.json @@ -11,7 +11,7 @@ "compile": "npm run version:update && tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/resource-detector-container --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/resource-detector-container", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json index 07f37c2a1f..4ccf1b57b1 100644 --- a/detectors/node/opentelemetry-resource-detector-gcp/package.json +++ b/detectors/node/opentelemetry-resource-detector-gcp/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-gcp --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-gcp", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json index d5421b0c5e..ef369518b3 100644 --- a/detectors/node/opentelemetry-resource-detector-github/package.json +++ b/detectors/node/opentelemetry-resource-detector-github/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-github --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-github", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json index 374ad0796a..acd8648ca2 100644 --- a/detectors/node/opentelemetry-resource-detector-instana/package.json +++ b/detectors/node/opentelemetry-resource-detector-instana/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-instana --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-instana", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 74d73e09ae..7650775e45 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -23,7 +23,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-node --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-node", "prewatch": "npm run precompile", "tdd": "yarn test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.ts'", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index 7d1e413c8b..b02bd07182 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -20,7 +20,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-web --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-web", "prewatch": "npm run precompile", "test:browser": "nyc karma start --single-run", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" @@ -32,7 +32,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index 18e47e93ba..8682f90732 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/host-metrics --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/host-metrics", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json index 665516645a..4730d3cf40 100644 --- a/packages/opentelemetry-id-generator-aws-xray/package.json +++ b/packages/opentelemetry-id-generator-aws-xray/package.json @@ -15,7 +15,7 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/id-generator-aws-xray --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/id-generator-aws-xray", "prewatch": "npm run precompile", "compile": "tsc --build tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json index 19dd3a0a9c..b2ddfba0a3 100644 --- a/packages/opentelemetry-propagation-utils/package.json +++ b/packages/opentelemetry-propagation-utils/package.json @@ -12,7 +12,7 @@ "compile": "tsc --build tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagation-utils --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagation-utils", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json index a72fa724a3..842df290ad 100644 --- a/packages/opentelemetry-redis-common/package.json +++ b/packages/opentelemetry-redis-common/package.json @@ -11,7 +11,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "compile": "tsc --build tsconfig.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/redis-common --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/redis-common", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "watch": "tsc -w" diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json index 6f8906abb4..1216940184 100644 --- a/packages/opentelemetry-sampler-aws-xray/package.json +++ b/packages/opentelemetry-sampler-aws-xray/package.json @@ -31,7 +31,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sampler-aws-xray --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sampler-aws-xray", "prewatch": "npm run precompile", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "tdd": "npm run test -- --watch-extensions ts --watch", diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json index c61b33db88..819ac3a448 100644 --- a/packages/opentelemetry-sql-common/package.json +++ b/packages/opentelemetry-sql-common/package.json @@ -11,7 +11,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "compile": "tsc --build tsconfig.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sql-common --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/sql-common", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "watch": "tsc -w" diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json index f7aa4d247f..ff8e683f47 100644 --- a/packages/opentelemetry-test-utils/package.json +++ b/packages/opentelemetry-test-utils/package.json @@ -11,7 +11,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "compile": "tsc -p .", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/contrib-test-utils --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/contrib-test-utils", "prewatch": "npm run precompile", "watch": "tsc -w" }, diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 292d33b6ad..4bce64153a 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -32,7 +32,7 @@ "compile": "npm run version:update && tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-amqplib --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-amqplib", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index feca864de8..8839dd526a 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cucumber --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cucumber", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/instrumentation-dataloader/package.json b/plugins/node/instrumentation-dataloader/package.json index 1ca511309b..f65b06c4d2 100644 --- a/plugins/node/instrumentation-dataloader/package.json +++ b/plugins/node/instrumentation-dataloader/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dataloader --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dataloader", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json index bb4eba4f6c..787d097ceb 100644 --- a/plugins/node/instrumentation-fs/package.json +++ b/plugins/node/instrumentation-fs/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-fs --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-fs", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." diff --git a/plugins/node/instrumentation-lru-memoizer/package.json b/plugins/node/instrumentation-lru-memoizer/package.json index a9b7134628..763de8dc60 100644 --- a/plugins/node/instrumentation-lru-memoizer/package.json +++ b/plugins/node/instrumentation-lru-memoizer/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-lru-memoizer --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-lru-memoizer", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 092f347123..c9d840795e 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -13,7 +13,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-mongoose --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-mongoose", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index db925060ec..575eb6e90a 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-socket.io --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-socket.io", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc -p ." diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json index 7517302df1..505666b4a3 100644 --- a/plugins/node/instrumentation-tedious/package.json +++ b/plugins/node/instrumentation-tedious/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint:fix": "eslint . --ext .ts --fix", "lint": "eslint . --ext .ts", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-tedious --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-tedious", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 23813b4d51..198e097d6a 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-lambda --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-lambda", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index f063c823f6..2eb9d9f043 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -33,7 +33,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-sdk --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-aws-sdk", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 06090d90c8..4bafa76183 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-bunyan --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-bunyan", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json index 57b8405841..2738913074 100644 --- a/plugins/node/opentelemetry-instrumentation-cassandra/package.json +++ b/plugins/node/opentelemetry-instrumentation-cassandra/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cassandra-driver --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-cassandra-driver", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json index 93e6f80115..8bed781fa0 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/package.json +++ b/plugins/node/opentelemetry-instrumentation-connect/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-connect --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-connect", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json index 14d763608b..b4b8f629a7 100644 --- a/plugins/node/opentelemetry-instrumentation-dns/package.json +++ b/plugins/node/opentelemetry-instrumentation-dns/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dns --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-dns", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index db6fbfdf67..b89c082ede 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-express --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-express", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index ddcfb2eb29..96b5f2d89d 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-fastify --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-fastify", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "version:update": "node ../../../scripts/version-update.js", "prewatch": "npm run precompile", diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json index 7cef68a79f..81bf096aa2 100644 --- a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json +++ b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-generic-pool --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-generic-pool", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index 831c1a266d..1288429c5a 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-graphql --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-graphql", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test-all-versions": "tav", diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index d465071691..8a0c25d9f0 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-hapi --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-hapi", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index ed8aac65b3..9445aee3c1 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -15,7 +15,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-ioredis --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-ioredis", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json index 1f0364f5ca..a7223ddfa5 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/package.json +++ b/plugins/node/opentelemetry-instrumentation-knex/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-knex --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-knex", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index cc66322556..ce852af844 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-koa --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-koa", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json index 4021004627..7580afea7a 100644 --- a/plugins/node/opentelemetry-instrumentation-memcached/package.json +++ b/plugins/node/opentelemetry-instrumentation-memcached/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-memcached --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-memcached", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 7cfa9ec520..c4d26ad243 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -8,7 +8,8 @@ "scripts": { "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", "test": "npm run test-v3", - "test-v3": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", + "test-v3": "ts-mocha --project tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", + "test-v3:coverage": "nyc npm run test-v3", "test-v4": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v4.test.ts'", "test-v5": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v5.test.ts'", "test-all-versions": "tav", @@ -16,7 +17,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mongodb --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mongodb", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 542ee42c6c..da1abdf975 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint:fix": "eslint . --ext .ts --fix", "lint": "eslint . --ext .ts", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index eb4076e1db..2c08576d70 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint:fix": "eslint . --ext .ts --fix", "lint": "eslint . --ext .ts", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql2 --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-mysql2", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json index e3831c05a9..ca4013db4e 100644 --- a/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json +++ b/plugins/node/opentelemetry-instrumentation-nestjs-core/package.json @@ -11,7 +11,7 @@ "compile:watch": "tsc -w", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-nestjs-core --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-nestjs-core", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha --timeout 5000 -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index 360b800837..09e2b5b02a 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-net --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-net", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 7f11f76ea2..98b0797539 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pg --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pg", "prewatch": "npm run precompile", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 4486bc2857..e81e295e05 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pino --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-pino", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-redis-4/package.json b/plugins/node/opentelemetry-instrumentation-redis-4/package.json index e0eb70e7e6..a0fa5b5f8a 100644 --- a/plugins/node/opentelemetry-instrumentation-redis-4/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis-4/package.json @@ -17,7 +17,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-redis-4 --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-redis-4", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 4fd97339d4..d68a83e013 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -17,7 +17,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-redis --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-redis", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index e07bc871a8..bf655356b2 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -10,7 +10,7 @@ "compile": "tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-restify --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-restify", "prewatch": "npm run precompile", "tdd": "yarn test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.ts'", diff --git a/plugins/node/opentelemetry-instrumentation-router/package.json b/plugins/node/opentelemetry-instrumentation-router/package.json index d3b4d3d08d..96ab3d0d73 100644 --- a/plugins/node/opentelemetry-instrumentation-router/package.json +++ b/plugins/node/opentelemetry-instrumentation-router/package.json @@ -11,7 +11,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-router --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-router", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p .", diff --git a/plugins/node/opentelemetry-instrumentation-winston/package.json b/plugins/node/opentelemetry-instrumentation-winston/package.json index d8e8ae7066..0ad780f1d2 100644 --- a/plugins/node/opentelemetry-instrumentation-winston/package.json +++ b/plugins/node/opentelemetry-instrumentation-winston/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-winston --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-winston", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "tsc -p ." diff --git a/plugins/web/opentelemetry-instrumentation-document-load/package.json b/plugins/web/opentelemetry-instrumentation-document-load/package.json index 3bd8d6a243..c4c7021b5c 100644 --- a/plugins/web/opentelemetry-instrumentation-document-load/package.json +++ b/plugins/web/opentelemetry-instrumentation-document-load/package.json @@ -10,7 +10,7 @@ "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-document-load --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-document-load", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", @@ -49,7 +49,7 @@ "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@types/mocha": "8.2.3", "@types/node": "18.16.19", diff --git a/plugins/web/opentelemetry-instrumentation-long-task/package.json b/plugins/web/opentelemetry-instrumentation-long-task/package.json index f60e28781d..7356830c61 100644 --- a/plugins/web/opentelemetry-instrumentation-long-task/package.json +++ b/plugins/web/opentelemetry-instrumentation-long-task/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", @@ -46,7 +46,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/jquery": "3.5.6", diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 618d663619..b9aae01a65 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -10,7 +10,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", @@ -46,7 +46,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.3.0", "@opentelemetry/context-zone-peer-dep": "^1.8.0", "@opentelemetry/instrumentation-xml-http-request": "^0.41.0", diff --git a/plugins/web/opentelemetry-plugin-react-load/package.json b/plugins/web/opentelemetry-plugin-react-load/package.json index 66496e026b..1a549296e8 100644 --- a/plugins/web/opentelemetry-plugin-react-load/package.json +++ b/plugins/web/opentelemetry-plugin-react-load/package.json @@ -10,7 +10,7 @@ "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/plugin-react-load --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/plugin-react-load", "prewatch": "npm run precompile", "version:update": "node ../../../scripts/version-update.js", "compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json", @@ -46,7 +46,7 @@ "access": "public" }, "devDependencies": { - "@babel/core": "7.15.0", + "@babel/core": "7.22.9", "@opentelemetry/api": "^1.0.0", "@opentelemetry/propagator-b3": "^1.3.1", "@types/mocha": "7.0.2", diff --git a/propagators/opentelemetry-propagator-aws-xray/package.json b/propagators/opentelemetry-propagator-aws-xray/package.json index 36aac66988..eeaef32a92 100644 --- a/propagators/opentelemetry-propagator-aws-xray/package.json +++ b/propagators/opentelemetry-propagator-aws-xray/package.json @@ -7,7 +7,7 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-aws-xray --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-aws-xray", "prewatch": "npm run precompile", "compile": "tsc --build tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", diff --git a/propagators/opentelemetry-propagator-grpc-census-binary/package.json b/propagators/opentelemetry-propagator-grpc-census-binary/package.json index a5bf1cddc7..a9f6b7da38 100644 --- a/propagators/opentelemetry-propagator-grpc-census-binary/package.json +++ b/propagators/opentelemetry-propagator-grpc-census-binary/package.json @@ -12,7 +12,7 @@ "clean": "rimraf build/*", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-grpc-census-binary --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-grpc-census-binary", "prewatch": "npm run precompile", "compile": "tsc -p .", "watch": "tsc -w" diff --git a/propagators/opentelemetry-propagator-instana/package.json b/propagators/opentelemetry-propagator-instana/package.json index 23ce0dfd88..046dfed4c1 100644 --- a/propagators/opentelemetry-propagator-instana/package.json +++ b/propagators/opentelemetry-propagator-instana/package.json @@ -7,7 +7,7 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-instana --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-instana", "prewatch": "npm run precompile", "compile": "tsc --build tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", @@ -64,7 +64,7 @@ "nyc": "15.1.0", "process": "0.11.10", "ts-loader": "8.3.0", - "ts-mocha": "8.0.0", + "ts-mocha": "10.0.0", "typescript": "4.4.4", "webpack": "4.46.0", "webpack-cli": "4.9.2" diff --git a/propagators/opentelemetry-propagator-ot-trace/package.json b/propagators/opentelemetry-propagator-ot-trace/package.json index 3555e98377..ccc7b231f3 100644 --- a/propagators/opentelemetry-propagator-ot-trace/package.json +++ b/propagators/opentelemetry-propagator-ot-trace/package.json @@ -7,7 +7,7 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-ot-trace --include-dependencies", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/propagator-ot-trace", "prewatch": "npm run precompile", "compile": "tsc --build tsconfig.json tsconfig.esm.json", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", From 24fe745f6a6d6139c2b17da96e9132fbc2d0dcbf Mon Sep 17 00:00:00 2001 From: Chi Ma Date: Mon, 24 Jul 2023 10:39:52 +0700 Subject: [PATCH 20/20] chore: add back missing codecov for mongo --- .../node/opentelemetry-instrumentation-mongodb/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index c4d26ad243..5c2ea2683c 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -8,8 +8,7 @@ "scripts": { "docker:start": "docker run -e MONGODB_DB=opentelemetry-tests -e MONGODB_PORT=27017 -e MONGODB_HOST=127.0.0.1 -p 27017:27017 --rm mongo", "test": "npm run test-v3", - "test-v3": "ts-mocha --project tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", - "test-v3:coverage": "nyc npm run test-v3", + "test-v3": "nyc ts-mocha --project tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/mongodb-v3.test.ts'", "test-v4": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v4.test.ts'", "test-v5": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/mongodb-v4-v5.metrics.test.ts' 'test/**/mongodb-v5.test.ts'", "test-all-versions": "tav",