From 7818abb58b0813ca04805f34aad1926339b746b1 Mon Sep 17 00:00:00 2001
From: jhnstn <jhnstn@pm.me>
Date: Wed, 6 Mar 2024 11:14:27 -0500
Subject: [PATCH 1/8] Add Js exception data class

---
 .../tracks/crashlogging/JsException.kt        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
new file mode 100644
index 00000000..947beb95
--- /dev/null
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
@@ -0,0 +1,23 @@
+package com.automattic.android.tracks.crashlogging
+
+
+data class JsException(
+    val type: String,
+    val message: String,
+    var stackTrace: List<JsExceptionStackTraceElement>,
+    val context: Map<String, Any>,
+    val tags: Map<String, String>,
+    val isHandled: Boolean,
+    val handledBy: String,
+)
+
+data class JsExceptionStackTraceElement (
+    val fileName: String,
+    val lineNumber: Int,
+    val colNumber: Int,
+    val function: String,
+)
+
+interface JsExceptionCallback {
+    fun onReportSent(sent:Boolean)
+}

From fe59b92981312d3e2aef96663fb68e278e1e5676 Mon Sep 17 00:00:00 2001
From: jhnstn <jhnstn@pm.me>
Date: Wed, 6 Mar 2024 11:15:33 -0500
Subject: [PATCH 2/8] Add send JS report function

---
 .../tracks/crashlogging/CrashLogging.kt       |  6 +++-
 .../internal/SentryCrashLogging.kt            | 34 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/CrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/CrashLogging.kt
index d7b09c19..66a14f4a 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/CrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/CrashLogging.kt
@@ -1,7 +1,6 @@
 package com.automattic.android.tracks.crashlogging
 
 interface CrashLogging {
-
     /**
      * Records a breadcrumb during the app lifecycle but doesn't report an event. This basically
      * adds more context for the next reports created and sent by [sendReport] or an unhandled
@@ -40,4 +39,9 @@ interface CrashLogging {
         tags: Map<String, String> = emptyMap(),
         message: String? = null
     )
+
+    fun sendJavaScriptReport(
+        jsException: JsException,
+        callback: JsExceptionCallback
+    )
 }
diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
index d30870de..e7e10d3c 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
@@ -5,6 +5,8 @@ import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.automattic.android.tracks.crashlogging.CrashLoggingDataProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingUser
 import com.automattic.android.tracks.crashlogging.ExtraKnownKey
+import com.automattic.android.tracks.crashlogging.JsException
+import com.automattic.android.tracks.crashlogging.JsExceptionCallback
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Disabled
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Enabled
 import com.automattic.android.tracks.crashlogging.eventLevel
@@ -24,7 +26,6 @@ internal class SentryCrashLogging constructor(
     private val sentryWrapper: SentryErrorTrackerWrapper,
     applicationScope: CoroutineScope
 ) : CrashLogging {
-
     init {
         sentryWrapper.initialize(application) { options ->
 
@@ -134,6 +135,37 @@ internal class SentryCrashLogging constructor(
         sentryWrapper.captureEvent(event)
     }
 
+    override fun sendJavaScriptReport(
+        jsException: JsException,
+        callback: JsExceptionCallback
+    ) {
+        val exception = Throwable(jsException.message)
+
+        // @TODO we need to figure out how to send a stack trace element with the column number
+        exception.stackTrace = jsException.stackTrace.map {
+            StackTraceElement(
+                it.fileName, // We probably don't have a class name so we use the file name
+                it.function,
+                it.fileName,
+                it.lineNumber
+            )
+        }.toTypedArray()
+
+        val event = SentryEvent(exception).apply {
+            this.message = Message().apply { this.message = message }
+            this.level =  SentryLevel.FATAL
+            this.platform = "javascript"
+            this.appendTags(jsException.tags)
+        }
+
+        // @TODO figure out mechanism to add isHandled and handledBy
+
+        // @TODO add context i.e. context["react_native_context"] = jsException.context;
+
+        sentryWrapper.captureEvent(event)
+        callback.onReportSent(true)
+    }
+
     private fun SentryEvent.appendTags(tags: Map<String, String>) {
         for ((key, value) in tags) {
             this.setTag(key, value)

From 447aba350dc6eb9b2022f9e53febf44f7a91cb2c Mon Sep 17 00:00:00 2001
From: jhnstn <jhnstn@pm.me>
Date: Wed, 6 Mar 2024 15:23:45 -0500
Subject: [PATCH 3/8] Add send JS report function to demo app

---
 .../example/sampletracksapp/MainActivity.kt   | 30 ++++++++++++++++++-
 .../src/main/res/layout/activity_main.xml     |  6 ++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt b/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
index 6fb3bd16..7bfc9190 100644
--- a/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
+++ b/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.example.sampletracksapp
 
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import com.automattic.android.tracks.crashlogging.CrashLoggingDataProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingOkHttpInterceptorProvider
@@ -8,6 +9,9 @@ import com.automattic.android.tracks.crashlogging.CrashLoggingProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingUser
 import com.automattic.android.tracks.crashlogging.EventLevel
 import com.automattic.android.tracks.crashlogging.ExtraKnownKey
+import com.automattic.android.tracks.crashlogging.JsException
+import com.automattic.android.tracks.crashlogging.JsExceptionCallback
+import com.automattic.android.tracks.crashlogging.JsExceptionStackTraceElement
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig
 import com.automattic.android.tracks.crashlogging.RequestFormatter
 import com.automattic.android.tracks.crashlogging.performance.PerformanceMonitoringRepositoryProvider
@@ -26,7 +30,6 @@ import java.io.IOException
 import java.util.Locale
 
 class MainActivity : AppCompatActivity() {
-
     val transactionRepository: PerformanceTransactionRepository =
         PerformanceMonitoringRepositoryProvider.createInstance()
 
@@ -89,6 +92,31 @@ class MainActivity : AppCompatActivity() {
                 crashLogging.sendReport(exception = Exception("Exception from Tracks test app"))
             }
 
+            sendReportWithJavaScriptException.setOnClickListener {
+                val callback = object : JsExceptionCallback {
+                    override fun onReportSent(sent: Boolean) {
+                       Log.d("JsExceptionCallback", "onReportSent: $sent")
+                    }
+                }
+                val jsException = JsException(
+                    type = "Error",
+                    message = "JavaScript exception from Tracks test app",
+                    stackTrace = listOf(
+                        JsExceptionStackTraceElement(
+                            fileName = "file.js",
+                            lineNumber = 1,
+                            colNumber = 1,
+                            function = "function"
+                        )
+                    ),
+                    context = mapOf("context" to "value"),
+                    tags = mapOf("tag" to "SomeTag"),
+                    isHandled = true,
+                    handledBy = "SomeHandler"
+                )
+                crashLogging.sendJavaScriptReport(jsException, callback)
+            }
+
             recordBreadcrumbWithMessage.setOnClickListener {
                 crashLogging.recordEvent(
                     message = "Custom breadcrumb",
diff --git a/sampletracksapp/src/main/res/layout/activity_main.xml b/sampletracksapp/src/main/res/layout/activity_main.xml
index d537954d..77c396a0 100644
--- a/sampletracksapp/src/main/res/layout/activity_main.xml
+++ b/sampletracksapp/src/main/res/layout/activity_main.xml
@@ -20,6 +20,12 @@
         android:layout_height="wrap_content"
         android:text="Send report with exception" />
 
+    <Button
+        android:id="@+id/sendReportWithJavaScriptException"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Send report with JS exception" />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"

From 9d80d58f0cab60098cc43c0771aa8f09509f4137 Mon Sep 17 00:00:00 2001
From: jhnstn <jhnstn@pm.me>
Date: Wed, 6 Mar 2024 15:24:38 -0500
Subject: [PATCH 4/8] Update exception to use sentry objects

---
 .../internal/SentryCrashLogging.kt            | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
index e7e10d3c..50c15106 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
@@ -11,11 +11,17 @@ import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Di
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Enabled
 import com.automattic.android.tracks.crashlogging.eventLevel
 import io.sentry.Breadcrumb
+import io.sentry.Scope
+import io.sentry.Sentry
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
 import io.sentry.android.fragment.FragmentLifecycleIntegration
+import io.sentry.protocol.Mechanism
 import io.sentry.protocol.Message
+import io.sentry.protocol.SentryException
+import io.sentry.protocol.SentryStackFrame
+import io.sentry.protocol.SentryStackTrace
 import io.sentry.protocol.User
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -139,29 +145,37 @@ internal class SentryCrashLogging constructor(
         jsException: JsException,
         callback: JsExceptionCallback
     ) {
-        val exception = Throwable(jsException.message)
-
-        // @TODO we need to figure out how to send a stack trace element with the column number
-        exception.stackTrace = jsException.stackTrace.map {
-            StackTraceElement(
-                it.fileName, // We probably don't have a class name so we use the file name
-                it.function,
-                it.fileName,
-                it.lineNumber
-            )
-        }.toTypedArray()
+        val frames = jsException.stackTrace.map {
+           SentryStackFrame().apply {
+                this.filename = it.fileName
+                this.function = it.function
+                this.lineno = it.lineNumber
+                this.colno = it.colNumber
+            }
+        }.toMutableList()
+
+        val sentryException = SentryException().apply {
+            this.type = jsException.type
+            this.value = jsException.message
+            this.module = "javascript"
+            this.stacktrace = SentryStackTrace().apply { this.frames = frames }
+            this.mechanism = Mechanism().apply {
+                this.isHandled = jsException.isHandled
+                this.type = jsException.handledBy
+            }
+        }
 
-        val event = SentryEvent(exception).apply {
+        val event = SentryEvent().apply {
             this.message = Message().apply { this.message = message }
             this.level =  SentryLevel.FATAL
             this.platform = "javascript"
             this.appendTags(jsException.tags)
+            this.exceptions = mutableListOf(sentryException)
         }
 
-        // @TODO figure out mechanism to add isHandled and handledBy
-
-        // @TODO add context i.e. context["react_native_context"] = jsException.context;
-
+        Sentry.configureScope { scope: Scope ->
+            scope.setContexts("react_native_context", jsException.context)
+        }
         sentryWrapper.captureEvent(event)
         callback.onReportSent(true)
     }

From 57e6f1a06093f1cdb690484b9fb1597f7cbc7d57 Mon Sep 17 00:00:00 2001
From: jhnstn <jhnstn@pm.me>
Date: Wed, 6 Mar 2024 15:41:14 -0500
Subject: [PATCH 5/8] lint

---
 .../android/tracks/crashlogging/JsException.kt           | 9 ++++-----
 .../tracks/crashlogging/internal/SentryCrashLogging.kt   | 4 ++--
 .../java/com/example/sampletracksapp/MainActivity.kt     | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
index 947beb95..6f530d0d 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
@@ -1,6 +1,5 @@
 package com.automattic.android.tracks.crashlogging
 
-
 data class JsException(
     val type: String,
     val message: String,
@@ -8,16 +7,16 @@ data class JsException(
     val context: Map<String, Any>,
     val tags: Map<String, String>,
     val isHandled: Boolean,
-    val handledBy: String,
+    val handledBy: String
 )
 
-data class JsExceptionStackTraceElement (
+data class JsExceptionStackTraceElement(
     val fileName: String,
     val lineNumber: Int,
     val colNumber: Int,
-    val function: String,
+    val function: String
 )
 
 interface JsExceptionCallback {
-    fun onReportSent(sent:Boolean)
+    fun onReportSent(sent: Boolean)
 }
diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
index 50c15106..8e8dd1bc 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
@@ -146,7 +146,7 @@ internal class SentryCrashLogging constructor(
         callback: JsExceptionCallback
     ) {
         val frames = jsException.stackTrace.map {
-           SentryStackFrame().apply {
+            SentryStackFrame().apply {
                 this.filename = it.fileName
                 this.function = it.function
                 this.lineno = it.lineNumber
@@ -167,7 +167,7 @@ internal class SentryCrashLogging constructor(
 
         val event = SentryEvent().apply {
             this.message = Message().apply { this.message = message }
-            this.level =  SentryLevel.FATAL
+            this.level = SentryLevel.FATAL
             this.platform = "javascript"
             this.appendTags(jsException.tags)
             this.exceptions = mutableListOf(sentryException)
diff --git a/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt b/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
index 7bfc9190..512d4ea2 100644
--- a/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
+++ b/sampletracksapp/src/main/java/com/example/sampletracksapp/MainActivity.kt
@@ -95,7 +95,7 @@ class MainActivity : AppCompatActivity() {
             sendReportWithJavaScriptException.setOnClickListener {
                 val callback = object : JsExceptionCallback {
                     override fun onReportSent(sent: Boolean) {
-                       Log.d("JsExceptionCallback", "onReportSent: $sent")
+                        Log.d("JsExceptionCallback", "onReportSent: $sent")
                     }
                 }
                 val jsException = JsException(

From c4dd1160cddc127a093e100e46e7d6213531c20e Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Thu, 7 Mar 2024 14:29:14 +0100
Subject: [PATCH 6/8] Mark properties of `JsExceptionStackTraceElement` as
 optional

---
 .../automattic/android/tracks/crashlogging/JsException.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
index 6f530d0d..6c9fc2dc 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/JsException.kt
@@ -11,9 +11,9 @@ data class JsException(
 )
 
 data class JsExceptionStackTraceElement(
-    val fileName: String,
-    val lineNumber: Int,
-    val colNumber: Int,
+    val fileName: String?,
+    val lineNumber: Int?,
+    val colNumber: Int?,
     val function: String
 )
 

From 2fc84a8913b51eb47c200521ca90315734daa32c Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Thu, 7 Mar 2024 16:18:43 +0100
Subject: [PATCH 7/8] Mark JavaScript stack frames as `inApp`

This is needed to make Sentry symbolicate the stack trace.
---
 .../android/tracks/crashlogging/internal/SentryCrashLogging.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
index 8e8dd1bc..1bd0048a 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
@@ -151,6 +151,7 @@ internal class SentryCrashLogging constructor(
                 this.function = it.function
                 this.lineno = it.lineNumber
                 this.colno = it.colNumber
+                this.isInApp = true
             }
         }.toMutableList()
 

From 9313f55c7be90b4e4e229fde3cb8ee9b19b6ed3e Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Thu, 7 Mar 2024 17:40:47 +0100
Subject: [PATCH 8/8] Remove Sentry scope type from `sendJavaScriptReport`

---
 .../android/tracks/crashlogging/internal/SentryCrashLogging.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
index 1bd0048a..17ee8781 100644
--- a/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
+++ b/AutomatticTracks/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
@@ -11,7 +11,6 @@ import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Di
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig.Enabled
 import com.automattic.android.tracks.crashlogging.eventLevel
 import io.sentry.Breadcrumb
-import io.sentry.Scope
 import io.sentry.Sentry
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
@@ -174,7 +173,7 @@ internal class SentryCrashLogging constructor(
             this.exceptions = mutableListOf(sentryException)
         }
 
-        Sentry.configureScope { scope: Scope ->
+        Sentry.configureScope { scope ->
             scope.setContexts("react_native_context", jsException.context)
         }
         sentryWrapper.captureEvent(event)