[Integration Branch] simplify bytecode instrumentation implementation

embrace-android-core/lint-baseline.xml

@@ -12,17 +12,6 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="EmbracePublicApiPackageRule"
-        message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
-        errorLine1="public final class WebViewChromeClientSwazzledHooks {"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java"
-            line="13"
-            column="20"/>
-    </issue>
-
     <issue
         id="UnclosedTrace"
         message="The `beginSection()` call is not always closed with a matching `endSection()` because the code in between may return early"

embrace-android-fcm/api/embrace-android-fcm.api

@@ -1,4 +1,4 @@
-public final class io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks {
-	public static fun _onMessageReceived (Lcom/google/firebase/messaging/RemoteMessage;)V
+public final class io/embrace/android/embracesdk/internal/instrumentation/bytecode/FcmBytecodeEntrypoint {
+	public static final fun onMessageReceived (Lcom/google/firebase/messaging/RemoteMessage;)V
 }
 

embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/internal/instrumentation/bytecode/FcmBytecodeEntrypoint.kt

@@ -0,0 +1,34 @@
+package io.embrace.android.embracesdk.internal.instrumentation.bytecode
+
+import androidx.annotation.Keep
+import com.google.firebase.messaging.RemoteMessage
+import io.embrace.android.embracesdk.Embrace
+import io.embrace.android.embracesdk.internal.EmbraceInternalApi
+
+@Keep
+object FcmBytecodeEntrypoint {
+
+    @JvmStatic
+    @Keep
+    fun onMessageReceived(message: RemoteMessage) {
+        if (!Embrace.getInstance().isStarted) {
+            return
+        }
+        try {
+            val notification: RemoteMessage.Notification? = message.notification
+
+            Embrace.getInstance().logPushNotification(
+                notification?.title,
+                notification?.body,
+                message.from,
+                message.messageId,
+                notification?.notificationPriority,
+                message.priority,
+                notification != null,
+                message.data.isNotEmpty()
+            )
+        } catch (e: Exception) {
+            EmbraceInternalApi.getInstance().internalInterface.logInternalError(e)
+        }
+    }
+}

embrace-android-features/src/main/kotlin/io/embrace/android/embracesdk/internal/capture/crumbs/PushNotificationCaptureService.kt

@@ -104,7 +104,7 @@ class PushNotificationCaptureService(
         // whenever we come through this flow of push notification, we know certainly that it has
         // notification block. This is because if the push notification is data only
         // (w/o notification block), then it wouldn't come through this flow, but through
-        // FirebaseSwazzledHooks._onMessageReceived instead. Now it is a matter of determining if
+        // FcmBytecodeEntrypoint.onMessageReceived instead. Now it is a matter of determining if
         // it's a notification only or notification + data.
         return if (hasData) {
             PushNotificationBreadcrumb.NotificationType.NOTIFICATION_AND_DATA

embrace-android-okhttp3/build.gradle.kts

@@ -20,4 +20,5 @@ dependencies {
     testImplementation(project(":embrace-android-infra"))
     testImplementation(project(":embrace-android-sdk"))
     testImplementation(project(":embrace-internal-api"))
+    implementation(libs.lifecycle.runtime)
 }

embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/internal/instrumentation/bytecode/OkHttpBytecodeEntrypoint.kt

@@ -0,0 +1,65 @@
+package io.embrace.android.embracesdk.internal.instrumentation.bytecode
+
+import androidx.annotation.Keep
+import io.embrace.android.embracesdk.Embrace
+import io.embrace.android.embracesdk.internal.EmbraceInternalApi
+import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3ApplicationInterceptor
+import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3NetworkInterceptor
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+
+/**
+ * @hide
+ */
+@Keep
+object OkHttpBytecodeEntrypoint {
+
+    /**
+     * As there was a way to clear the injected interceptors during the OkHttpClient
+     * initialization using the builder, we are hooking the build method as well, instead of
+     * just the Builder constructor.
+     *
+     * Once the build method is called, OkHTTP mushes everything and returns the OkHttpClient
+     * instance, where the developer has no way to alter any of the interceptors during or
+     * after this point, without having to rebuild the client.
+     */
+    @Keep
+    @JvmStatic
+    fun build(thiz: OkHttpClient.Builder) {
+        addEmbraceInterceptors(thiz)
+    }
+
+    /**
+     * Adds embrace interceptors if they don't exist already to the OkHTTPClient provided.
+     *
+     * @param thiz the OkHttpClient builder in matter.
+     */
+    private fun addEmbraceInterceptors(thiz: OkHttpClient.Builder) {
+        val internalApi = EmbraceInternalApi.getInstance()
+        try {
+            val embrace = Embrace.getInstance()
+            addInterceptor(
+                thiz.interceptors(),
+                EmbraceOkHttp3ApplicationInterceptor(embrace, internalApi)
+            )
+            addInterceptor(
+                thiz.networkInterceptors(),
+                EmbraceOkHttp3NetworkInterceptor(embrace, internalApi)
+            )
+        } catch (error: Throwable) {
+            internalApi.internalInterface.logInternalError(error)
+        }
+    }
+
+    /**
+     * Adds the interceptor to the interceptors list if it doesn't exist already.
+     */
+    private fun addInterceptor(
+        interceptors: MutableList<Interceptor>?,
+        interceptor: Interceptor,
+    ) {
+        if (interceptors != null && !interceptors.any { interceptor.javaClass.isInstance(it) }) {
+            interceptors.add(0, interceptor)
+        }
+    }
+}