refactor: delete unused endpoint code

embrace-io · Aug 19, 2024 · e808d71 · e808d71
1 parent b6c2b4a
commit e808d71
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 297 deletions.
diff --git a/...core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/ApiRequestMapper.kt b/...core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/ApiRequestMapper.kt
@@ -5,7 +5,6 @@ import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.EventType
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.internal.payload.SessionPayload
 import io.embrace.android.embracesdk.network.http.HttpMethod
 
@@ -40,19 +39,6 @@ public class ApiRequestMapper(
         httpMethod = HttpMethod.GET,
     )
 
-    public fun logRequest(
-        eventMessage: EventMessage
-    ): ApiRequest {
-        checkNotNull(eventMessage.event) { "event must be set" }
-        val event = eventMessage.event
-        val type = checkNotNull(event.type) { "event type must be set" }
-        checkNotNull(event.eventId) { "event ID must be set" }
-        val url = Endpoint.LOGGING.asEmbraceUrl()
-        val abbreviation = type.abbreviation
-        val logIdentifier = abbreviation + ":" + event.messageId
-        return requestBuilder(url).copy(logId = logIdentifier)
-    }
-
     @Suppress("UNUSED_PARAMETER")
     public fun logsEnvelopeRequest(envelope: Envelope<LogPayload>): ApiRequest {
         val url = Endpoint.LOGS.asEmbraceUrl()
@@ -85,13 +71,6 @@ public class ApiRequestMapper(
         return requestBuilder(url).copy(eventId = eventIdentifier)
     }
 
-    public fun networkEventRequest(networkEvent: NetworkEvent): ApiRequest {
-        val url = Endpoint.NETWORK.asEmbraceUrl()
-        val abbreviation = EventType.NETWORK_LOG.abbreviation
-        val networkIdentifier = "$abbreviation:${networkEvent.eventId}"
-        return requestBuilder(url).copy(logId = networkIdentifier)
-    }
-
     /**
      * Crashes are sent with a header containing the list of active stories.
      *

diff --git a/...droid-core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/ApiService.kt b/...droid-core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/ApiService.kt
@@ -6,19 +6,10 @@ import io.embrace.android.embracesdk.internal.injection.SerializationAction
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import java.util.concurrent.Future
 
 public interface ApiService : RemoteConfigSource, NetworkConnectivityListener {
 
-    /**
-     * Sends a log message to the API.
-     *
-     * @param eventMessage the event message containing the log entry
-     * @return a future containing the response body from the server
-     */
-    public fun sendLog(eventMessage: EventMessage)
-
     /**
      * Sends a list of OTel Logs to the API.
      *
@@ -33,13 +24,6 @@ public interface ApiService : RemoteConfigSource, NetworkConnectivityListener {
      */
     public fun saveLogEnvelope(logEnvelope: Envelope<LogPayload>)
 
-    /**
-     * Sends a network event to the API.
-     *
-     * @param networkEvent the event containing the network call information
-     */
-    public fun sendNetworkCall(networkEvent: NetworkEvent)
-
     /**
      * Sends an event to the API.
      *

diff --git a/...ore/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/EmbraceApiService.kt b/...ore/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/EmbraceApiService.kt
@@ -13,7 +13,6 @@ import io.embrace.android.embracesdk.internal.logging.EmbLogger
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.internal.serialization.PlatformSerializer
 import io.embrace.android.embracesdk.internal.worker.BackgroundWorker
 import io.embrace.android.embracesdk.internal.worker.TaskPriority
@@ -114,10 +113,6 @@ public class EmbraceApiService(
         lastNetworkStatus = status
     }
 
-    override fun sendLog(eventMessage: EventMessage) {
-        post(eventMessage, mapper::logRequest)
-    }
-
     override fun sendLogEnvelope(logEnvelope: Envelope<LogPayload>) {
         val parameterizedType = TypeUtils.parameterizedType(Envelope::class, LogPayload::class)
         post(logEnvelope, mapper::logsEnvelopeRequest, parameterizedType)
@@ -134,10 +129,6 @@ public class EmbraceApiService(
         pendingApiCallsSender.savePendingApiCall(request, action, sync = true)
     }
 
-    override fun sendNetworkCall(networkEvent: NetworkEvent) {
-        post(networkEvent, mapper::networkEventRequest)
-    }
-
     override fun sendEvent(eventMessage: EventMessage) {
         post(eventMessage, mapper::eventMessageRequest)
     }

diff --git a/...droid-core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/EmbraceUrl.kt b/...droid-core/src/main/kotlin/io/embrace/android/embracesdk/internal/comms/api/EmbraceUrl.kt
@@ -17,9 +17,7 @@ internal class EmbraceUrl(val url: URL) {
     fun endpoint(): Endpoint {
         return when (url.path.substringAfterLast("/")) {
             Endpoint.EVENTS.path -> Endpoint.EVENTS
-            Endpoint.LOGGING.path -> Endpoint.LOGGING
             Endpoint.LOGS.path -> Endpoint.LOGS
-            Endpoint.NETWORK.path -> Endpoint.NETWORK
             Endpoint.SESSIONS.path -> Endpoint.SESSIONS
             Endpoint.SESSIONS_V2.path -> Endpoint.SESSIONS_V2
             else -> Endpoint.UNKNOWN

diff --git a/.../src/main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/DeliveryService.kt b/.../src/main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/DeliveryService.kt
@@ -4,7 +4,6 @@ import io.embrace.android.embracesdk.internal.ndk.NativeCrashService
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.internal.payload.SessionPayload
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
 import io.embrace.android.embracesdk.internal.session.orchestrator.SessionSnapshotType
@@ -16,10 +15,8 @@ public interface DeliveryService {
         nativeCrashServiceProvider: Provider<NativeCrashService?>,
         sessionIdTracker: SessionIdTracker
     )
-    public fun sendLog(eventMessage: EventMessage)
     public fun sendLogs(logEnvelope: Envelope<LogPayload>)
     public fun saveLogs(logEnvelope: Envelope<LogPayload>)
-    public fun sendNetworkCall(networkEvent: NetworkEvent)
     public fun sendCrash(crash: EventMessage, processTerminating: Boolean)
     public fun sendMoment(eventMessage: EventMessage)
 }
diff --git a/...in/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/EmbraceDeliveryService.kt b/...in/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/EmbraceDeliveryService.kt
@@ -13,7 +13,6 @@ import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.LogPayload
 import io.embrace.android.embracesdk.internal.payload.NativeCrashData
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.internal.payload.SessionPayload
 import io.embrace.android.embracesdk.internal.payload.getSessionId
 import io.embrace.android.embracesdk.internal.payload.getSessionSpan
@@ -81,10 +80,6 @@ public class EmbraceDeliveryService(
         }
     }
 
-    override fun sendLog(eventMessage: EventMessage) {
-        apiService.sendLog(eventMessage)
-    }
-
     override fun sendLogs(logEnvelope: Envelope<LogPayload>) {
         apiService.sendLogEnvelope(logEnvelope)
     }
@@ -93,10 +88,6 @@ public class EmbraceDeliveryService(
         apiService.saveLogEnvelope(logEnvelope)
     }
 
-    override fun sendNetworkCall(networkEvent: NetworkEvent) {
-        apiService.sendNetworkCall(networkEvent)
-    }
-
     override fun sendCrash(crash: EventMessage, processTerminating: Boolean) {
         runCatching {
             cacheManager.saveCrash(crash)

diff --git a/.../main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/NoopDeliveryService.kt b/.../main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/NoopDeliveryService.kt
@@ -4,7 +4,6 @@ import io.embrace.android.embracesdk.internal.ndk.NativeCrashService
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.internal.payload.SessionPayload
 import io.embrace.android.embracesdk.internal.session.id.SessionIdTracker
 import io.embrace.android.embracesdk.internal.session.orchestrator.SessionSnapshotType
@@ -21,18 +20,12 @@ public class NoopDeliveryService : DeliveryService {
     ) {
     }
 
-    override fun sendLog(eventMessage: EventMessage) {
-    }
-
     override fun sendLogs(logEnvelope: Envelope<LogPayload>) {
     }
 
     override fun saveLogs(logEnvelope: Envelope<LogPayload>) {
     }
 
-    override fun sendNetworkCall(networkEvent: NetworkEvent) {
-    }
-
     override fun sendCrash(crash: EventMessage, processTerminating: Boolean) {
     }
 

diff --git a/.../main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/PendingApiCallQueue.kt b/.../main/kotlin/io/embrace/android/embracesdk/internal/comms/delivery/PendingApiCallQueue.kt
@@ -87,9 +87,7 @@ public class PendingApiCallQueue(
     private fun Endpoint.getMaxPendingApiCalls(): Int {
         return when (this) {
             Endpoint.EVENTS -> 100
-            Endpoint.LOGGING -> 100
             Endpoint.LOGS -> 10
-            Endpoint.NETWORK -> 50
             Endpoint.SESSIONS -> 100
             Endpoint.SESSIONS_V2 -> 100
             Endpoint.UNKNOWN -> 50

diff --git a/...re/src/test/java/io/embrace/android/embracesdk/internal/comms/api/ApiRequestMapperTest.kt b/...re/src/test/java/io/embrace/android/embracesdk/internal/comms/api/ApiRequestMapperTest.kt
@@ -1,15 +1,12 @@
 package io.embrace.android.embracesdk.internal.comms.api
 
-import io.embrace.android.embracesdk.internal.payload.AppInfo
 import io.embrace.android.embracesdk.internal.payload.Attribute
 import io.embrace.android.embracesdk.internal.payload.Envelope
 import io.embrace.android.embracesdk.internal.payload.Event
 import io.embrace.android.embracesdk.internal.payload.EventMessage
 import io.embrace.android.embracesdk.internal.payload.EventType
 import io.embrace.android.embracesdk.internal.payload.Log
 import io.embrace.android.embracesdk.internal.payload.LogPayload
-import io.embrace.android.embracesdk.internal.payload.NetworkCapturedCall
-import io.embrace.android.embracesdk.internal.payload.NetworkEvent
 import io.embrace.android.embracesdk.network.http.HttpMethod
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
@@ -46,21 +43,6 @@ internal class ApiRequestMapperTest {
         }
     }
 
-    @Test
-    fun testLogRequest() {
-        val request = mapper.logRequest(
-            EventMessage(
-                Event(
-                    type = EventType.INFO_LOG,
-                    eventId = "eventId",
-                    messageId = "messageId"
-                )
-            )
-        )
-        request.assertCoreFieldsPopulated("/v1/log/logging")
-        assertEquals("il:messageId", request.logId)
-    }
-
     @Test
     fun testLogsRequest() {
         val request = mapper.logsEnvelopeRequest(
@@ -118,24 +100,6 @@ internal class ApiRequestMapperTest {
         assertEquals("c:activeEventId1,activeEventId2", request.eventId)
     }
 
-    @Test
-    fun testNetworkEventRequest() {
-        val request = mapper.networkEventRequest(
-            NetworkEvent(
-                "eventId",
-                AppInfo(),
-                deviceId.value,
-                "eventId",
-                NetworkCapturedCall(),
-                "timestamp",
-                null,
-                null
-            )
-        )
-        request.assertCoreFieldsPopulated("/v1/log/network")
-        assertEquals("n:eventId", request.logId)
-    }
-
     private fun ApiRequest.assertCoreFieldsPopulated(endpoint: String) {
         assertEquals("$BASE_URL$endpoint", url.url)
         assertEquals(HttpMethod.POST, httpMethod)