Merge branch 'main' into gcp-resource-detector-unit-test

Author: pichlermarc

.github/workflows/peer-api.yaml

@@ -19,4 +19,4 @@ jobs:
         run: npm ci
 
       - name: Check API dependency semantics
-        run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
+        run: node ./scripts/peer-api-check.js

.github/workflows/release-please-validate.yaml

@@ -15,8 +15,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install lerna
-        run: npm install -g [email protected]
+      - name: Install glob
+        run: npm install glob
 
       - name: Ensure Release Please Config and Manifest are in sync with the repository
         run: node scripts/check-release-please.mjs

.github/workflows/release-please.yml

@@ -74,11 +74,11 @@ jobs:
 
       # Release Please has already incremented versions and published tags, so we just
       # need to publish all unpublished versions to npm here
-      # See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package
+      # See: https://github.com/lerna/lerna/tree/main/libs/commands/publish#bump-from-package
       - name: Publish to npm
         # only publish if a release has been created
         if: ${{ steps.release.outputs.releases_created }}
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_CONFIG_PROVENANCE: true
-        run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes
+        run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --yes

.github/workflows/test-all-versions.yml

@@ -37,7 +37,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: tav-build-cache-${{ github.run_number }}
-          path: node_modules/.cache/nx
+          path: .nx
+          include-hidden-files: true
+          if-no-files-found: error
           retention-days: 1
 
   tav:
@@ -169,7 +171,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: tav-build-cache-${{ github.run_number }}
-          path: node_modules/.cache/nx
+          path: .nx
       - name: Build
         run: npm run compile
       - name: Run test-all-versions

.github/workflows/unit-test.yml

@@ -25,11 +25,13 @@ jobs:
         run: npm ci
       - name: Build
         run: npm run compile
-      - name: Upload build artifact
+      - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: tests-build-cache-${{ github.run_number }}
-          path: node_modules/.cache/nx
+          path: .nx
+          include-hidden-files: true
+          if-no-files-found: error
           retention-days: 1
 
   unit-test:
@@ -182,7 +184,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: tests-build-cache-${{ github.run_number }}
-          path: node_modules/.cache/nx
+          path: .nx
       - name: Build
         run: npm run compile
       - name: Unit tests (Full)
@@ -223,7 +225,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: tests-build-cache-${{ github.run_number }}
-          path: node_modules/.cache/nx
+          path: .nx
       - name: Build
         run: npm run compile
       - name: Unit tests

.gitignore

@@ -69,7 +69,7 @@ docs
 
 #lerna
 .changelog
-package.json.lerna_backup
+.nx
 
 # OS generated files
 .DS_Store

.release-please-manifest.json

@@ -1,67 +1,67 @@
 {
-  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.0",
-  "detectors/node/opentelemetry-resource-detector-aws": "2.0.0",
-  "detectors/node/opentelemetry-resource-detector-azure": "0.7.0",
-  "detectors/node/opentelemetry-resource-detector-container": "0.7.0",
-  "detectors/node/opentelemetry-resource-detector-gcp": "0.34.0",
+  "detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.1",
+  "detectors/node/opentelemetry-resource-detector-aws": "2.1.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.8.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.7.1",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.35.0",
   "detectors/node/opentelemetry-resource-detector-github": "0.31.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.19.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.20.0",
   "metapackages/auto-configuration-propagators": "0.4.1",
-  "metapackages/auto-instrumentations-node": "0.58.1",
-  "metapackages/auto-instrumentations-web": "0.46.0",
+  "metapackages/auto-instrumentations-node": "0.59.0",
+  "metapackages/auto-instrumentations-web": "0.47.0",
   "packages/baggage-span-processor": "0.4.0",
-  "packages/baggage-log-record-processor": "0.1.0",
+  "packages/baggage-log-record-processor": "0.2.0",
   "packages/opentelemetry-host-metrics": "0.36.0",
   "packages/opentelemetry-id-generator-aws-xray": "2.0.0",
-  "packages/opentelemetry-propagation-utils": "0.31.0",
+  "packages/opentelemetry-propagation-utils": "0.31.1",
   "packages/opentelemetry-redis-common": "0.37.0",
   "packages/opentelemetry-sql-common": "0.41.0",
-  "packages/opentelemetry-test-utils": "0.46.0",
-  "packages/winston-transport": "0.11.0",
-  "plugins/node/instrumentation-amqplib": "0.47.0",
-  "plugins/node/instrumentation-cucumber": "0.15.0",
-  "plugins/node/instrumentation-dataloader": "0.17.0",
-  "plugins/node/instrumentation-fs": "0.20.0",
-  "plugins/node/instrumentation-kafkajs": "0.9.2",
-  "plugins/node/instrumentation-lru-memoizer": "0.45.0",
-  "plugins/node/instrumentation-mongoose": "0.47.1",
-  "plugins/node/instrumentation-runtime-node": "0.14.0",
-  "plugins/node/instrumentation-socket.io": "0.47.0",
-  "plugins/node/instrumentation-tedious": "0.19.0",
-  "plugins/node/instrumentation-typeorm": "0.1.0",
-  "plugins/node/instrumentation-undici": "0.11.0",
-  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.51.1",
-  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.52.0",
-  "plugins/node/opentelemetry-instrumentation-bunyan": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-dns": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-express": "0.49.0",
-  "plugins/node/opentelemetry-instrumentation-fastify": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-graphql": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-ioredis": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-knex": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-koa": "0.48.0",
-  "plugins/node/opentelemetry-instrumentation-memcached": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-mongodb": "0.53.0",
-  "plugins/node/opentelemetry-instrumentation-mysql": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-net": "0.44.0",
-  "plugins/node/opentelemetry-instrumentation-oracledb": "0.26.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
-  "plugins/node/opentelemetry-instrumentation-pino": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-redis": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-redis-4": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-restify": "0.46.0",
-  "plugins/node/opentelemetry-instrumentation-router": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-winston": "0.45.0",
-  "plugins/web/opentelemetry-instrumentation-document-load": "0.45.0",
-  "plugins/web/opentelemetry-instrumentation-long-task": "0.45.0",
-  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.45.0",
-  "plugins/web/opentelemetry-plugin-react-load": "0.32.0",
+  "packages/opentelemetry-test-utils": "0.47.0",
+  "packages/winston-transport": "0.12.0",
+  "plugins/node/instrumentation-amqplib": "0.48.0",
+  "plugins/node/instrumentation-cucumber": "0.16.0",
+  "plugins/node/instrumentation-dataloader": "0.18.0",
+  "plugins/node/instrumentation-fs": "0.21.0",
+  "plugins/node/instrumentation-kafkajs": "0.10.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.46.0",
+  "plugins/node/instrumentation-mongoose": "0.48.0",
+  "plugins/node/instrumentation-runtime-node": "0.15.0",
+  "plugins/node/instrumentation-socket.io": "0.48.0",
+  "plugins/node/instrumentation-tedious": "0.20.0",
+  "plugins/node/instrumentation-typeorm": "0.2.0",
+  "plugins/node/instrumentation-undici": "0.12.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.52.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.53.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.54.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-oracledb": "0.27.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.53.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.46.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.46.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.46.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.46.0",
+  "plugins/web/opentelemetry-plugin-react-load": "0.33.0",
   "propagators/opentelemetry-propagator-instana": "0.4.0",
   "propagators/opentelemetry-propagator-ot-trace": "0.28.0",
   "propagators/propagator-aws-xray": "2.1.0",

CONTRIBUTING.md

@@ -108,17 +108,23 @@ Refer to the root-level [package.json](https://github.com/open-telemetry/opentel
 
 The `opentelemetry-js-contrib` project is written in TypeScript.
 
-As a general rule, installing and then compiling from the root directory should always be done first before anything else.
-After making changes to a specific package, compile again from the specific package directory you are working in.
-Some tests depend on other packages to be installed, so these steps are also required for running tests.
+As a general rule, installing from the root directory should always be done first before anything else.
+Packages within this repository might have dependencies between them. This means the dependencies should
+be built before if you want to `compile` or `test` the changes you've made in a package. Each package
+has a script to ensure these dependecies are ready.
+
+The required steps to start development on a pacakge are:
+
+- `npm ci` from root folder to install dependencies ([see npm-ci docs](https://docs.npmjs.com/cli/v10/commands/npm-ci))
+- `cd` into the pacakge you want to apply changes.
+- `npm run setup:dev` compiles the TypeScript files for this package and its dependencies within the repository.
+
+Then you can proceed to do apply the changes and use the scripts below for development workflow
 
-- `npm ci` installs dependencies ([see npm-ci docs](https://docs.npmjs.com/cli/v10/commands/npm-ci))
 - `npm run compile` compiles the code, checking for type errors.
 - `npm test` runs most unit tests, though some packages require other dependencies so are only run in CI or with a separate command in the package's `package.json` file.
 - `npm run lint:fix` lint any changes and fix if needed.
 
-Each of these commands can also be run in individual packages, as long as the initial install and compile are done first in the root directory.
-
 ### CHANGELOG
 
 The conventional commit type (in PR title) is very important to automatically bump versions on release. For instance:

RELEASING.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.31.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.31.0...resource-detector-alibaba-cloud-v0.31.1) (2025-05-15)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.46.0 to ^0.47.0
+
 ## [0.31.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.30.1...resource-detector-alibaba-cloud-v0.31.0) (2025-03-18)