Merge branch 'main' into dluna/2905-feat-kafkajs-instrumentation

.github/workflows/addToProject.yml

@@ -3,6 +3,9 @@ on:
   issues:
     types:
       - opened, milestoned
+permissions:
+  contents: read
+
 jobs:
   add_to_project:
     if: github.event.issue && github.event.issue.milestone

.github/workflows/labeler.yml

@@ -7,11 +7,17 @@ on:
 env:
   MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
 
+permissions:
+  contents: read
+  # This permission is needed to add labels to issues/PRs per
+  # https://docs.github.com/en/rest/issues/labels?apiVersion=2022-11-28#add-labels-to-an-issue
+  issues: write
+
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - name: Add agent-nodejs label
+    - name: Add agent-nodejs label to this issue/PR
       uses: AlexanderWert/issue-labeler@v2.3
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
@@ -32,7 +38,7 @@ jobs:
       run: |
         echo "::debug::isTeamMember: ${{ steps.checkUserMember.outputs.isTeamMember }}"
         echo "::debug::isExcluded: ${{ steps.checkUserMember.outputs.isExcluded }}"
-    - name: Add community and triage lables
+    - name: Add community and triage labels
       if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true'
       uses: AlexanderWert/issue-labeler@v2.3
       with:

.github/workflows/microbenchmark.yml

@@ -44,7 +44,7 @@ jobs:
           url: ${{ secrets.VAULT_ADDR }}
           roleId: ${{ secrets.VAULT_ROLE_ID }}
           secretId: ${{ secrets.VAULT_SECRET_ID }}
-          channel: "#apm-agent-nodejs"
+          channel: "#apm-agent-node"
           message: |
             :ghost: [${{ github.repository }}] microbenchmark *${{ github.ref_name }}* failed to run in Buildkite.
             Build: (<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|here>)

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
       - run: make -C .ci push-docker
 
       - name: Read AWS vault secrets
-        uses: hashicorp/vault-action@v2.8.0
+        uses: hashicorp/vault-action@v3.0.0
         with:
           url: ${{ secrets.VAULT_ADDR }}
           method: approle
@@ -56,7 +56,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Read NPM vault secrets
-        uses: hashicorp/vault-action@v2.8.0
+        uses: hashicorp/vault-action@v3.0.0
         with:
           url: ${{ secrets.VAULT_ADDR }}
           method: approle

.github/workflows/test.yml

@@ -26,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
+permissions:
+  contents: read
+
 jobs:
 
   lint:

.tav.yml

@@ -131,7 +131,7 @@ mongodb:
     node: '>=14.20.1'
     commands: node test/instrumentation/modules/mongodb/mongodb.test.js
   - versions: '>=6 <7'
-    node: '>=15.0.0'
+    node: '>=16.20.1'
     commands: node test/instrumentation/modules/mongodb/mongodb.test.js
 
 # Bluebird is effectively deprecated (https://github.com/petkaantonov/bluebird#%EF%B8%8Fnote%EF%B8%8F).
@@ -335,6 +335,9 @@ tedious:
   - versions: '16.0.0 || 16.1.0 || >16.1.0 <17' # first and last majors subset of '16.x'
     node: '>=16'
     commands: node test/instrumentation/modules/tedious.test.js
+  - versions: '>=17.0.0 <18' # first and last majors subset of '17.x' (as for now there is only v17.0.0)
+    node: '18.x || >=20'
+    commands: node test/instrumentation/modules/tedious.test.js
 
 cassandra-driver:
   # 3.1.0 is broken

CHANGELOG.asciidoc

@@ -41,11 +41,17 @@ See the <<upgrade-to-v4>> guide.
 [float]
 ===== Features
 
+* Update <<opentelemetry-bridge>> support to `@opentelemetry/api` version 1.8.0.
+* Add support for `tedious` version v17. ({pull}3901[#3901])
 * Add support for `kafkajs` version v2. ({issues}2905[#2905])
 
 [float]
 ===== Bug fixes
 
+* Fix instrumentation of mongodb to not break mongodb@6.4.0. Mongodb v6.4.0
+  included changes that resulted in the APM agent's instrumentation breaking it.
+  ({pull}3897[#3897])
+
 [float]
 ===== Chores
 

docs/supported-technologies.asciidoc

@@ -84,7 +84,7 @@ Metrics API and Metrics SDK to allow
 [options="header"]
 |=======================================================================
 | Framework | Version
-| <<opentelemetry-bridge,@opentelemetry/api>> | >=1.0.0 <1.8.0
+| <<opentelemetry-bridge,@opentelemetry/api>> | >=1.0.0 <1.9.0
 | https://www.npmjs.com/package/@opentelemetry/sdk-metrics[@opentelemetry/sdk-metrics] | >=1.11.0 <2
 |=======================================================================
 
@@ -139,7 +139,7 @@ so those should be supported as well.
 |https://www.npmjs.com/package/mysql2[mysql2] |>=1.0.0 <4.0.0 |Will instrument all queries
 |https://www.npmjs.com/package/pg[pg] |>=4.0.0 <9.0.0 |Will instrument all queries
 |https://www.npmjs.com/package/redis[redis] |>=2.0.0 <5.0.0 |Will instrument all queries
-|https://www.npmjs.com/package/tedious[tedious] |>=1.9 <17.0.0 | (Excluding v4.0.0.) Will instrument all queries
+|https://www.npmjs.com/package/tedious[tedious] |>=1.9 <18.0.0 | (Excluding v4.0.0.) Will instrument all queries
 |https://www.npmjs.com/package/undici[undici] | >=4.7.1 <6 | Will instrument undici HTTP requests, except HTTP CONNECT. Requires node v14.17.0 or later, or the user to have installed the https://www.npmjs.com/package/diagnostics_channel['diagnostics_channel' polyfill].
 |https://www.npmjs.com/package/ws[ws] |>=1.0.0 <8.0.0 |Will instrument outgoing WebSocket messages
 |https://www.npmjs.com/package/kafkajs[kafkajs] |>=2.0.0 <3.0.0 |Will instrument all send methods for producers and message and batch processing for consumers.

lib/apm-client/http-apm-client/detect-hostname.js

@@ -30,7 +30,15 @@ function detectHostname() {
       // https://learn.microsoft.com/en-us/dotnet/api/system.net.dns.gethostentry
       out = spawnSync(
         'powershell.exe',
-        ['[System.Net.Dns]::GetHostEntry($env:computerName).HostName'],
+        [
+          '-NoLogo',
+          '-NonInteractive',
+          '-NoProfile',
+          '-ExecutionPolicy',
+          'Bypass',
+          '-Command',
+          '[System.Net.Dns]::GetHostEntry($env:computerName).HostName',
+        ],
         { encoding: 'utf8', shell: true, timeout: 2000 },
       );
       if (!out.error) {

lib/instrumentation/modules/mongodb/lib/cmap/connection_pool.js

@@ -12,13 +12,14 @@ const semver = require('semver');
 
 module.exports = (mod, agent, { version, enabled }) => {
   if (!enabled) return mod;
-  if (!semver.satisfies(version, '>=3.3 <7.0')) {
-    agent.logger.debug(
-      'mongodb version %s not instrumented (mongodb <3.3 is instrumented via mongodb-core)',
-      version,
-    );
+  if (!semver.satisfies(version, '>=3.3 <6.4.0')) {
+    // - mongodb <3.3 is instrumented via mongodb-core
+    // - mongodb >=6.4.0 now longer requires ConnectionPool#checkOut to be
+    //   patched to fix async context tracking. See discussion at
+    //   https://github.com/elastic/apm-agent-nodejs/pull/3897
     return mod;
   }
+  agent.logger.debug('instrumenting mongodb ConnectionPool#checkOut');
 
   if (mod.ConnectionPool) {
     class ConnectionPoolTraced extends mod.ConnectionPool {

lib/instrumentation/modules/tedious.js

@@ -14,7 +14,7 @@ var { getDBDestination } = require('../context');
 
 module.exports = function (tedious, agent, { version, enabled }) {
   if (!enabled) return tedious;
-  if (version === '4.0.0' || !semver.satisfies(version, '>=1.9.0 <17')) {
+  if (version === '4.0.0' || !semver.satisfies(version, '>=1.9.0 <18')) {
     agent.logger.debug(
       'tedious version %s not supported - aborting...',
       version,