Merge branch 'main' into patch-1

Author: vordimous

.github/component-label-map.yml

@@ -210,12 +210,6 @@ pkg:instrumentation-redis:
           - plugins/node/opentelemetry-instrumentation-redis/**
           - packages/opentelemetry-test-utils/**
           - packages/opentelemetry-redis-common/**
-pkg:instrumentation-redis-4:
-  - changed-files:
-      - any-glob-to-any-file:
-          - plugins/node/opentelemetry-instrumentation-redis-4/**
-          - packages/opentelemetry-test-utils/**
-          - packages/opentelemetry-redis-common/**
 pkg:instrumentation-restify:
   - changed-files:
       - any-glob-to-any-file:

.github/component_owners.yml

@@ -132,8 +132,6 @@ components:
     - maryliag
   plugins/node/opentelemetry-instrumentation-pino:
     - seemk
-  plugins/node/opentelemetry-instrumentation-redis-4:
-    - blumamir
   plugins/node/opentelemetry-instrumentation-redis:
     - blumamir
   plugins/node/opentelemetry-instrumentation-restify: []

.github/workflows/ossf-scorecard.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

.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:
@@ -161,15 +163,13 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Set MySQL variables
-        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Install
         run: npm ci
       - name: Download Build Artifacts
         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:
@@ -49,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       memcached:
-        image: memcached:1.6.37-alpine
+        image: memcached:1.6.38-alpine
         ports:
         - 11211:11211
       mongo:
@@ -174,15 +176,13 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - name: Set MySQL variables
-        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Install
         run: npm ci
       - name: Download Build Artifacts
         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 +223,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,66 @@
 {
-  "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-alibaba-cloud": "0.31.2",
+  "detectors/node/opentelemetry-resource-detector-aws": "2.2.0",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.9.0",
+  "detectors/node/opentelemetry-resource-detector-container": "0.7.2",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.36.0",
   "detectors/node/opentelemetry-resource-detector-github": "0.31.0",
-  "detectors/node/opentelemetry-resource-detector-instana": "0.20.0",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.21.0",
   "metapackages/auto-configuration-propagators": "0.4.1",
-  "metapackages/auto-instrumentations-node": "0.59.0",
-  "metapackages/auto-instrumentations-web": "0.47.0",
+  "metapackages/auto-instrumentations-node": "0.61.0",
+  "metapackages/auto-instrumentations-web": "0.48.1",
   "packages/baggage-span-processor": "0.4.0",
-  "packages/baggage-log-record-processor": "0.2.0",
+  "packages/baggage-log-record-processor": "0.3.0",
   "packages/opentelemetry-host-metrics": "0.36.0",
   "packages/opentelemetry-id-generator-aws-xray": "2.0.0",
-  "packages/opentelemetry-propagation-utils": "0.31.1",
-  "packages/opentelemetry-redis-common": "0.37.0",
+  "packages/opentelemetry-propagation-utils": "0.31.2",
+  "packages/opentelemetry-redis-common": "0.38.0",
   "packages/opentelemetry-sql-common": "0.41.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",
+  "packages/opentelemetry-test-utils": "0.48.0",
+  "packages/winston-transport": "0.13.0",
+  "plugins/node/instrumentation-amqplib": "0.49.0",
+  "plugins/node/instrumentation-cucumber": "0.17.1",
+  "plugins/node/instrumentation-dataloader": "0.20.0",
+  "plugins/node/instrumentation-fs": "0.22.0",
+  "plugins/node/instrumentation-kafkajs": "0.11.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.47.0",
+  "plugins/node/instrumentation-mongoose": "0.49.0",
+  "plugins/node/instrumentation-runtime-node": "0.16.0",
+  "plugins/node/instrumentation-socket.io": "0.49.0",
+  "plugins/node/instrumentation-tedious": "0.21.1",
+  "plugins/node/instrumentation-typeorm": "0.3.0",
+  "plugins/node/instrumentation-undici": "0.13.2",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.53.1",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.55.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.48.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.51.1",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.47.1",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.46.1",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.49.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.50.1",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.50.2",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.46.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.55.1",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.48.1",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.48.1",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.48.1",
+  "plugins/node/opentelemetry-instrumentation-net": "0.46.1",
+  "plugins/node/opentelemetry-instrumentation-oracledb": "0.28.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.54.1",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.49.1",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.48.2",
+  "plugins/node/opentelemetry-instrumentation-router": "0.47.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.47.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.47.1",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.47.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.47.0",
+  "plugins/web/opentelemetry-plugin-react-load": "0.34.1",
   "propagators/opentelemetry-propagator-instana": "0.4.0",
   "propagators/opentelemetry-propagator-ot-trace": "0.28.0",
   "propagators/propagator-aws-xray": "2.1.0",