refactor: remove unnecessary sendEventAndWait function

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/capture/crash/EmbraceCrashService.kt

@@ -135,7 +135,7 @@ internal class EmbraceCrashService(
  // and the request is made on a background executor, but data analysis shows that
  // a surprising % of crashes make it through based on the receive time. Therefore we
  // attempt to send the crash and if it fails, we will send it again on the next launch.
- deliveryService.sendCrash(crashEvent)
+ deliveryService.sendCrash(crashEvent, true)
 
  // End, cache and send the session
  sessionService.handleCrash(crash.crashId)

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/ApiService.kt

@@ -12,8 +12,7 @@ internal interface ApiService {
  fun sendLog(eventMessage: EventMessage)
  fun sendNetworkCall(networkEvent: NetworkEvent)
  fun sendEvent(eventMessage: EventMessage)
- fun sendEventAndWait(eventMessage: EventMessage)
- fun sendCrash(crash: EventMessage)
+ fun sendCrash(crash: EventMessage): Future<*>
  fun sendAEIBlob(blobMessage: BlobMessage)
  fun sendSession(sessionPayload: ByteArray, onFinish: (() -> Unit)?): Future<*>?
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/api/EmbraceApiService.kt

@@ -16,7 +16,6 @@ import io.embrace.android.embracesdk.payload.NetworkEvent
 import java.io.ByteArrayInputStream
 import java.util.concurrent.Future
 import java.util.concurrent.ScheduledExecutorService
-import java.util.concurrent.TimeUnit
 
 internal class EmbraceApiService(
  private val apiClient: ApiClient,
@@ -145,29 +144,13 @@ internal class EmbraceApiService(
  post(eventMessage, mapper::eventMessageRequest)
  }
 
- /**
- * Sends an event to the API and waits for the request to be completed
- *
- * @param eventMessage the event message containing the event
- */
- override fun sendEventAndWait(eventMessage: EventMessage) {
- post(eventMessage, mapper::eventMessageRequest).get()
- }
-
  /**
  * Sends a crash event to the API and reschedules it if the request times out
  *
  * @param crash the event message containing the crash
  */
- override fun sendCrash(crash: EventMessage) {
- try {
- post(crash, mapper::eventMessageRequest) { cacheManager.deleteCrash() }.get(
- CRASH_TIMEOUT,
- TimeUnit.SECONDS
- )
- } catch (e: Exception) {
- logger.logError("The crash report request has timed out.")
- }
+ override fun sendCrash(crash: EventMessage): Future<*> {
+ return post(crash, mapper::eventMessageRequest) { cacheManager.deleteCrash() }
  }
 
  override fun sendSession(sessionPayload: ByteArray, onFinish: (() -> Unit)?): Future<*> {
@@ -230,4 +213,3 @@ internal class EmbraceApiService(
 }
 
 private const val TAG = "EmbraceApiService"
-private const val CRASH_TIMEOUT = 1L // Seconds to wait before timing out when sending a crash

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/delivery/DeliveryService.kt

@@ -16,8 +16,7 @@ internal interface DeliveryService {
  fun sendBackgroundActivities()
  fun sendLog(eventMessage: EventMessage)
  fun sendNetworkCall(networkEvent: NetworkEvent)
- fun sendCrash(crash: EventMessage)
+ fun sendCrash(crash: EventMessage, processTerminating: Boolean)
  fun sendAEIBlob(blobMessage: BlobMessage)
  fun sendMoment(eventMessage: EventMessage)
- fun sendEventAndWait(eventMessage: EventMessage)
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/comms/delivery/EmbraceDeliveryService.kt

@@ -25,8 +25,8 @@ internal class EmbraceDeliveryService(
 
  companion object {
  private const val TAG = "EmbraceDeliveryService"
-
  private const val SEND_SESSION_TIMEOUT = 1L
+ private const val CRASH_TIMEOUT = 1L // Seconds to wait before timing out when sending a crash
  }
 
  private val backgroundActivities by lazy { mutableSetOf<String>() }
@@ -135,9 +135,15 @@ internal class EmbraceDeliveryService(
  apiService.sendNetworkCall(networkEvent)
  }
 
- override fun sendCrash(crash: EventMessage) {
- cacheManager.saveCrash(crash)
- apiService.sendCrash(crash)
+ override fun sendCrash(crash: EventMessage, processTerminating: Boolean) {
+ runCatching {
+ cacheManager.saveCrash(crash)
+ val future = apiService.sendCrash(crash)
+
+ if (processTerminating) {
+ future.get(CRASH_TIMEOUT, TimeUnit.SECONDS)
+ }
+ }
  }
 
  override fun sendAEIBlob(blobMessage: BlobMessage) {
@@ -234,8 +240,4 @@ internal class EmbraceDeliveryService(
  apiService.sendEvent(eventMessage)
  }
  }
-
- override fun sendEventAndWait(eventMessage: EventMessage) {
- apiService.sendEventAndWait(eventMessage)
- }
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ndk/EmbraceNdkService.kt

@@ -563,7 +563,7 @@ internal class EmbraceNdkService(
  "EmbraceNDKService",
  "About to send EventMessage from native crash."
  )
- deliveryService.sendEventAndWait(nativeCrashMessageEvent)
+ deliveryService.sendCrash(nativeCrashMessageEvent, false)
  logger.logDeveloper(
  "EmbraceNDKService",
  "Finished send attempt for EventMessage from native crash."

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceCrashServiceTest.kt

@@ -123,7 +123,7 @@ internal class EmbraceCrashServiceTest {
  verify { CrashFactory.ofThrowable(testException, localJsException, any()) }
  verify { anrService.forceAnrTrackingStopOnCrash() }
 
- verify { deliveryService.sendCrash(any()) }
+ verify { deliveryService.sendCrash(any(), true) }
  verify { sessionService.handleCrash(crash.crashId) }
 
  /*
@@ -132,7 +132,7 @@ internal class EmbraceCrashServiceTest {
  */
  embraceCrashService.handleCrash(Thread.currentThread(), testException)
  verify(exactly = 1) { anrService.forceAnrTrackingStopOnCrash() }
- verify(exactly = 1) { deliveryService.sendCrash(any()) }
+ verify(exactly = 1) { deliveryService.sendCrash(any(), true) }
  verify(exactly = 1) { sessionService.handleCrash(crash.crashId) }
  }
 
@@ -146,7 +146,7 @@ internal class EmbraceCrashServiceTest {
 
  verify { CrashFactory.ofThrowable(testException, localJsException, "Unity123") }
  verify { anrService.forceAnrTrackingStopOnCrash() }
- verify { deliveryService.sendCrash(any()) }
+ verify { deliveryService.sendCrash(any(), true) }
  verify { sessionService.handleCrash(crash.crashId) }
  }
 

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/FakeDeliveryService.kt

@@ -69,11 +69,7 @@ internal class FakeDeliveryService : DeliveryService {
  lastSentNetworkCall = networkEvent
  }
 
- override fun sendEventAndWait(eventMessage: EventMessage) {
- lastSentEvent = eventMessage
- }
-
- override fun sendCrash(crash: EventMessage) {
+ override fun sendCrash(crash: EventMessage, processTerminating: Boolean) {
  lastSavedCrash = crash
  lastSentCrash = crash
  }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/comms/delivery/EmbraceDeliveryServiceTest.kt

@@ -279,7 +279,7 @@ internal class EmbraceDeliveryServiceTest {
  fun testSaveCrash() {
  initializeDeliveryService()
  val obj = EventMessage(Event(eventId = "abc", type = EmbraceEvent.Type.CRASH))
- deliveryService.sendCrash(obj)
+ deliveryService.sendCrash(obj, true)
  verify(exactly = 1) { mockDeliveryCacheManager.saveCrash(obj) }
  verify(exactly = 1) { apiService.sendCrash(obj) }
  }

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeApiService.kt

@@ -30,11 +30,7 @@ internal class FakeApiService : ApiService {
  TODO("Not yet implemented")
  }
 
- override fun sendEventAndWait(eventMessage: EventMessage) {
- TODO("Not yet implemented")
- }
-
- override fun sendCrash(crash: EventMessage) {
+ override fun sendCrash(crash: EventMessage): Future<*> {
  TODO("Not yet implemented")
  }