diff --git a/.github/workflows/test-all-versions.pr.yml b/.github/workflows/test-all-versions.pr.yml index 158ad0d057..83aa62af5b 100644 --- a/.github/workflows/test-all-versions.pr.yml +++ b/.github/workflows/test-all-versions.pr.yml @@ -16,22 +16,19 @@ jobs: env: PR_LABELS: ${{ toJSON(github.event.pull_request.labels.*.name) }} outputs: - args: ${{ steps.lerna-args.outputs.args }} + args: ${{ steps.npm-workspace-args.outputs.args }} steps: - name: Checkout uses: actions/checkout@v4 - # Need lerna to list all packages - - name: Install lerna - run: npm install -g lerna@6.6.2 - - name: Parse labels into lerna scope arguments - id: lerna-args + - name: Parse labels into npm workspace arguments + id: npm-workspace-args run: | - OUTPUT=`node scripts/parse-lerna-scopes.mjs "$PR_LABELS"` + OUTPUT=`node scripts/pr-labels-to-npm-workspace-args.mjs "$PR_LABELS"` echo "args=$OUTPUT" >> $GITHUB_OUTPUT tav: uses: ./.github/workflows/test-all-versions.yml needs: parse-labels with: - lerna-args: ${{ needs.parse-labels.outputs.args }} + npm-workspace-args: ${{ needs.parse-labels.outputs.args }} if: ${{ needs.parse-labels.outputs.args != '' }} diff --git a/.github/workflows/test-all-versions.push.yml b/.github/workflows/test-all-versions.push.yml index 29702bfd4b..4a741f7f46 100644 --- a/.github/workflows/test-all-versions.push.yml +++ b/.github/workflows/test-all-versions.push.yml @@ -10,4 +10,4 @@ jobs: tav: uses: ./.github/workflows/test-all-versions.yml with: - lerna-args: "" + npm-workspace-args: "" diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 0d5b3f753c..5225010453 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -4,11 +4,11 @@ on: - cron: "30 4 * * *" workflow_dispatch: inputs: - lerna-args: + npm-workspace-args: type: string workflow_call: inputs: - lerna-args: + npm-workspace-args: required: true type: string @@ -115,9 +115,6 @@ jobs: node-version: ${{ matrix.node }} - name: Set MySQL variables run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql - - name: Legacy Peer Dependencies for npm 7 - if: matrix.node == '16' - run: npm config set legacy-peer-deps=true - name: Update npm to a version that supports workspaces (v7 or later) if: ${{ matrix.node < 16 }} run: npm install -g npm@9 # npm@9 supports node >=14.17.0 @@ -126,4 +123,4 @@ jobs: - name: Build run: npm run compile - name: Run test-all-versions - run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1 + run: npm run --if-present --workspaces test-all-versions ${{ inputs.npm-workspace-args }} diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 91f43a82fc..f5bfd63f06 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -123,9 +123,6 @@ jobs: node-version: ${{ matrix.node }} - name: Set MySQL variables run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql - - name: Legacy Peer Dependencies for npm 7 - if: matrix.node == '16' - run: npm config set legacy-peer-deps=true - name: Update npm to a version that supports workspaces (v7 or later) if: ${{ matrix.node < 16 }} run: npm install -g npm@9 # npm@9 supports node >=14.17.0 @@ -135,10 +132,10 @@ jobs: run: npm run compile - name: Unit tests (Full) if: matrix.code-coverage - run: npm run test -- ${{ matrix.lerna-extra-args }} + run: npm run test - name: Unit tests (Delta) if: ${{ !matrix.code-coverage }} - run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }} + run: npm run test:ci:changed - name: Build examples run: npm run compile:examples - name: Report Coverage diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b252fa5d26..f01d025ee8 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.1","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.1","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.33.2","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.1.2","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.33.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.33.3","plugins/node/opentelemetry-instrumentation-fastify":"0.32.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.2","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.3","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.3","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.3","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.2","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.2","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.34.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.2.0","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.34.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.5","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.3","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.4","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.4","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"} diff --git a/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md index c9f15e4fb1..d69d9fb745 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md +++ b/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.1...resource-detector-azure-v0.2.2) (2023-12-07) + + +### Bug Fixes + +* **resource-detector-azure:** only detect Azure Functions when FUNCTIONS_EXTENSION_VERSION is defined ([#1846](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1846)) ([8f2a195](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8f2a195d405c173ed7b817db63a1735af424a3e8)) + ## [0.2.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.0...resource-detector-azure-v0.2.1) (2023-11-22) diff --git a/detectors/node/opentelemetry-resource-detector-azure/package.json b/detectors/node/opentelemetry-resource-detector-azure/package.json index 8afe0bada4..e9f6fd34a6 100644 --- a/detectors/node/opentelemetry-resource-detector-azure/package.json +++ b/detectors/node/opentelemetry-resource-detector-azure/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resource-detector-azure", - "version": "0.2.1", + "version": "0.2.2", "description": "OpenTelemetry SDK resource detector for Azure", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md index 31a6eae18e..760e808d18 100644 --- a/metapackages/auto-instrumentations-node/CHANGELOG.md +++ b/metapackages/auto-instrumentations-node/CHANGELOG.md @@ -131,6 +131,21 @@ * @opentelemetry/resource-detector-container bumped from ^0.3.3 to ^0.3.4 * @opentelemetry/resource-detector-gcp bumped from ^0.29.3 to ^0.29.4 +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @opentelemetry/instrumentation-aws-lambda bumped from ^0.37.2 to ^0.37.3 + * @opentelemetry/instrumentation-aws-sdk bumped from ^0.37.0 to ^0.37.1 + * @opentelemetry/instrumentation-bunyan bumped from ^0.33.0 to ^0.34.0 + * @opentelemetry/instrumentation-cucumber bumped from ^0.1.2 to ^0.2.0 + * @opentelemetry/instrumentation-express bumped from ^0.33.3 to ^0.34.0 + * @opentelemetry/instrumentation-fastify bumped from ^0.32.4 to ^0.32.5 + * @opentelemetry/instrumentation-koa bumped from ^0.36.2 to ^0.36.3 + * @opentelemetry/instrumentation-mongodb bumped from ^0.37.3 to ^0.38.0 + * @opentelemetry/instrumentation-net bumped from ^0.32.3 to ^0.32.4 + * @opentelemetry/instrumentation-pino bumped from ^0.34.3 to ^0.34.4 + ## [0.40.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.39.4...auto-instrumentations-node-v0.40.0) (2023-11-13) diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json index 85f18cc5f0..dcb822b32a 100644 --- a/metapackages/auto-instrumentations-node/package.json +++ b/metapackages/auto-instrumentations-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.40.1", + "version": "0.40.2", "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations", "author": "OpenTelemetry Authors", "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme", @@ -51,17 +51,17 @@ "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", "@opentelemetry/instrumentation-amqplib": "^0.33.4", - "@opentelemetry/instrumentation-aws-lambda": "^0.37.2", - "@opentelemetry/instrumentation-aws-sdk": "^0.37.0", - "@opentelemetry/instrumentation-bunyan": "^0.33.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.37.3", + "@opentelemetry/instrumentation-aws-sdk": "^0.37.1", + "@opentelemetry/instrumentation-bunyan": "^0.34.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.34.1", "@opentelemetry/instrumentation-connect": "^0.32.3", - "@opentelemetry/instrumentation-cucumber": "^0.1.2", + "@opentelemetry/instrumentation-cucumber": "^0.2.0", "@opentelemetry/instrumentation-dataloader": "^0.5.3", "@opentelemetry/instrumentation-dns": "^0.32.4", - "@opentelemetry/instrumentation-express": "^0.33.3", + "@opentelemetry/instrumentation-express": "^0.34.0", "@opentelemetry/instrumentation-fs": "^0.8.3", - "@opentelemetry/instrumentation-fastify": "^0.32.4", + "@opentelemetry/instrumentation-fastify": "^0.32.5", "@opentelemetry/instrumentation-generic-pool": "^0.32.4", "@opentelemetry/instrumentation-graphql": "^0.36.0", "@opentelemetry/instrumentation-grpc": "^0.45.1", @@ -69,17 +69,17 @@ "@opentelemetry/instrumentation-http": "^0.45.1", "@opentelemetry/instrumentation-ioredis": "^0.36.0", "@opentelemetry/instrumentation-knex": "^0.32.3", - "@opentelemetry/instrumentation-koa": "^0.36.2", + "@opentelemetry/instrumentation-koa": "^0.36.3", "@opentelemetry/instrumentation-lru-memoizer": "^0.33.4", "@opentelemetry/instrumentation-memcached": "^0.32.4", - "@opentelemetry/instrumentation-mongodb": "^0.37.3", + "@opentelemetry/instrumentation-mongodb": "^0.38.0", "@opentelemetry/instrumentation-mongoose": "^0.33.4", "@opentelemetry/instrumentation-mysql": "^0.34.4", "@opentelemetry/instrumentation-mysql2": "^0.34.4", "@opentelemetry/instrumentation-nestjs-core": "^0.33.3", - "@opentelemetry/instrumentation-net": "^0.32.3", + "@opentelemetry/instrumentation-net": "^0.32.4", "@opentelemetry/instrumentation-pg": "^0.37.1", - "@opentelemetry/instrumentation-pino": "^0.34.3", + "@opentelemetry/instrumentation-pino": "^0.34.4", "@opentelemetry/instrumentation-redis": "^0.35.4", "@opentelemetry/instrumentation-redis-4": "^0.35.5", "@opentelemetry/instrumentation-restify": "^0.34.2", diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json index c89423df1e..3bcb9dd9c2 100644 --- a/metapackages/auto-instrumentations-web/package.json +++ b/metapackages/auto-instrumentations-web/package.json @@ -13,18 +13,19 @@ }, "main": "build/src/index.js", "module": "build/esm/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js-contrib", "scripts": { - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.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", "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json" + "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json" }, "bugs": { "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues" @@ -69,6 +70,12 @@ "files": [ "build/src/**/*.js", "build/src/**/*.js.map", - "build/src/**/*.d.ts" + "build/src/**/*.d.ts", + "build/esm/**/*.js", + "build/esm/**/*.js.map", + "build/esm/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts" ] -} +} \ No newline at end of file diff --git a/metapackages/auto-instrumentations-web/tsconfig.esnext.json b/metapackages/auto-instrumentations-web/tsconfig.esnext.json new file mode 100644 index 0000000000..d6054d1fb0 --- /dev/null +++ b/metapackages/auto-instrumentations-web/tsconfig.esnext.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "skipLibCheck": true, + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": ["src/**/*.ts"] +} diff --git a/package-lock.json b/package-lock.json index 1d850d42a2..02b616dba0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -95,7 +95,7 @@ }, "detectors/node/opentelemetry-resource-detector-azure": { "name": "@opentelemetry/resource-detector-azure", - "version": "0.2.1", + "version": "0.2.2", "license": "Apache-2.0", "dependencies": { "@opentelemetry/resources": "^1.10.1", @@ -235,21 +235,21 @@ }, "metapackages/auto-instrumentations-node": { "name": "@opentelemetry/auto-instrumentations-node", - "version": "0.40.1", + "version": "0.40.2", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", "@opentelemetry/instrumentation-amqplib": "^0.33.4", - "@opentelemetry/instrumentation-aws-lambda": "^0.37.2", - "@opentelemetry/instrumentation-aws-sdk": "^0.37.0", - "@opentelemetry/instrumentation-bunyan": "^0.33.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.37.3", + "@opentelemetry/instrumentation-aws-sdk": "^0.37.1", + "@opentelemetry/instrumentation-bunyan": "^0.34.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.34.1", "@opentelemetry/instrumentation-connect": "^0.32.3", - "@opentelemetry/instrumentation-cucumber": "^0.1.2", + "@opentelemetry/instrumentation-cucumber": "^0.2.0", "@opentelemetry/instrumentation-dataloader": "^0.5.3", "@opentelemetry/instrumentation-dns": "^0.32.4", - "@opentelemetry/instrumentation-express": "^0.33.3", - "@opentelemetry/instrumentation-fastify": "^0.32.4", + "@opentelemetry/instrumentation-express": "^0.34.0", + "@opentelemetry/instrumentation-fastify": "^0.32.5", "@opentelemetry/instrumentation-fs": "^0.8.3", "@opentelemetry/instrumentation-generic-pool": "^0.32.4", "@opentelemetry/instrumentation-graphql": "^0.36.0", @@ -258,17 +258,17 @@ "@opentelemetry/instrumentation-http": "^0.45.1", "@opentelemetry/instrumentation-ioredis": "^0.36.0", "@opentelemetry/instrumentation-knex": "^0.32.3", - "@opentelemetry/instrumentation-koa": "^0.36.2", + "@opentelemetry/instrumentation-koa": "^0.36.3", "@opentelemetry/instrumentation-lru-memoizer": "^0.33.4", "@opentelemetry/instrumentation-memcached": "^0.32.4", - "@opentelemetry/instrumentation-mongodb": "^0.37.3", + "@opentelemetry/instrumentation-mongodb": "^0.38.0", "@opentelemetry/instrumentation-mongoose": "^0.33.4", "@opentelemetry/instrumentation-mysql": "^0.34.4", "@opentelemetry/instrumentation-mysql2": "^0.34.4", "@opentelemetry/instrumentation-nestjs-core": "^0.33.3", - "@opentelemetry/instrumentation-net": "^0.32.3", + "@opentelemetry/instrumentation-net": "^0.32.4", "@opentelemetry/instrumentation-pg": "^0.37.1", - "@opentelemetry/instrumentation-pino": "^0.34.3", + "@opentelemetry/instrumentation-pino": "^0.34.4", "@opentelemetry/instrumentation-redis": "^0.35.4", "@opentelemetry/instrumentation-redis-4": "^0.35.5", "@opentelemetry/instrumentation-restify": "^0.34.2", @@ -33638,7 +33638,7 @@ }, "packages/opentelemetry-host-metrics": { "name": "@opentelemetry/host-metrics", - "version": "0.33.2", + "version": "0.34.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/sdk-metrics": "^1.8.0", @@ -33916,7 +33916,7 @@ }, "plugins/node/instrumentation-cucumber": { "name": "@opentelemetry/instrumentation-cucumber", - "version": "0.1.2", + "version": "0.2.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", @@ -34378,7 +34378,7 @@ }, "plugins/node/opentelemetry-instrumentation-aws-lambda": { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.37.2", + "version": "0.37.3", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", @@ -34416,7 +34416,7 @@ }, "plugins/node/opentelemetry-instrumentation-aws-sdk": { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.37.0", + "version": "0.37.1", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -34458,7 +34458,7 @@ }, "plugins/node/opentelemetry-instrumentation-bunyan": { "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.33.0", + "version": "0.34.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api-logs": "^0.45.1", @@ -34629,7 +34629,7 @@ }, "plugins/node/opentelemetry-instrumentation-express": { "name": "@opentelemetry/instrumentation-express", - "version": "0.33.3", + "version": "0.34.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -34967,7 +34967,7 @@ }, "plugins/node/opentelemetry-instrumentation-fastify": { "name": "@opentelemetry/instrumentation-fastify", - "version": "0.32.4", + "version": "0.32.5", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -35203,7 +35203,7 @@ }, "plugins/node/opentelemetry-instrumentation-koa": { "name": "@opentelemetry/instrumentation-koa", - "version": "0.36.2", + "version": "0.36.3", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^1.8.0", @@ -35423,7 +35423,7 @@ }, "plugins/node/opentelemetry-instrumentation-mongodb": { "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.37.3", + "version": "0.38.0", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", @@ -35769,7 +35769,7 @@ }, "plugins/node/opentelemetry-instrumentation-net": { "name": "@opentelemetry/instrumentation-net", - "version": "0.32.3", + "version": "0.32.4", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1", @@ -35851,7 +35851,7 @@ }, "plugins/node/opentelemetry-instrumentation-pino": { "name": "@opentelemetry/instrumentation-pino", - "version": "0.34.3", + "version": "0.34.4", "license": "Apache-2.0", "dependencies": { "@opentelemetry/instrumentation": "^0.45.1" @@ -42659,16 +42659,16 @@ "@opentelemetry/api": "^1.4.1", "@opentelemetry/instrumentation": "^0.45.1", "@opentelemetry/instrumentation-amqplib": "^0.33.4", - "@opentelemetry/instrumentation-aws-lambda": "^0.37.2", - "@opentelemetry/instrumentation-aws-sdk": "^0.37.0", - "@opentelemetry/instrumentation-bunyan": "^0.33.0", + "@opentelemetry/instrumentation-aws-lambda": "^0.37.3", + "@opentelemetry/instrumentation-aws-sdk": "^0.37.1", + "@opentelemetry/instrumentation-bunyan": "^0.34.0", "@opentelemetry/instrumentation-cassandra-driver": "^0.34.1", "@opentelemetry/instrumentation-connect": "^0.32.3", - "@opentelemetry/instrumentation-cucumber": "^0.1.2", + "@opentelemetry/instrumentation-cucumber": "^0.2.0", "@opentelemetry/instrumentation-dataloader": "^0.5.3", "@opentelemetry/instrumentation-dns": "^0.32.4", - "@opentelemetry/instrumentation-express": "^0.33.3", - "@opentelemetry/instrumentation-fastify": "^0.32.4", + "@opentelemetry/instrumentation-express": "^0.34.0", + "@opentelemetry/instrumentation-fastify": "^0.32.5", "@opentelemetry/instrumentation-fs": "^0.8.3", "@opentelemetry/instrumentation-generic-pool": "^0.32.4", "@opentelemetry/instrumentation-graphql": "^0.36.0", @@ -42677,17 +42677,17 @@ "@opentelemetry/instrumentation-http": "^0.45.1", "@opentelemetry/instrumentation-ioredis": "^0.36.0", "@opentelemetry/instrumentation-knex": "^0.32.3", - "@opentelemetry/instrumentation-koa": "^0.36.2", + "@opentelemetry/instrumentation-koa": "^0.36.3", "@opentelemetry/instrumentation-lru-memoizer": "^0.33.4", "@opentelemetry/instrumentation-memcached": "^0.32.4", - "@opentelemetry/instrumentation-mongodb": "^0.37.3", + "@opentelemetry/instrumentation-mongodb": "^0.38.0", "@opentelemetry/instrumentation-mongoose": "^0.33.4", "@opentelemetry/instrumentation-mysql": "^0.34.4", "@opentelemetry/instrumentation-mysql2": "^0.34.4", "@opentelemetry/instrumentation-nestjs-core": "^0.33.3", - "@opentelemetry/instrumentation-net": "^0.32.3", + "@opentelemetry/instrumentation-net": "^0.32.4", "@opentelemetry/instrumentation-pg": "^0.37.1", - "@opentelemetry/instrumentation-pino": "^0.34.3", + "@opentelemetry/instrumentation-pino": "^0.34.4", "@opentelemetry/instrumentation-redis": "^0.35.4", "@opentelemetry/instrumentation-redis-4": "^0.35.5", "@opentelemetry/instrumentation-restify": "^0.34.2", diff --git a/package.json b/package.json index f543cb72a0..53dd98d557 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "test": "lerna run test", "test:ci:changed": "lerna run test --since origin/main", "test:browser": "lerna run test:browser --concurrency 1", + "test-all-versions": "npm run --if-present --workspaces test-all-versions", "bump": "lerna publish", "changelog": "lerna-changelog", "lint": "lerna run lint", diff --git a/packages/opentelemetry-host-metrics/CHANGELOG.md b/packages/opentelemetry-host-metrics/CHANGELOG.md index 3d7b1891d8..36b0a6520a 100644 --- a/packages/opentelemetry-host-metrics/CHANGELOG.md +++ b/packages/opentelemetry-host-metrics/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.33.2...host-metrics-v0.34.0) (2023-12-07) + + +### ⚠ BREAKING CHANGES + +* **host-metrics:** use the package name as the default instrumentation scope name, to align with instrumentations ([#1822](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1822)) + +### Features + +* **host-metrics:** use the package name as the default instrumentation scope name, to align with instrumentations ([#1822](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1822)) ([bcf3501](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/bcf3501e623d0fa6af87eeeef0f1cdd2ef755857)), closes [#1782](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1782) + ## [0.33.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.33.1...host-metrics-v0.33.2) (2023-11-13) diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json index b23e0b5002..d58d1b5539 100644 --- a/packages/opentelemetry-host-metrics/package.json +++ b/packages/opentelemetry-host-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/host-metrics", - "version": "0.33.2", + "version": "0.34.0", "description": "OpenTelemetry Host Metrics for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-cucumber/CHANGELOG.md b/plugins/node/instrumentation-cucumber/CHANGELOG.md index 926a6487f3..ebaec5f6a7 100644 --- a/plugins/node/instrumentation-cucumber/CHANGELOG.md +++ b/plugins/node/instrumentation-cucumber/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.1.2...instrumentation-cucumber-v0.2.0) (2023-12-07) + + +### Features + +* **cucumber:** support @cucumber/cucumber@10 ([#1830](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1830)) ([1c2e8b2](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/1c2e8b20ff981873838c1543324e700e2e466dba)) + ## [0.1.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.1.1...instrumentation-cucumber-v0.1.2) (2023-11-13) diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json index c44c00f932..71d8704eaf 100644 --- a/plugins/node/instrumentation-cucumber/package.json +++ b/plugins/node/instrumentation-cucumber/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-cucumber", - "version": "0.1.2", + "version": "0.2.0", "description": "OpenTelemetry cucumber automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json index 0cc75fdcd3..dfd8350c9a 100644 --- a/plugins/node/instrumentation-mongoose/package.json +++ b/plugins/node/instrumentation-mongoose/package.json @@ -31,7 +31,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=14.0" + "node": ">=14" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/instrumentation-socket.io/package.json b/plugins/node/instrumentation-socket.io/package.json index 5e22a36b63..2c9ba92d66 100644 --- a/plugins/node/instrumentation-socket.io/package.json +++ b/plugins/node/instrumentation-socket.io/package.json @@ -28,7 +28,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=14.0" + "node": ">=14" }, "files": [ "build/src/**/*.js", diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md index f6b9350ad5..857fb65976 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.37.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.37.2...instrumentation-aws-lambda-v0.37.3) (2023-12-07) + + +### Bug Fixes + +* **instrumentation-lambda:** soften "unable to init" message and demote to diag.debug ([#1836](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1836)) ([fb80783](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/fb807835e9317891e6f18715e708e9993b8797d8)) + ## [0.37.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.37.1...instrumentation-aws-lambda-v0.37.2) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 96ffa6e538..fa71f2c15e 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-lambda", - "version": "0.37.2", + "version": "0.37.3", "description": "OpenTelemetry AWS Lambda automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml index 565fc7382f..b678e4b15c 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml @@ -1,16 +1,18 @@ "aws-sdk": - # there are so many version to test, it can take forever. - # we will just sample few of them - versions: ">=2.1266.0 || 2.1262.0 || 2.1219.0 || 2.1048.0 || 2.1012.0 || 2.647.0 || 2.308.0" + # A small subset of releases in the range [2.308.0, 3) to reduce testing time. + versions: "2.308.0 || 2.548.0 || 2.785.0 || 2.1025.0 || 2.1265.0 || 2.1506.0 || >=2.1508.0" commands: - npm run test "@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" + # A small subset of releases in the range [3.6.1, 4) to reduce testing time. + # - 3.377.0 was a bad release (see issue #1828). + versions: "3.6.1 || 3.53.0 || 3.163.0 || 3.266.0 || 3.354.0 || 3.458.0 || >=3.462.0" commands: - npm run test "@aws-sdk/client-sqs": - versions: ">=3.216.0 || 3.171.0 || 3.58.0 || 3.54.0 || 3.43.0 || 3.24.0" + # A small subset of releases in the range [3.24.0, 4) to reduce testing time. + versions: "3.24.0 || 3.85.0 || 3.194.0 || 3.278.0 || 3.357.0 || 3.461.0 || >=3.462.0" commands: - npm run test diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md index ccd96086c1..c2a8e0688e 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.37.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.37.0...instrumentation-aws-sdk-v0.37.1) (2023-12-07) + + +### Bug Fixes + +* **instrumentation-aws-sdk:** remove un-sanitised db.statement span attribute from DynamoDB spans ([#1748](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1748)) ([cdbb29f](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/cdbb29f034218ca14d45d60ab77f33546a37dbaa)) + ## [0.37.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.36.2...instrumentation-aws-sdk-v0.37.0) (2023-11-22) diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index c16091147b..8182d8be8a 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-aws-sdk", - "version": "0.37.0", + "version": "0.37.1", "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package", "keywords": [ "aws", diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts index 037ec3498c..3003da3051 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v3.test.ts @@ -402,7 +402,7 @@ describe('instrumentation-aws-sdk-v3', () => { ); }); - it('sqs receive add messaging attributes and context', done => { + it('sqs receive add messaging attributes', done => { nock(`https://sqs.${region}.amazonaws.com/`) .matchHeader('content-type', 'application/x-www-form-urlencoded') .post('/') @@ -438,7 +438,38 @@ describe('instrumentation-aws-sdk-v3', () => { 'SQS' ); expect(span.attributes[AttributeNames.AWS_REGION]).toEqual(region); + expect(span.attributes[SemanticAttributes.HTTP_STATUS_CODE]).toEqual( + 200 + ); + done(); + }); + }); + + // Propagating span context to SQS ReceiveMessage promise handler is + // broken with `@aws-sdk/client-sqs` v3.316.0 and later. + // https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1477 + it.skip('sqs receive context', done => { + nock(`https://sqs.${region}.amazonaws.com/`) + .matchHeader('content-type', 'application/x-www-form-urlencoded') + .post('/') + .reply( + 200, + fs.readFileSync('./test/mock-responses/sqs-receive.xml', 'utf8') + ); + nock(`https://sqs.${region}.amazonaws.com/`) + .matchHeader('content-type', 'application/x-amz-json-1.0') + .post('/') + .reply( + 200, + fs.readFileSync('./test/mock-responses/sqs-receive.json', 'utf8') + ); + const params = { + QueueUrl: + 'https://sqs.us-east-1.amazonaws.com/731241200085/otel-demo-aws-sdk', + MaxNumberOfMessages: 3, + }; + sqsClient.receiveMessage(params).then(res => { const receiveCallbackSpan = trace.getSpan(context.active()); expect(receiveCallbackSpan).toBeDefined(); const attributes = (receiveCallbackSpan as unknown as ReadableSpan) @@ -446,9 +477,6 @@ describe('instrumentation-aws-sdk-v3', () => { expect(attributes[SemanticAttributes.MESSAGING_OPERATION]).toMatch( MessagingOperationValues.RECEIVE ); - expect(span.attributes[SemanticAttributes.HTTP_STATUS_CODE]).toEqual( - 200 - ); done(); }); }); diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md index 4f181344c5..e2410e3871 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-bunyan/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.33.0...instrumentation-bunyan-v0.34.0) (2023-12-07) + + +### Features + +* **instrumentation-bunyan:** add log sending to Logs Bridge API ([#1713](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1713)) ([4a1d83c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4a1d83ccaa73fa0f11af1d775de4e89ceed75f4d)) + ## [0.33.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-bunyan-v0.32.2...instrumentation-bunyan-v0.33.0) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json index ccd208cd8c..efa5cc3ccf 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json @@ -15,10 +15,9 @@ }, "author": "OpenTelemetry Authors", "license": "Apache-2.0", - "// @opentelemetry/instrumentation-bunyan": "TODO: change to a ver when there is a next release", "dependencies": { "@opentelemetry/api": "^1.3.0", - "@opentelemetry/instrumentation-bunyan": "../", + "@opentelemetry/instrumentation-bunyan": "^0.34.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-node": "^0.45.1", "bunyan": "^1.8.15" diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 52a2ed161a..60bee3cf61 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-bunyan", - "version": "0.33.0", + "version": "0.34.0", "description": "OpenTelemetry instrumentation for bunyan", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md index 09389885d2..4607562b72 100644 --- a/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-express/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [0.34.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.33.3...instrumentation-express-v0.34.0) (2023-12-07) + + +### ⚠ BREAKING CHANGES + +* **instrumentation-express:** remove `@types/express` from dependencies ([#1804](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1804)) + +### Features + +* **express:** record exceptions ([#1657](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1657)) ([4ca1862](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4ca18626610c0ee3da38807da82c753b8763af95)) + + +### Bug Fixes + +* **instrumentation-express:** remove `@types/express` from dependencies ([#1804](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1804)) ([86a21d7](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/86a21d7b4ce289dc986925ad73ffd6f0618bb5c7)), closes [#1787](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1787) + ## [0.33.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-express-v0.33.2...instrumentation-express-v0.33.3) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index fd1d0163c4..f3e13e9baa 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-express", - "version": "0.33.3", + "version": "0.34.0", "description": "OpenTelemetry express automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md index 9f3aa41fe6..7cbcdedf1b 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-fastify/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.32.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.4...instrumentation-fastify-v0.32.5) (2023-12-07) + + +### Bug Fixes + +* **instrumentation-fastify:** fix span attributes and avoid FSTDEP017 FastifyDeprecation warning for 404 request ([#1763](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1763)) ([18ae75c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/18ae75c6004d66744ee99be68469843372c19d1e)) + ## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fastify-v0.32.3...instrumentation-fastify-v0.32.4) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json index a0c12a1418..52712799b3 100644 --- a/plugins/node/opentelemetry-instrumentation-fastify/package.json +++ b/plugins/node/opentelemetry-instrumentation-fastify/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fastify", - "version": "0.32.4", + "version": "0.32.5", "description": "OpenTelemetry fastify automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md index a1a5601db2..32167ec991 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-koa/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.36.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.36.2...instrumentation-koa-v0.36.3) (2023-12-07) + + +### Bug Fixes + +* **koa:** fix instrumentation of ESM-imported koa ([#1736](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1736)) ([b61f912](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/b61f9129f620c4535d3782a985546c2986a46ca0)) + ## [0.36.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-koa-v0.36.1...instrumentation-koa-v0.36.2) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index ae327ebb13..ebdb28b81d 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-koa", - "version": "0.36.2", + "version": "0.36.3", "description": "OpenTelemetry Koa automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md index dee187473c..53ffb674ec 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-mongodb/CHANGELOG.md @@ -6,6 +6,13 @@ * devDependencies * @opentelemetry/contrib-test-utils bumped from ^0.34.3 to ^0.35.0 +## [0.38.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.37.3...instrumentation-mongodb-v0.38.0) (2023-12-07) + + +### Features + +* **instrumentation-mongodb:** add support for mongodb v6 ([#1760](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1760)) ([660e37b](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/660e37bb67509b2fdd5cdd814dad2e60aa0ab40b)) + ## [0.37.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mongodb-v0.37.1...instrumentation-mongodb-v0.37.2) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 64a3d848d4..a01d2651f5 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-mongodb", - "version": "0.37.3", + "version": "0.38.0", "description": "OpenTelemetry mongodb automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md index 334ef17a26..3d88a1088f 100644 --- a/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-net/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.32.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.32.3...instrumentation-net-v0.32.4) (2023-12-07) + + +### Bug Fixes + +* **instrumentation-net:** Don't operate on closed span ([#1819](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1819)) ([60d60d0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/60d60d0be27f625819d9c4138488fb4d4c0a6b45)) + ## [0.32.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-net-v0.32.2...instrumentation-net-v0.32.3) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-net/package.json b/plugins/node/opentelemetry-instrumentation-net/package.json index fd774aeb69..6b456c3d4f 100644 --- a/plugins/node/opentelemetry-instrumentation-net/package.json +++ b/plugins/node/opentelemetry-instrumentation-net/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-net", - "version": "0.32.3", + "version": "0.32.4", "description": "OpenTelemetry net module automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md index aad79f8f15..28a29653f1 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md +++ b/plugins/node/opentelemetry-instrumentation-pino/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.34.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.34.3...instrumentation-pino-v0.34.4) (2023-12-07) + + +### Bug Fixes + +* **instrumentation-pino:** instrument pino used in ESM ([#1831](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1831)) ([4782f5b](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4782f5b7aee3b8816444eee202fe04cd8871ba66)) + ## [0.34.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pino-v0.34.2...instrumentation-pino-v0.34.3) (2023-11-13) diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index 1073640da1..f0f2e21fb5 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-pino", - "version": "0.34.3", + "version": "0.34.4", "description": "OpenTelemetry instrumentation for pino", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/scripts/parse-lerna-scopes.mjs b/scripts/parse-lerna-scopes.mjs deleted file mode 100644 index 53a10dbd76..0000000000 --- a/scripts/parse-lerna-scopes.mjs +++ /dev/null @@ -1,56 +0,0 @@ -import * as childProcess from 'child_process'; -import { join } from 'path'; -import { readFileSync } from 'fs'; - -/* - Formats `--scope` arguments for lerna from "pkg:"-prefixed labels. - Takes a JSON string as an argument and returns the formatted args in stdout. - Filters out packages that do not have test-all-versions script because it's the only - location we are using this script. - - arg: '["pkg:404", "pkg:", "pkg:instrumentation-pino", "pkg:instrumentation-dns", "pkg:instrumentation-express", "urgent", "pkg:instrumentation-fs"]' - stdout: '--scope @opentelemetry/instrumentation-pino --scope @opentelemetry/instrumentation-express' -*/ - -const labels = JSON.parse(process.argv[2]); -const lernaList = JSON.parse( - childProcess.spawnSync('npx', ['lerna', 'list', '--json']).stdout - .toString('utf8') -); -const packageList = new Map( - lernaList.map((pkg) => { - return [pkg.name, pkg]; - }) -); -// Checking this is not strictly required, but saves the whole setup for TAV workflows -const hasTavScript = (pkgLocation) => { - const { scripts } = JSON.parse(readFileSync(join(pkgLocation, 'package.json'))); - return !!scripts['test-all-versions']; -}; - -console.error('Labels:', labels); -console.error('Packages:', [...packageList.keys()]); - -const scopes = labels - .filter((l) => { - return l.startsWith('pkg:'); - }) - .map((l) => { - return l.replace(/^pkg:/, '@opentelemetry/'); - }) - .filter((pkgName) => { - const info = packageList.get(pkgName); - if (!info) { - return false - } - return hasTavScript(info.location); - }) - -console.error('Scopes:', scopes); - -console.log( - scopes.map((scope) => { - return `--scope ${scope}`; - }) - .join(' ') -); diff --git a/scripts/pr-labels-to-npm-workspace-args.mjs b/scripts/pr-labels-to-npm-workspace-args.mjs new file mode 100644 index 0000000000..500bdc1370 --- /dev/null +++ b/scripts/pr-labels-to-npm-workspace-args.mjs @@ -0,0 +1,23 @@ +/** + * Formats `-w WORKSPACE` arguments for `npm run` from "pkg:"-prefixed labels. + * Takes a JSON string as an argument and returns the formatted args in stdout. + * + * arg: '["pkg:instrumentation-pino", "urgent", "pkg:instrumentation-fs"]' + * stdout: '-w @opentelemetry/instrumentation-pino -w @opentelemetry/instrumentation-fs' + */ + +const labels = JSON.parse(process.argv[2]); + +console.error('Labels:', labels); + +const workspaces = labels + .filter((l) => { + return l.startsWith('pkg:'); + }) + .map((l) => { + return l.replace(/^pkg:/, '@opentelemetry/'); + }); + +console.error('Workspaces:', workspaces); + +console.log(workspaces.map((w) => { return `-w ${w}`; }).join(' '));