diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58617d209..322b76a84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 3.30.6 - 02 Oct 2025
+
 - Update default CodeQL bundle version to 2.23.2. [#3168](https://github.com/github/codeql-action/pull/3168)
 
 ## 3.30.5 - 26 Sep 2025
diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
index 9608f9f58..387d26741 100644
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -26438,7 +26438,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index f17cde249..f79eb441e 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -32287,7 +32287,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -94123,6 +94123,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index 30c9abb8f..eaf12707c 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -26438,7 +26438,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -79872,6 +79872,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index fdf055f09..80a42870f 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -32287,7 +32287,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -131599,6 +131599,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/init-action.js b/lib/init-action.js
index 901cbda3f..878d7daca 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -32287,7 +32287,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -90274,6 +90274,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
index d3edabe93..8cd476ad4 100644
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -26438,7 +26438,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -79499,6 +79499,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js
index ee1a6ba94..8b7af1f86 100644
--- a/lib/start-proxy-action-post.js
+++ b/lib/start-proxy-action-post.js
@@ -26438,7 +26438,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js
index c6c18fc06..973e6bda1 100644
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -44974,7 +44974,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -95649,6 +95649,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index dde7db14c..df30877d4 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -33584,7 +33584,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js
index 5ec030a15..ea63c4474 100644
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -26438,7 +26438,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index dc7506af3..78a21eff3 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -32287,7 +32287,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "codeql",
-      version: "4.30.6",
+      version: "4.30.7",
       private: true,
       description: "CodeQL action",
       scripts: {
@@ -89910,6 +89910,9 @@ async function createStatusReportBase(actionName, status, actionStartedAt, confi
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`
     );
+    if (isInTestMode()) {
+      throw e;
+    }
     return void 0;
   }
 }
diff --git a/package-lock.json b/package-lock.json
index cb0108057..e4854d5dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "4.30.6",
+  "version": "4.30.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "4.30.6",
+      "version": "4.30.7",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^2.3.1",
diff --git a/package.json b/package.json
index e4ddef341..9dc0420b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "4.30.6",
+  "version": "4.30.7",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
diff --git a/src/status-report.ts b/src/status-report.ts
index b0e39aa54..9bfd14677 100644
--- a/src/status-report.ts
+++ b/src/status-report.ts
@@ -375,6 +375,12 @@ export async function createStatusReportBase(
     logger.warning(
       `Caught an exception while gathering information for telemetry: ${e}. Will skip sending status report.`,
     );
+
+    // Re-throw the exception in test mode. While testing, we want to know if something goes wrong here.
+    if (isInTestMode()) {
+      throw e;
+    }
+
     return undefined;
   }
 }
diff --git a/start-proxy/action.yml b/start-proxy/action.yml
index 6d520259f..275841d9a 100644
--- a/start-proxy/action.yml
+++ b/start-proxy/action.yml
@@ -16,6 +16,9 @@ inputs:
   language:
     description: The programming language to setup the proxy for the correct ecosystem
     required: false
+  matrix:
+    default: ${{ toJson(matrix) }}
+    required: false
 outputs:
   proxy_host:
     description: The IP address of the proxy