Fix ingestion error on missing exception message (#2064)

* Fix ingestion error on missing exception message

* Much better

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/Exceptions.java

@@ -23,7 +23,6 @@
 
 import static java.util.Collections.singletonList;
 
-import com.microsoft.applicationinsights.agent.internal.common.Strings;
 import com.microsoft.applicationinsights.agent.internal.exporter.models.TelemetryExceptionDetails;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,10 +44,17 @@ public static List<TelemetryExceptionDetails> minimalParse(String str) {
     }
     // at the end of the loop, current will be end of the first line
     if (separator != -1) {
-      details.setTypeName(str.substring(0, separator));
-      details.setMessage(Strings.trimAndEmptyToNull(str.substring(separator + 1, current)));
+      String typeName = str.substring(0, separator);
+      String message = str.substring(separator + 1, current).trim();
+      if (message.isEmpty()) {
+        message = typeName;
+      }
+      details.setTypeName(typeName);
+      details.setMessage(message);
     } else {
-      details.setTypeName(str.substring(0, current));
+      String typeName = str.substring(0, current);
+      details.setTypeName(typeName);
+      details.setMessage(typeName);
     }
     details.setStack(str);
     return singletonList(details);
@@ -83,10 +89,16 @@ void process(String line) {
         current = new TelemetryExceptionDetails();
         int index = line.indexOf(':');
         if (index != -1) {
-          current.setTypeName(line.substring(0, index));
-          current.setMessage(Strings.trimAndEmptyToNull(line.substring(index + 1)));
+          String typeName = line.substring(0, index);
+          String message = line.substring(index + 1).trim();
+          if (message.isEmpty()) {
+            message = typeName;
+          }
+          current.setTypeName(typeName);
+          current.setMessage(message);
         } else {
           current.setTypeName(line);
+          current.setMessage(line);
         }
       }
     }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/Exporter.java

@@ -34,7 +34,6 @@
 import com.microsoft.applicationinsights.agent.internal.exporter.models.RequestData;
 import com.microsoft.applicationinsights.agent.internal.exporter.models.SeverityLevel;
 import com.microsoft.applicationinsights.agent.internal.exporter.models.TelemetryExceptionData;
-import com.microsoft.applicationinsights.agent.internal.exporter.models.TelemetryExceptionDetails;
 import com.microsoft.applicationinsights.agent.internal.exporter.models.TelemetryItem;
 import com.microsoft.applicationinsights.agent.internal.telemetry.FormattedDuration;
 import com.microsoft.applicationinsights.agent.internal.telemetry.FormattedTime;
@@ -229,22 +228,6 @@ private void internalExport(SpanData span) {
     }
   }
 
-  private static List<TelemetryExceptionDetails> minimalParse(String errorStack) {
-    TelemetryExceptionDetails details = new TelemetryExceptionDetails();
-    String line = errorStack.split(System.lineSeparator())[0];
-    int index = line.indexOf(": ");
-
-    if (index != -1) {
-      details.setTypeName(line.substring(0, index));
-      details.setMessage(line.substring(index + 2));
-    } else {
-      details.setTypeName(line);
-    }
-    // TODO (trask): map OpenTelemetry exception to Application Insights exception better
-    details.setStack(errorStack);
-    return Collections.singletonList(details);
-  }
-
   private void exportRemoteDependency(SpanData span, boolean inProc) {
     TelemetryItem telemetry = new TelemetryItem();
     RemoteDependencyData data = new RemoteDependencyData();
@@ -994,7 +977,7 @@ private void trackException(
     setSampleRate(telemetry, samplingPercentage);
 
     // set exception-specific properties
-    data.setExceptions(minimalParse(errorStack));
+    data.setExceptions(Exceptions.minimalParse(errorStack));
 
     telemetryClient.trackAsync(telemetry);
   }

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/exporter/ExceptionsTest.java

@@ -60,7 +60,7 @@ void testMinimalParseWithNoMessage() {
 
     TelemetryExceptionDetails details = list.get(0);
     assertThat(details.getTypeName()).isEqualTo(IllegalStateException.class.getName());
-    assertThat(details.getMessage()).isNull();
+    assertThat(details.getMessage()).isEqualTo(IllegalStateException.class.getName());
   }
 
   @Test
@@ -76,7 +76,7 @@ void testMinimalParseWithProblematicMessage() {
 
     TelemetryExceptionDetails details = list.get(0);
     assertThat(details.getTypeName()).isEqualTo(ProblematicException.class.getName());
-    assertThat(details.getMessage()).isNull();
+    assertThat(details.getMessage()).isEqualTo(ProblematicException.class.getName());
   }
 
   @Test
@@ -108,7 +108,7 @@ void testFullParseWithNoMessage() {
 
     TelemetryExceptionDetails details = list.get(0);
     assertThat(details.getTypeName()).isEqualTo(IllegalStateException.class.getName());
-    assertThat(details.getMessage()).isNull();
+    assertThat(details.getMessage()).isEqualTo(IllegalStateException.class.getName());
   }
 
   @Test
@@ -124,7 +124,7 @@ void testFullParseWithProblematicMessage() {
 
     TelemetryExceptionDetails details = list.get(0);
     assertThat(details.getTypeName()).isEqualTo(ProblematicException.class.getName());
-    assertThat(details.getMessage()).isNull();
+    assertThat(details.getMessage()).isEqualTo(ProblematicException.class.getName());
   }
 
   @Test