From 351c9b3aae526d3f1c53a6fbf5db2a53717df16c Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 19 Jun 2026 15:19:07 +0100
Subject: [PATCH 1/3] fix: More Node v18 issues

---
 .github/workflows/build.yml                                   | 2 +-
 .../server-utils/src/integrations/tracing-channel/mysql.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cead697f5c0..4eff5a33cda6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -782,7 +782,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, 24, 26]
+        node: ['18.0.0', 18, 20, 22, 24, 26]
         typescript:
           - false
         include:
diff --git a/packages/server-utils/src/integrations/tracing-channel/mysql.ts b/packages/server-utils/src/integrations/tracing-channel/mysql.ts
index 5384b84f95f5..fcbda0fde6b3 100644
--- a/packages/server-utils/src/integrations/tracing-channel/mysql.ts
+++ b/packages/server-utils/src/integrations/tracing-channel/mysql.ts
@@ -1,4 +1,4 @@
-import { tracingChannel } from 'node:diagnostics_channel';
+import * as diagnosticsChannel from 'node:diagnostics_channel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import {
   debug,
@@ -73,7 +73,7 @@ const _mysqlChannelIntegration = (() => {
     name: INTEGRATION_NAME,
     setupOnce() {
       DEBUG_BUILD && debug.log(`[orchestrion:mysql] subscribing to channel "${CHANNELS.MYSQL_QUERY}"`);
-      const queryCh = tracingChannel(CHANNELS.MYSQL_QUERY);
+      const queryCh = diagnosticsChannel.tracingChannel(CHANNELS.MYSQL_QUERY);
 
       // Each `context` object is shared across start/end/asyncStart/asyncEnd/error
       // for one call (orchestrion creates one per invocation). We key the span

From 2b674fc15c7011269051b2767c2a46bf80dcf62e Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 19 Jun 2026 16:15:00 +0100
Subject: [PATCH 2/3] Test Node v18.0.0

---
 .github/workflows/build.yml      | 25 ++++++++++++++++++++++++-
 scripts/node-v18-compat-check.js |  7 +++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 scripts/node-v18-compat-check.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4eff5a33cda6..8ae8802089e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -782,7 +782,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.0.0', 18, 20, 22, 24, 26]
+        node: [18, 20, 22, 24, 26]
         typescript:
           - false
         include:
@@ -812,6 +812,28 @@ jobs:
         working-directory: dev-packages/node-integration-tests
         run: yarn test
 
+  job_node_v18_compat:
+    name: Node v18.0.0 Compatibility Check
+    needs: [job_get_metadata, job_build]
+    if: needs.job_build.outputs.changed_node == 'true' || github.event_name != 'pull_request'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    steps:
+      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: '18.0.0'
+      - name: Restore caches
+        uses: ./.github/actions/restore-cache
+        with:
+          dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check Node v18.0.0 compatibility
+        run: node scripts/node-v18-compat-check.js
+
   job_node_core_integration_tests:
     name:
       Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Node-Core
@@ -1198,6 +1220,7 @@ jobs:
         job_deno_unit_tests,
         job_node_unit_tests,
         job_node_integration_tests,
+        job_node_v18_compat,
         job_node_core_integration_tests,
         job_cloudflare_integration_tests,
         job_bun_integration_tests,
diff --git a/scripts/node-v18-compat-check.js b/scripts/node-v18-compat-check.js
new file mode 100644
index 000000000000..bc2689c18b4c
--- /dev/null
+++ b/scripts/node-v18-compat-check.js
@@ -0,0 +1,7 @@
+'use strict';
+
+// Verify the Node SDK can be loaded without errors on Node v18.0.0 (the minimum supported version).
+// This catches accidental use of Node APIs that don't exist in v18.0.0.
+require('./packages/node/build/cjs/index.js');
+
+console.log('Node v18.0.0 compatibility check passed');

From b0365659688280eb724aa5dab2963ccad45b9c9f Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 19 Jun 2026 16:49:57 +0100
Subject: [PATCH 3/3] Fix

---
 scripts/node-v18-compat-check.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/node-v18-compat-check.js b/scripts/node-v18-compat-check.js
index bc2689c18b4c..6dc999d5034d 100644
--- a/scripts/node-v18-compat-check.js
+++ b/scripts/node-v18-compat-check.js
@@ -2,6 +2,6 @@
 
 // Verify the Node SDK can be loaded without errors on Node v18.0.0 (the minimum supported version).
 // This catches accidental use of Node APIs that don't exist in v18.0.0.
-require('./packages/node/build/cjs/index.js');
+require('@sentry/node');
 
 console.log('Node v18.0.0 compatibility check passed');