Merge branch 'main' into fix/opentelemetry-instrumentation-aws-lambda-inject-into-proper-custom-prop

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

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

@@ -8,10 +8,10 @@
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
+    "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-alibaba-cloud",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
     "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

@@ -8,10 +8,10 @@
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
     "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
+    "setup:dev": "nx run-many -t compile -p @opentelemetry/resource-detector-aws",
     "compile": "tsc --build tsconfig.json tsconfig.esm.json",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "prewatch": "npm run precompile",
     "prepublishOnly": "npm run compile",
     "test": "nyc mocha 'test/**/*.test.ts'",
     "tdd": "npm run test -- --watch-extensions ts --watch",