Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-contrib into fix!-Mysql2Instrumentation_Fix_Masking

Author: maryliag

.github/component-label-map.yml

@@ -1,156 +1,165 @@
 # Keep all in alphabetical order
 components:
-  detectors/node/opentelemetry-resource-detector-alibaba-cloud:
+  packages/resource-detector-alibaba-cloud:
     - legendecas
-  detectors/node/opentelemetry-resource-detector-aws:
+  packages/resource-detector-aws:
     - jj22ee
-  detectors/node/opentelemetry-resource-detector-azure:
+  packages/resource-detector-azure:
     - jacksonweber
     - hectorhdzg
-  detectors/node/opentelemetry-resource-detector-container:
+  packages/resource-detector-container:
     - abhee11
-  detectors/node/opentelemetry-resource-detector-gcp:
+  packages/resource-detector-gcp:
     - aabmass
     - punya
-  detectors/node/opentelemetry-resource-detector-github: []
+  packages/resource-detector-github: []
     # Unmaintained
-  detectors/node/opentelemetry-resource-detector-instana:
+  packages/resource-detector-instana:
     - kirrg001
   incubator/opentelemetry-sampler-aws-xray:
     - jj22ee
-  metapackages/auto-configuration-propagators:
+    - yiyuan-he
+  packages/auto-configuration-propagators:
     - pichlermarc
-  metapackages/auto-instrumentations-node:
+  packages/auto-instrumentations-node:
     - dyladan
     - pichlermarc
     - legendecas
     - blumamir
-  metapackages/auto-instrumentations-web:
+  packages/auto-instrumentations-web:
     - dyladan
     - pichlermarc
     - legendecas
     - blumamir
+  packages/baggage-log-record-processor:
+    - maryliag
   packages/baggage-span-processor:
     - mikegoldsmith
     - jamiedanielson
-  packages/opentelemetry-host-metrics:
+  packages/host-metrics:
     - legendecas
-  packages/opentelemetry-id-generator-aws-xray:
+  packages/id-generator-aws-xray:
     - jj22ee
-  packages/opentelemetry-propagation-utils:
+  packages/propagation-utils:
     - dyladan
     - pichlermarc
     - legendecas
     - blumamir
-  packages/opentelemetry-redis-common: []
+  packages/redis-common: []
     # Unmaintained
-  packages/opentelemetry-test-utils:
+  packages/contrib-test-utils:
     - dyladan
     - pichlermarc
     - legendecas
     - blumamir
   packages/winston-transport:
     - hectorhdzg
-  plugins/node/instrumentation-amqplib:
+  packages/instrumentation-amqplib:
     - blumamir
-  plugins/node/instrumentation-cucumber:
+  packages/instrumentation-cucumber:
     - Ugzuzg
-  plugins/node/instrumentation-dataloader:
+  packages/instrumentation-dataloader:
     - henrinormak
-  plugins/node/instrumentation-fs: []
+  packages/instrumentation-fs: []
     # Unmaintained
-  plugins/node/instrumentation-kafkajs:
+  packages/instrumentation-kafkajs:
     - seemk
-  plugins/node/instrumentation-lru-memoizer:
+  packages/instrumentation-lru-memoizer:
     - blumamir
-  plugins/node/instrumentation-mongoose:
+  packages/instrumentation-mongoose:
     - blumamir
-  plugins/node/instrumentation-socket.io:
+  packages/instrumentation-socket.io:
     - mottibec
-  plugins/node/instrumentation-tedious: []
+  packages/instrumentation-tedious: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-aws-lambda:
+  packages/instrumentation-typeorm:
+    - seemk
+    - weyert
+    - t2t2
+    - mhennoch
+  packages/instrumentation-aws-lambda:
     - jj22ee
-  plugins/node/opentelemetry-instrumentation-aws-sdk:
+  packages/instrumentation-aws-sdk:
     - blumamir
     - jj22ee
     - trivikr
-  plugins/node/opentelemetry-instrumentation-bunyan:
+  packages/instrumentation-bunyan:
     - seemk
     - trentm
-  plugins/node/opentelemetry-instrumentation-cassandra:
+  packages/instrumentation-cassandra-driver:
     - seemk
-  plugins/node/opentelemetry-instrumentation-connect: []
+  packages/instrumentation-connect: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-dns: []
+  packages/instrumentation-dns: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-express:
+  packages/instrumentation-express:
     - JamieDanielson
     - pkanal
     - raphael-theriault-swi
-  plugins/node/opentelemetry-instrumentation-fastify: []
+  packages/instrumentation-fastify: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-generic-pool: []
+  packages/instrumentation-generic-pool: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-graphql:
+  packages/instrumentation-graphql:
     - obecny
-  plugins/node/opentelemetry-instrumentation-hapi: []
+  packages/instrumentation-hapi: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-ioredis:
+  packages/instrumentation-ioredis:
     - blumamir
     - naseemkullah
-  plugins/node/opentelemetry-instrumentation-knex: []
+  packages/instrumentation-knex: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-koa: []
+  packages/instrumentation-koa: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-memcached: []
+  packages/instrumentation-memcached: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-mongodb:
+  packages/instrumentation-mongodb:
     - onurtemizkan
-  plugins/node/opentelemetry-instrumentation-mysql: []
+  packages/instrumentation-mysql: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-mysql2:
+  packages/instrumentation-mysql2:
     - raphael-theriault-swi
-  plugins/node/opentelemetry-instrumentation-nestjs-core: []
+  packages/instrumentation-nestjs-core: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-net:
+  packages/instrumentation-net:
     - seemk
-  plugins/node/instrumentation-runtime-node:
+  packages/instrumentation-oracledb:
+    - sudarshan12s
+    - sharadraju
+  packages/instrumentation-runtime-node:
     - d4nyll
-  plugins/node/opentelemetry-instrumentation-pg:
+  packages/instrumentation-pg:
     - maryliag
-  plugins/node/opentelemetry-instrumentation-pino:
+  packages/instrumentation-pino:
     - seemk
-  plugins/node/opentelemetry-instrumentation-redis-4:
-    - blumamir
-  plugins/node/opentelemetry-instrumentation-redis:
+  packages/instrumentation-redis:
     - blumamir
-  plugins/node/opentelemetry-instrumentation-restify: []
+  packages/instrumentation-restify: []
     # Unmaintained
-  plugins/node/opentelemetry-instrumentation-router: []
+  packages/instrumentation-router: []
     # Unmaintained
-  plugins/node/instrumentation-undici:
+  packages/instrumentation-undici:
     - david-luna
     - trentm
-  plugins/node/opentelemetry-instrumentation-winston:
+  packages/instrumentation-winston:
     - seemk
-  plugins/web/opentelemetry-instrumentation-document-load:
+  packages/instrumentation-document-load:
     - pkanal
     - martinkuba
-  plugins/web/opentelemetry-instrumentation-long-task:
+  packages/instrumentation-long-task:
     - mhennoch
     - t2t2
-  plugins/web/opentelemetry-instrumentation-user-interaction:
+  packages/instrumentation-user-interaction:
     - obecny
-  plugins/web/opentelemetry-plugin-react-load:
+  packages/plugin-react-load:
     - martinkuba
-  propagators/opentelemetry-propagator-instana:
+  packages/propagator-instana:
     - kirrg001
-  propagators/opentelemetry-propagator-ot-trace: []
+  packages/propagator-ot-trace: []
     # Unmaintained
-  propagators/propagator-aws-xray:
+  packages/propagator-aws-xray:
     - jj22ee
-  propagators/propagator-aws-xray-lambda: [ ]
+  packages/propagator-aws-xray-lambda: [ ]
   # Unmaintained
 
 ignored-authors:

.github/component_owners.yml

@@ -0,0 +1,47 @@
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "31 18 * * 4" # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        with:
+          sarif_file: results.sarif

.github/workflows/ossf-scorecard.yml

@@ -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/peer-api.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-validate.yaml

@@ -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/release-please.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:
@@ -46,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18", "20", "22"]
+        node: ["18", "20", "22"]
     runs-on: ubuntu-latest
     services:
       mongo:
@@ -80,6 +82,19 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      oracledb:
+        image: gvenzl/oracle-free:slim
+        env:
+          APP_USER: otel
+          APP_USER_PASSWORD: secret
+          ORACLE_PASSWORD: oracle
+        ports:
+          - 1521:1521
+        options: >-
+          --health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       postgres:
         image: postgres:16-alpine
         env:
@@ -122,6 +137,12 @@ jobs:
       MYSQL_USER: otel
       OPENTELEMETRY_REDIS_HOST: localhost
       OPENTELEMETRY_REDIS_PORT: 6379
+      ORACLE_HOSTNAME: localhost
+      ORACLE_PORT: 1521
+      ORACLE_CONNECTSTRING: localhost:1521/freepdb1
+      ORACLE_USER: otel
+      ORACLE_PASSWORD: secret
+      ORACLE_SERVICENAME: FREEPDB1
       POSTGRES_DB: otel_pg_database
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432
@@ -130,6 +151,7 @@ jobs:
       RUN_MONGODB_TESTS: 1
       RUN_MSSQL_TESTS: 1
       RUN_MYSQL_TESTS: 1
+      RUN_ORACLEDB_TESTS: 1
       RUN_POSTGRES_TESTS: 1
       RUN_REDIS_TESTS: 1
       NPM_CONFIG_UNSAFE_PERM: true
@@ -141,18 +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: 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
       - 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