From 25b8fbdbcc399c9171b952c779e5e2732b8808a7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 01:53:42 +0000
Subject: [PATCH 1/7] Initial plan


From 38f3fffc21509c386df535533d8d748769f4500a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 02:13:01 +0000
Subject: [PATCH 2/7] Added comprehensive tests for exception message handling

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .../ExceptionTelemetryBuilderTest.java        |  67 +++++++++
 .../classicsdk/TelemetryUtilTest.java         | 127 ++++++++++++++++++
 2 files changed, 194 insertions(+)
 create mode 100644 agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java
 create mode 100644 agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java

diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java
new file mode 100644
index 00000000000..5152859259f
--- /dev/null
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.agent.internal.classicsdk;
+
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionTelemetryBuilder;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
+import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ExceptionTelemetryBuilderTest {
+
+  @Test
+  public void testExceptionTelemetryBuilderWithNullMessage() {
+    // Create an exception without a message
+    NullPointerException exception = new NullPointerException();
+    
+    // Create a test telemetry client
+    TelemetryClient telemetryClient = TelemetryClient.createForTest();
+    
+    // Create an exception telemetry builder
+    ExceptionTelemetryBuilder telemetryBuilder = telemetryClient.newExceptionTelemetryBuilder();
+    
+    // Set the exceptions (this calls TelemetryUtil.getExceptions)
+    telemetryBuilder.setExceptions(TelemetryUtil.getExceptions(exception));
+    
+    // Build the telemetry item
+    TelemetryItem telemetryItem = telemetryBuilder.build();
+    
+    // The item should not be null
+    assertThat(telemetryItem).isNotNull();
+    
+    // The item should have data
+    assertThat(telemetryItem.getData()).isNotNull();
+    assertThat(telemetryItem.getData().getBaseData()).isNotNull();
+    
+    // This test ensures the telemetry item can be built without throwing exceptions
+    // The actual message validation would need to be done in the serialization layer
+  }
+  
+  @Test 
+  public void testExceptionTelemetryBuilderWithMessage() {
+    // Create an exception with a message
+    String testMessage = "Test exception message";
+    NullPointerException exception = new NullPointerException(testMessage);
+    
+    // Create a test telemetry client
+    TelemetryClient telemetryClient = TelemetryClient.createForTest();
+    
+    // Create an exception telemetry builder
+    ExceptionTelemetryBuilder telemetryBuilder = telemetryClient.newExceptionTelemetryBuilder();
+    
+    // Set the exceptions (this calls TelemetryUtil.getExceptions)
+    telemetryBuilder.setExceptions(TelemetryUtil.getExceptions(exception));
+    
+    // Build the telemetry item
+    TelemetryItem telemetryItem = telemetryBuilder.build();
+    
+    // The item should not be null
+    assertThat(telemetryItem).isNotNull();
+    
+    // The item should have data
+    assertThat(telemetryItem.getData()).isNotNull();
+    assertThat(telemetryItem.getData().getBaseData()).isNotNull();
+  }
+}
\ No newline at end of file
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
new file mode 100644
index 00000000000..a03d1c7231a
--- /dev/null
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.agent.internal.classicsdk;
+
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionDetailBuilder;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TelemetryUtilTest {
+
+  @Test
+  public void testStringsIsNullOrEmpty() {
+    // Test the behavior of Strings.isNullOrEmpty with different inputs
+    
+    // null should return true
+    assertThat(Strings.isNullOrEmpty(null)).isTrue();
+    
+    // empty string should return true
+    assertThat(Strings.isNullOrEmpty("")).isTrue();
+    
+    // string with only whitespace should return false (important!)
+    assertThat(Strings.isNullOrEmpty(" ")).isFalse();
+    
+    // non-empty string should return false
+    assertThat(Strings.isNullOrEmpty("test")).isFalse();
+  }
+  
+  @Test
+  public void testExceptionMessageHandling() {
+    // Create different types of exceptions and test the message logic
+    
+    // Exception with null message
+    NullPointerException nullMsgException = new NullPointerException();
+    assertThat(nullMsgException.getMessage()).isNull();
+    
+    // Exception with empty message
+    NullPointerException emptyMsgException = new NullPointerException("");
+    assertThat(emptyMsgException.getMessage()).isEqualTo("");
+    
+    // Exception with whitespace message
+    NullPointerException whitespaceMsgException = new NullPointerException("   ");
+    assertThat(whitespaceMsgException.getMessage()).isEqualTo("   ");
+    
+    // Test our logic
+    String[] testMessages = {null, "", "   ", "real message"};
+    String[] expectedResults = {
+      "java.lang.NullPointerException", 
+      "java.lang.NullPointerException", 
+      "   ", 
+      "real message"
+    };
+    
+    for (int i = 0; i < testMessages.length; i++) {
+      String testMessage = testMessages[i];
+      String expectedResult = expectedResults[i];
+      
+      // Simulate TelemetryUtil logic
+      String exceptionMessage = testMessage;
+      if (Strings.isNullOrEmpty(exceptionMessage)) {
+        exceptionMessage = "java.lang.NullPointerException";
+      }
+      
+      assertThat(exceptionMessage).isEqualTo(expectedResult);
+    }
+  }
+  
+  @Test
+  public void testExceptionWithMessage() {
+    // Create an exception with a message
+    String testMessage = "Test exception message";
+    NullPointerException exception = new NullPointerException(testMessage);
+    
+    // Process the exception
+    List<ExceptionDetailBuilder> exceptions = TelemetryUtil.getExceptions(exception);
+    
+    // Should have one exception detail
+    assertThat(exceptions).hasSize(1);
+    
+    // Test the logic directly - the message should remain as original
+    String exceptionMessage = exception.getMessage();
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    assertThat(exceptionMessage).isEqualTo(testMessage);
+  }
+  
+  @Test
+  public void testExceptionWithEmptyMessage() {
+    // Create an exception with an empty message
+    NullPointerException exception = new NullPointerException("");
+    
+    // Process the exception
+    List<ExceptionDetailBuilder> exceptions = TelemetryUtil.getExceptions(exception);
+    
+    // Should have one exception detail
+    assertThat(exceptions).hasSize(1);
+    
+    // Test the logic directly - the message should be set to class name
+    String exceptionMessage = exception.getMessage();
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    assertThat(exceptionMessage).isEqualTo("java.lang.NullPointerException");
+  }
+  
+  @Test
+  public void testExceptionWithNullMessage() {
+    // Create an exception with null message (which is the default for most exceptions)
+    RuntimeException exception = new RuntimeException((String) null);
+    
+    // Process the exception
+    List<ExceptionDetailBuilder> exceptions = TelemetryUtil.getExceptions(exception);
+    
+    // Should have one exception detail
+    assertThat(exceptions).hasSize(1);
+    
+    // Test the logic directly - the message should be set to class name
+    String exceptionMessage = exception.getMessage();
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    assertThat(exceptionMessage).isEqualTo("java.lang.RuntimeException");
+  }
+}
\ No newline at end of file

From 03b720e057332b27a3af56f03d3ef0ed0bb9011b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 02:18:52 +0000
Subject: [PATCH 3/7] Fix exception message handling to prevent empty message
 field

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .../internal/classicsdk/TelemetryUtil.java    |  6 ++
 .../ExceptionMessageBehaviorTest.java         | 83 +++++++++++++++++++
 .../ExceptionTelemetryBuilderTest.java        | 67 ---------------
 .../classicsdk/TelemetryUtilTest.java         |  7 +-
 4 files changed, 95 insertions(+), 68 deletions(-)
 create mode 100644 agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionMessageBehaviorTest.java
 delete mode 100644 agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java

diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
index 5fc3b323a84..c9db10a6677 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
@@ -61,6 +61,12 @@ private static ExceptionDetailBuilder createWithStackInfo(
     if (Strings.isNullOrEmpty(exceptionMessage)) {
       exceptionMessage = exception.getClass().getName();
     }
+    
+    // Defensive check to ensure the message is never null or empty
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = "Unknown Exception";
+    }
+    
     exceptionDetails.setMessage(exceptionMessage);
 
     if (parentExceptionDetails != null) {
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionMessageBehaviorTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionMessageBehaviorTest.java
new file mode 100644
index 00000000000..d7eccf4fb5b
--- /dev/null
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionMessageBehaviorTest.java
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.agent.internal.classicsdk;
+
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ExceptionMessageBehaviorTest {
+
+  @Test
+  public void testNullPointerExceptionMessageBehavior() {
+    // Test the exact scenario from the problem statement
+    NullPointerException exception = new NullPointerException();
+    
+    // Check the message
+    String message = exception.getMessage();
+    assertThat(message).isNull();
+    
+    // Apply the TelemetryUtil logic
+    String exceptionMessage = message;
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    
+    // The final message should be the class name
+    assertThat(exceptionMessage).isEqualTo("java.lang.NullPointerException");
+    assertThat(exceptionMessage).isNotEmpty();
+    assertThat(exceptionMessage).isNotNull();
+  }
+
+  @Test
+  public void testNullPointerExceptionWithEmptyMessage() {
+    // Test the scenario with empty string
+    NullPointerException exception = new NullPointerException("");
+    
+    // Check the message
+    String message = exception.getMessage();
+    assertThat(message).isEqualTo("");
+    
+    // Apply the TelemetryUtil logic
+    String exceptionMessage = message;
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    
+    // The final message should be the class name
+    assertThat(exceptionMessage).isEqualTo("java.lang.NullPointerException");
+    assertThat(exceptionMessage).isNotEmpty();
+    assertThat(exceptionMessage).isNotNull();
+  }
+
+  @Test
+  public void testRuntimeExceptionMessageBehavior() {
+    // Test with RuntimeException
+    RuntimeException exception = new RuntimeException();
+    
+    // Check the message
+    String message = exception.getMessage();
+    assertThat(message).isNull();
+    
+    // Apply the TelemetryUtil logic
+    String exceptionMessage = message;
+    if (Strings.isNullOrEmpty(exceptionMessage)) {
+      exceptionMessage = exception.getClass().getName();
+    }
+    
+    // The final message should be the class name
+    assertThat(exceptionMessage).isEqualTo("java.lang.RuntimeException");
+    assertThat(exceptionMessage).isNotEmpty();
+    assertThat(exceptionMessage).isNotNull();
+  }
+
+  @Test
+  public void testStringIsNullOrEmptyBehavior() {
+    // Test the Strings.isNullOrEmpty behavior with various inputs
+    assertThat(Strings.isNullOrEmpty(null)).isTrue();
+    assertThat(Strings.isNullOrEmpty("")).isTrue();
+    assertThat(Strings.isNullOrEmpty("   ")).isFalse(); // Whitespace is not empty
+    assertThat(Strings.isNullOrEmpty("test")).isFalse();
+  }
+}
\ No newline at end of file
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java
deleted file mode 100644
index 5152859259f..00000000000
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/ExceptionTelemetryBuilderTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.microsoft.applicationinsights.agent.internal.classicsdk;
-
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionTelemetryBuilder;
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
-import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
-import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ExceptionTelemetryBuilderTest {
-
-  @Test
-  public void testExceptionTelemetryBuilderWithNullMessage() {
-    // Create an exception without a message
-    NullPointerException exception = new NullPointerException();
-    
-    // Create a test telemetry client
-    TelemetryClient telemetryClient = TelemetryClient.createForTest();
-    
-    // Create an exception telemetry builder
-    ExceptionTelemetryBuilder telemetryBuilder = telemetryClient.newExceptionTelemetryBuilder();
-    
-    // Set the exceptions (this calls TelemetryUtil.getExceptions)
-    telemetryBuilder.setExceptions(TelemetryUtil.getExceptions(exception));
-    
-    // Build the telemetry item
-    TelemetryItem telemetryItem = telemetryBuilder.build();
-    
-    // The item should not be null
-    assertThat(telemetryItem).isNotNull();
-    
-    // The item should have data
-    assertThat(telemetryItem.getData()).isNotNull();
-    assertThat(telemetryItem.getData().getBaseData()).isNotNull();
-    
-    // This test ensures the telemetry item can be built without throwing exceptions
-    // The actual message validation would need to be done in the serialization layer
-  }
-  
-  @Test 
-  public void testExceptionTelemetryBuilderWithMessage() {
-    // Create an exception with a message
-    String testMessage = "Test exception message";
-    NullPointerException exception = new NullPointerException(testMessage);
-    
-    // Create a test telemetry client
-    TelemetryClient telemetryClient = TelemetryClient.createForTest();
-    
-    // Create an exception telemetry builder
-    ExceptionTelemetryBuilder telemetryBuilder = telemetryClient.newExceptionTelemetryBuilder();
-    
-    // Set the exceptions (this calls TelemetryUtil.getExceptions)
-    telemetryBuilder.setExceptions(TelemetryUtil.getExceptions(exception));
-    
-    // Build the telemetry item
-    TelemetryItem telemetryItem = telemetryBuilder.build();
-    
-    // The item should not be null
-    assertThat(telemetryItem).isNotNull();
-    
-    // The item should have data
-    assertThat(telemetryItem.getData()).isNotNull();
-    assertThat(telemetryItem.getData().getBaseData()).isNotNull();
-  }
-}
\ No newline at end of file
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
index a03d1c7231a..6b0e45d3b07 100644
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
@@ -57,12 +57,17 @@ public void testExceptionMessageHandling() {
       String testMessage = testMessages[i];
       String expectedResult = expectedResults[i];
       
-      // Simulate TelemetryUtil logic
+      // Simulate TelemetryUtil logic with defensive check
       String exceptionMessage = testMessage;
       if (Strings.isNullOrEmpty(exceptionMessage)) {
         exceptionMessage = "java.lang.NullPointerException";
       }
       
+      // Defensive check to ensure the message is never null or empty
+      if (Strings.isNullOrEmpty(exceptionMessage)) {
+        exceptionMessage = "Unknown Exception";
+      }
+      
       assertThat(exceptionMessage).isEqualTo(expectedResult);
     }
   }

From 879c66bdddc2917866cde730f9ec0cf9fae96cff Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 02:38:23 +0000
Subject: [PATCH 4/7] Remove redundant defensive check for exception class
 names

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .../agent/internal/classicsdk/TelemetryUtil.java           | 6 ------
 .../agent/internal/classicsdk/TelemetryUtilTest.java       | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
index c9db10a6677..5fc3b323a84 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java
@@ -61,12 +61,6 @@ private static ExceptionDetailBuilder createWithStackInfo(
     if (Strings.isNullOrEmpty(exceptionMessage)) {
       exceptionMessage = exception.getClass().getName();
     }
-    
-    // Defensive check to ensure the message is never null or empty
-    if (Strings.isNullOrEmpty(exceptionMessage)) {
-      exceptionMessage = "Unknown Exception";
-    }
-    
     exceptionDetails.setMessage(exceptionMessage);
 
     if (parentExceptionDetails != null) {
diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
index 6b0e45d3b07..a03d1c7231a 100644
--- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
+++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtilTest.java
@@ -57,17 +57,12 @@ public void testExceptionMessageHandling() {
       String testMessage = testMessages[i];
       String expectedResult = expectedResults[i];
       
-      // Simulate TelemetryUtil logic with defensive check
+      // Simulate TelemetryUtil logic
       String exceptionMessage = testMessage;
       if (Strings.isNullOrEmpty(exceptionMessage)) {
         exceptionMessage = "java.lang.NullPointerException";
       }
       
-      // Defensive check to ensure the message is never null or empty
-      if (Strings.isNullOrEmpty(exceptionMessage)) {
-        exceptionMessage = "Unknown Exception";
-      }
-      
       assertThat(exceptionMessage).isEqualTo(expectedResult);
     }
   }

From 05b825cd77455bb15b1e78a739daca30d0a0300b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 02:56:05 +0000
Subject: [PATCH 5/7] Add smoke test for exception message handling

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 settings.gradle.kts                           |   1 +
 .../ExceptionMessageHandling/build.gradle.kts |  11 ++
 .../smoketestapp/SpringBootApp.java           |  16 +++
 .../smoketestapp/TestController.java          |  43 ++++++++
 .../ExceptionMessageHandlingTest.java         | 100 ++++++++++++++++++
 5 files changed, 171 insertions(+)
 create mode 100644 smoke-tests/apps/ExceptionMessageHandling/build.gradle.kts
 create mode 100644 smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java
 create mode 100644 smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
 create mode 100644 smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6f8af6bb4ad..19f4ae7b147 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -77,6 +77,7 @@ hideFromDependabot(":smoke-tests:apps:CoreAndFilter3xUsingOld3xAgent")
 hideFromDependabot(":smoke-tests:apps:CustomDimensions")
 hideFromDependabot(":smoke-tests:apps:CustomInstrumentation")
 hideFromDependabot(":smoke-tests:apps:DetectUnexpectedOtelMetrics")
+hideFromDependabot(":smoke-tests:apps:ExceptionMessageHandling")
 hideFromDependabot(":smoke-tests:apps:Diagnostics")
 hideFromDependabot(":smoke-tests:apps:Diagnostics:JfrFileReader")
 hideFromDependabot(":smoke-tests:apps:DiagnosticExtension:MockExtension")
diff --git a/smoke-tests/apps/ExceptionMessageHandling/build.gradle.kts b/smoke-tests/apps/ExceptionMessageHandling/build.gradle.kts
new file mode 100644
index 00000000000..35929f91345
--- /dev/null
+++ b/smoke-tests/apps/ExceptionMessageHandling/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("ai.smoke-test-war")
+}
+
+dependencies {
+  implementation("org.springframework.boot:spring-boot-starter-web:2.5.12") {
+    exclude("org.springframework.boot", "spring-boot-starter-tomcat")
+  }
+  // this dependency is needed to make wildfly happy
+  implementation("org.reactivestreams:reactive-streams:1.0.3")
+}
diff --git a/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java
new file mode 100644
index 00000000000..fe5cce0e623
--- /dev/null
+++ b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/SpringBootApp.java
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketestapp;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication
+public class SpringBootApp extends SpringBootServletInitializer {
+  @Override
+  protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+    return applicationBuilder.sources(SpringBootApp.class);
+  }
+}
diff --git a/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
new file mode 100644
index 00000000000..cc8db295384
--- /dev/null
+++ b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketestapp;
+
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestController {
+
+  private static final Logger logger = LoggerFactory.getLogger("smoketestapp");
+
+  @GetMapping("/")
+  public String root() {
+    return "OK";
+  }
+
+  @GetMapping("/testExceptionWithoutMessage")
+  public String testExceptionWithoutMessage(HttpServletResponse response) {
+    // This reproduces the original issue: exceptions without messages
+    // that would cause 206 errors from Application Insights service
+    logger.error("Exception without message test", new NullPointerException());
+    return "Exception logged";
+  }
+
+  @GetMapping("/testExceptionWithEmptyMessage")
+  public String testExceptionWithEmptyMessage(HttpServletResponse response) {
+    // Test exception with empty message
+    logger.error("Exception with empty message test", new RuntimeException(""));
+    return "Exception logged";
+  }
+
+  @GetMapping("/testExceptionWithWhitespaceMessage")
+  public String testExceptionWithWhitespaceMessage(HttpServletResponse response) {
+    // Test exception with whitespace-only message
+    logger.error("Exception with whitespace message test", new IllegalArgumentException("   "));
+    return "Exception logged";
+  }
+}
diff --git a/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java b/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java
new file mode 100644
index 00000000000..32fe4fe8c24
--- /dev/null
+++ b/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.microsoft.applicationinsights.smoketest;
+
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
+import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.microsoft.applicationinsights.smoketest.schemav2.Data;
+import com.microsoft.applicationinsights.smoketest.schemav2.Envelope;
+import com.microsoft.applicationinsights.smoketest.schemav2.ExceptionData;
+import com.microsoft.applicationinsights.smoketest.schemav2.SeverityLevel;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+@UseAgent
+abstract class ExceptionMessageHandlingTest {
+
+  @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
+
+  @Test
+  @TargetUri("/testExceptionWithoutMessage")
+  void testExceptionWithoutMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that exceptions without messages have their class name as the message
+    // This prevents the 206 error: "Field 'message' on type 'ExceptionDetails' is required but
+    // missing or empty"
+    assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.NullPointerException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("java.lang.NullPointerException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
+  @Test
+  @TargetUri("/testExceptionWithEmptyMessage")
+  void testExceptionWithEmptyMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that exceptions with empty messages have their class name as the message
+    assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.RuntimeException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("java.lang.RuntimeException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
+  @Test
+  @TargetUri("/testExceptionWithWhitespaceMessage")
+  void testExceptionWithWhitespaceMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that exceptions with whitespace-only messages have their class name as the message
+    assertThat(ed.getExceptions().get(0).getTypeName())
+        .isEqualTo("java.lang.IllegalArgumentException");
+    assertThat(ed.getExceptions().get(0).getMessage())
+        .isEqualTo("java.lang.IllegalArgumentException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
+  @Environment(TOMCAT_8_JAVA_8)
+  static class Tomcat8Java8Test extends ExceptionMessageHandlingTest {}
+
+  @Environment(TOMCAT_8_JAVA_11)
+  static class Tomcat8Java11Test extends ExceptionMessageHandlingTest {}
+
+  @Environment(TOMCAT_8_JAVA_17)
+  static class Tomcat8Java17Test extends ExceptionMessageHandlingTest {}
+
+  @Environment(TOMCAT_8_JAVA_21)
+  static class Tomcat8Java21Test extends ExceptionMessageHandlingTest {}
+}

From 881b9cc299a0df59c4f2a1fa0ecb4224cad49e98 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 03:07:20 +0000
Subject: [PATCH 6/7] Add endpoints that throw exceptions to smoke test for
 exception message handling

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .../smoketestapp/TestController.java          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
index cc8db295384..c385d7e2407 100644
--- a/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
+++ b/smoke-tests/apps/ExceptionMessageHandling/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
@@ -40,4 +40,23 @@ public String testExceptionWithWhitespaceMessage(HttpServletResponse response) {
     logger.error("Exception with whitespace message test", new IllegalArgumentException("   "));
     return "Exception logged";
   }
+
+  @GetMapping("/throwExceptionWithoutMessage")
+  public String throwExceptionWithoutMessage() throws Exception {
+    // This reproduces the original issue by throwing exceptions without messages
+    // that would cause 206 errors from Application Insights service
+    throw new NullPointerException();
+  }
+
+  @GetMapping("/throwExceptionWithEmptyMessage")
+  public String throwExceptionWithEmptyMessage() throws Exception {
+    // Test throwing exception with empty message
+    throw new RuntimeException("");
+  }
+
+  @GetMapping("/throwExceptionWithWhitespaceMessage")
+  public String throwExceptionWithWhitespaceMessage() throws Exception {
+    // Test throwing exception with whitespace-only message
+    throw new IllegalArgumentException("   ");
+  }
 }

From 2900e5d4d4d8800b6769bbc933ff6273d26d290a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 13 Jul 2025 03:21:07 +0000
Subject: [PATCH 7/7] Add tests for exception throwing endpoints in smoke test

Co-authored-by: trask <218610+trask@users.noreply.github.com>
---
 .gitignore                                    |  3 +
 .../ExceptionMessageHandlingTest.java         | 64 +++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/.gitignore b/.gitignore
index 349362ab6ce..5df4b00b6f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ build/
 
 # Visual Studio
 .vs
+
+# Compiled class files
+*.class
diff --git a/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java b/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java
index 32fe4fe8c24..717fe643eb2 100644
--- a/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java
+++ b/smoke-tests/apps/ExceptionMessageHandling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/ExceptionMessageHandlingTest.java
@@ -86,6 +86,70 @@ void testExceptionWithWhitespaceMessage() throws Exception {
     assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
   }
 
+  @Test
+  @TargetUri("/throwExceptionWithoutMessage")
+  void testThrowExceptionWithoutMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that thrown exceptions without messages have their class name as the message
+    // This prevents the 206 error: "Field 'message' on type 'ExceptionDetails' is required but
+    // missing or empty"
+    assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.NullPointerException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("java.lang.NullPointerException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
+  @Test
+  @TargetUri("/throwExceptionWithEmptyMessage")
+  void testThrowExceptionWithEmptyMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that thrown exceptions with empty messages have their class name as the message
+    assertThat(ed.getExceptions().get(0).getTypeName()).isEqualTo("java.lang.RuntimeException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isEqualTo("java.lang.RuntimeException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
+  @Test
+  @TargetUri("/throwExceptionWithWhitespaceMessage")
+  void testThrowExceptionWithWhitespaceMessage() throws Exception {
+    List<Envelope> rdList = testing.mockedIngestion.waitForItems("RequestData", 1);
+
+    Envelope rdEnvelope = rdList.get(0);
+    String operationId = rdEnvelope.getTags().get("ai.operation.id");
+    List<Envelope> edList =
+        testing.mockedIngestion.waitForItemsInOperation("ExceptionData", 1, operationId);
+
+    Envelope edEnvelope = edList.get(0);
+    ExceptionData ed = (ExceptionData) ((Data<?>) edEnvelope.getData()).getBaseData();
+
+    // Verify that thrown exceptions with whitespace-only messages have their class name as the message
+    assertThat(ed.getExceptions().get(0).getTypeName())
+        .isEqualTo("java.lang.IllegalArgumentException");
+    assertThat(ed.getExceptions().get(0).getMessage())
+        .isEqualTo("java.lang.IllegalArgumentException");
+    assertThat(ed.getExceptions().get(0).getMessage()).isNotEmpty();
+    assertThat(ed.getSeverityLevel()).isEqualTo(SeverityLevel.ERROR);
+  }
+
   @Environment(TOMCAT_8_JAVA_8)
   static class Tomcat8Java8Test extends ExceptionMessageHandlingTest {}