Split iwlan error classname and first line of stacktrace in metricsandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release

Bug: 268290174
Test: statsd_testdrive 519
Change-Id: Iea2de7ff55a64b035bb0292bed9a1b4e8ca244c4
Merged-In: Iea2de7ff55a64b035bb0292bed9a1b4e8ca244c4

2 files changed, 25 insertions, 18 deletions

diff --git a/src/com/google/android/iwlan/proto/MetricsAtom.java b/src/com/google/android/iwlan/proto/MetricsAtom.java
index f127e79..7ecf464 100644
--- a/src/com/google/android/iwlan/proto/MetricsAtom.java
+++ b/src/com/google/android/iwlan/proto/MetricsAtom.java
@@ -41,7 +41,8 @@ public class MetricsAtom {
     private int mHandoverFailureMode;
     private int mRetryDurationMillis;
     private int mWifiSignalValue;
-    private String mIwlanErrorWrappedClassnameAndStack;
+    private String mIwlanErrorWrappedClassname;
+    private String mIwlanErrorWrappedStackFirstFrame;
 
     public void setMessageId(int messageId) {
         this.mMessageId = messageId;
@@ -123,23 +124,26 @@ public class MetricsAtom {
         }
 
         if (iwlanErrorWrapped == null) {
-            this.mIwlanErrorWrappedClassnameAndStack = null;
+            this.mIwlanErrorWrappedClassname = null;
+            this.mIwlanErrorWrappedStackFirstFrame = null;
             return;
         }
 
+        this.mIwlanErrorWrappedClassname = iwlanErrorWrapped.getClass().getCanonicalName();
+
         StackTraceElement[] iwlanErrorWrappedStackTraceElements = iwlanErrorWrapped.getStackTrace();
-        String iwlanErrorWrappedFirstLineStrackTrace =
-                iwlanErrorWrappedStackTraceElements.length == 0
-                        ? ""
-                        : "\n" + iwlanErrorWrappedStackTraceElements[0].toString();
+        this.mIwlanErrorWrappedStackFirstFrame =
+                iwlanErrorWrappedStackTraceElements.length != 0
+                        ? iwlanErrorWrappedStackTraceElements[0].toString()
+                        : null;
+    }
 
-        this.mIwlanErrorWrappedClassnameAndStack =
-                iwlanErrorWrapped.getClass().getCanonicalName()
-                        + iwlanErrorWrappedFirstLineStrackTrace;
+    public String getIwlanErrorWrappedClassname() {
+        return mIwlanErrorWrappedClassname;
     }
 
-    public String getIwlanErrorWrappedClassnameAndStack() {
-        return mIwlanErrorWrappedClassnameAndStack;
+    public String getIwlanErrorWrappedStackFirstFrame() {
+        return mIwlanErrorWrappedStackFirstFrame;
     }
 
     public void sendMetricsData() {
@@ -162,7 +166,8 @@ public class MetricsAtom {
                     mTunnelState,
                     mHandoverFailureMode,
                     mRetryDurationMillis,
-                    mIwlanErrorWrappedClassnameAndStack);
+                    mIwlanErrorWrappedClassname,
+                    mIwlanErrorWrappedStackFirstFrame);
             return;
         } else if (mMessageId == IwlanStatsLog.IWLAN_PDN_DISCONNECTED_REASON_REPORTED) {
             IwlanStatsLog.write(
diff --git a/test/com/google/android/iwlan/IwlanDataServiceTest.java b/test/com/google/android/iwlan/IwlanDataServiceTest.java
index 0195d15..ee416d4 100644
--- a/test/com/google/android/iwlan/IwlanDataServiceTest.java
+++ b/test/com/google/android/iwlan/IwlanDataServiceTest.java
@@ -989,10 +989,8 @@ public class IwlanDataServiceTest {
 
         mTestLooper.dispatchAll();
 
-        var expectedClassNameAndStack =
-                mockException.getClass().getCanonicalName()
-                        + "\n"
-                        + firstDeclaringClassName
+        var expectedStackFirstFrame =
+                firstDeclaringClassName
                         + "."
                         + firstMethodName
                         + "("
@@ -1002,7 +1000,10 @@ public class IwlanDataServiceTest {
                         + ")";
 
         assertEquals(
-                expectedClassNameAndStack, metricsAtom.getIwlanErrorWrappedClassnameAndStack());
+                mockException.getClass().getCanonicalName(),
+                metricsAtom.getIwlanErrorWrappedClassname());
+
+        assertEquals(expectedStackFirstFrame, metricsAtom.getIwlanErrorWrappedStackFirstFrame());
     }
 
     @Test
@@ -1043,7 +1044,8 @@ public class IwlanDataServiceTest {
 
         mTestLooper.dispatchAll();
 
-        assertEquals(null, metricsAtom.getIwlanErrorWrappedClassnameAndStack());
+        assertEquals(null, metricsAtom.getIwlanErrorWrappedClassname());
+        assertEquals(null, metricsAtom.getIwlanErrorWrappedStackFirstFrame());
     }
 
     private void mockTunnelSetupFail(DataProfile dp) {