refactor: remove apk tools config

embrace-io · Jul 29, 2024 · d0d514c · d0d514c
1 parent a7d76f3
commit d0d514c
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 130 deletions.
diff --git a/...rationTest/kotlin/io/embrace/android/embracesdk/testcases/EmbraceInternalInterfaceTest.kt b/...rationTest/kotlin/io/embrace/android/embracesdk/testcases/EmbraceInternalInterfaceTest.kt
@@ -4,26 +4,24 @@ package io.embrace.android.embracesdk.testcases
 
 import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.embrace.android.embracesdk.internal.EventType
 import io.embrace.android.embracesdk.IntegrationTestRule
 import io.embrace.android.embracesdk.LogType
-import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.findEventOfType
 import io.embrace.android.embracesdk.findSessionSpan
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
+import io.embrace.android.embracesdk.internal.EventType
+import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.payload.Span
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 import io.embrace.android.embracesdk.network.http.HttpMethod
 import io.embrace.android.embracesdk.recordSession
 import io.embrace.android.embracesdk.spans.ErrorCode
-import java.net.SocketException
 import io.opentelemetry.semconv.HttpAttributes
+import java.net.SocketException
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -42,11 +40,6 @@ internal class EmbraceInternalInterfaceTest {
         IntegrationTestRule.Harness(startImmediately = false)
     }
 
-    @Before
-    fun setup() {
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = false
-    }
-
     @Test
     fun `no NPEs when SDK not started`() {
         assertFalse(testRule.embrace.isStarted)
@@ -230,11 +223,10 @@ internal class EmbraceInternalInterfaceTest {
 
     @Test
     fun `test isInternalNetworkCaptureDisabled`() {
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = true
         with(testRule) {
             assertFalse(embrace.internalInterface.isInternalNetworkCaptureDisabled())
             startSdk(context = harness.overriddenCoreModule.context)
-            assertTrue(embrace.internalInterface.isInternalNetworkCaptureDisabled())
+            assertFalse(embrace.internalInterface.isInternalNetworkCaptureDisabled())
         }
     }
 

diff --git a/...rationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt b/...rationTest/kotlin/io/embrace/android/embracesdk/testcases/FlutterInternalInterfaceTest.kt
@@ -10,16 +10,14 @@ import io.embrace.android.embracesdk.fakes.FakeClock
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
 import io.embrace.android.embracesdk.fakes.injection.FakeWorkerThreadModule
 import io.embrace.android.embracesdk.getLastSentLog
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.payload.AppFramework
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
-import io.embrace.android.embracesdk.recordSession
 import io.embrace.android.embracesdk.internal.worker.WorkerName
+import io.embrace.android.embracesdk.recordSession
 import io.opentelemetry.api.logs.Severity
 import io.opentelemetry.semconv.ExceptionAttributes
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -49,11 +47,6 @@ internal class FlutterInternalInterfaceTest {
         )
     }
 
-    @Before
-    fun setup() {
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = false
-    }
-
     @Test
     fun `flutter without values should return defaults`() {
         with(testRule) {

diff --git a/...d-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/PublicApiTest.kt b/...d-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/PublicApiTest.kt
@@ -6,7 +6,6 @@ import android.os.Build.VERSION_CODES.TIRAMISU
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.embrace.android.embracesdk.Embrace.AppFramework
 import io.embrace.android.embracesdk.IntegrationTestRule
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.IdGeneratorTest.Companion.validPattern
 import io.embrace.android.embracesdk.recordSession
 import org.junit.Assert.assertEquals
@@ -15,7 +14,6 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -33,11 +31,6 @@ internal class PublicApiTest {
         IntegrationTestRule.Harness(startImmediately = false)
     }
 
-    @Before
-    fun before() {
-        ApkToolsConfig.IS_SDK_DISABLED = false
-    }
-
     @Test
     fun `SDK can start`() {
         with(testRule) {
@@ -59,15 +52,6 @@ internal class PublicApiTest {
         }
     }
 
-    @Test
-    fun `SDK disabled via the binary cannot start`() {
-        with(testRule) {
-            ApkToolsConfig.IS_SDK_DISABLED = true
-            startSdk(context = harness.overriddenCoreModule.context)
-            assertFalse(embrace.isStarted)
-        }
-    }
-
     @Test
     fun `SDK disabled via config cannot start`() {
         with(testRule) {

diff --git a/...onTest/kotlin/io/embrace/android/embracesdk/testcases/ReactNativeInternalInterfaceTest.kt b/...onTest/kotlin/io/embrace/android/embracesdk/testcases/ReactNativeInternalInterfaceTest.kt
@@ -4,18 +4,16 @@ import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.embrace.android.embracesdk.Embrace
 import io.embrace.android.embracesdk.IntegrationTestRule
-import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.findSpanSnapshotsOfType
 import io.embrace.android.embracesdk.findSpansByName
 import io.embrace.android.embracesdk.findSpansOfType
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
+import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
 import io.embrace.android.embracesdk.internal.payload.AppFramework
 import io.embrace.android.embracesdk.internal.spans.findAttributeValue
 import io.embrace.android.embracesdk.recordSession
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -35,11 +33,6 @@ internal class ReactNativeInternalInterfaceTest {
         IntegrationTestRule.Harness(appFramework = Embrace.AppFramework.REACT_NATIVE)
     }
 
-    @Before
-    fun setup() {
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = false
-    }
-
     @Test
     fun `react native without values should return defaults`() {
         with(testRule) {

diff --git a/...egrationTest/kotlin/io/embrace/android/embracesdk/testcases/UnityInternalInterfaceTest.kt b/...egrationTest/kotlin/io/embrace/android/embracesdk/testcases/UnityInternalInterfaceTest.kt
@@ -4,12 +4,10 @@ import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.embrace.android.embracesdk.Embrace
 import io.embrace.android.embracesdk.IntegrationTestRule
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.payload.AppFramework
 import io.embrace.android.embracesdk.recordSession
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,11 +27,6 @@ internal class UnityInternalInterfaceTest {
         IntegrationTestRule.Harness(appFramework = Embrace.AppFramework.UNITY)
     }
 
-    @Before
-    fun setup() {
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = false
-    }
-
     @Test
     fun `unity without values should return defaults`() {
         with(testRule) {

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.kt
@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.internal.EventType
 import io.embrace.android.embracesdk.internal.Systrace.endSynchronous
@@ -167,12 +166,6 @@ internal class EmbraceImpl @JvmOverloads constructor(
             return
         }
 
-        if (ApkToolsConfig.IS_SDK_DISABLED) {
-            logger.logInfo("SDK disabled through ApkToolsConfig", null)
-            stop()
-            return
-        }
-
         val startTimeMs = sdkClock.now()
 
         val appFramework = fromFramework(framework)

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ApkToolsConfig.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ApkToolsConfig.kt
diff --git a/.../java/io/embrace/android/embracesdk/internal/api/delegate/EmbraceInternalInterfaceImpl.kt b/.../java/io/embrace/android/embracesdk/internal/api/delegate/EmbraceInternalInterfaceImpl.kt
@@ -7,7 +7,6 @@ import io.embrace.android.embracesdk.EmbraceImpl
 import io.embrace.android.embracesdk.LogExceptionType
 import io.embrace.android.embracesdk.LogType
 import io.embrace.android.embracesdk.Severity
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.internal.EventType
 import io.embrace.android.embracesdk.internal.InternalTracingApi
@@ -173,7 +172,7 @@ internal class EmbraceInternalInterfaceImpl(
 
     override fun getSdkCurrentTime(): Long = initModule.clock.now()
 
-    override fun isInternalNetworkCaptureDisabled(): Boolean = ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED
+    override fun isInternalNetworkCaptureDisabled(): Boolean = false
 
     override fun isAnrCaptureEnabled(): Boolean = configService.anrBehavior.isAnrCaptureEnabled()
 

diff --git a/...src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt b/...src/main/java/io/embrace/android/embracesdk/internal/capture/crash/CrashDataSourceImpl.kt
@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.internal.capture.crash
 
 import io.embrace.android.embracesdk.Severity
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.anr.AnrService
 import io.embrace.android.embracesdk.internal.arch.datasource.LogDataSourceImpl
 import io.embrace.android.embracesdk.internal.arch.destination.LogWriter
@@ -56,9 +55,7 @@ internal class CrashDataSourceImpl(
     private var jsException: JsException? = null
 
     init {
-        if (configService.autoDataCaptureBehavior.isUncaughtExceptionHandlerEnabled() &&
-            !ApkToolsConfig.IS_EXCEPTION_CAPTURE_DISABLED
-        ) {
+        if (configService.autoDataCaptureBehavior.isUncaughtExceptionHandlerEnabled()) {
             registerExceptionHandler()
         }
     }

diff --git a/...roid-sdk/src/main/java/io/embrace/android/embracesdk/internal/config/LocalConfigParser.kt b/...roid-sdk/src/main/java/io/embrace/android/embracesdk/internal/config/LocalConfigParser.kt
@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk.internal.config
 import android.content.res.Resources.NotFoundException
 import android.util.Base64
 import io.embrace.android.embracesdk.internal.AndroidResourcesService
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.config.local.LocalConfig
 import io.embrace.android.embracesdk.internal.config.local.SdkLocalConfig
 import io.embrace.android.embracesdk.internal.logging.EmbLogger
@@ -59,7 +58,7 @@ internal object LocalConfigParser {
                 )
 
                 else -> NDK_ENABLED_DEFAULT
-            } && !ApkToolsConfig.IS_NDK_DISABLED
+            }
             val sdkConfigJsonId =
                 resources.getIdentifier(BUILD_INFO_SDK_CONFIG, "string", packageName)
 

diff --git a/...ava/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImpl.kt b/...ava/io/embrace/android/embracesdk/internal/config/behavior/AutoDataCaptureBehaviorImpl.kt
@@ -1,6 +1,5 @@
 package io.embrace.android.embracesdk.internal.config.behavior
 
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.config.local.LocalConfig
 import io.embrace.android.embracesdk.internal.config.remote.RemoteConfig
 import io.embrace.android.embracesdk.internal.utils.Provider
@@ -77,7 +76,7 @@ internal class AutoDataCaptureBehaviorImpl(
             ?: local?.sdkConfig?.sigHandlerDetection ?: true
     }
 
-    override fun isNdkEnabled(): Boolean = local?.ndkEnabled ?: false && !ApkToolsConfig.IS_NDK_DISABLED
+    override fun isNdkEnabled(): Boolean = local?.ndkEnabled ?: false
 
     override fun isDiskUsageReportingEnabled(): Boolean =
         local?.sdkConfig?.app?.reportDiskUsage ?: REPORT_DISK_USAGE_DEFAULT

diff --git a/...droid-sdk/src/main/java/io/embrace/android/embracesdk/internal/injection/AnrModuleImpl.kt b/...droid-sdk/src/main/java/io/embrace/android/embracesdk/internal/injection/AnrModuleImpl.kt
@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.internal.injection
 
 import android.os.Looper
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.SharedObjectLoader
 import io.embrace.android.embracesdk.internal.anr.AnrOtelMapper
 import io.embrace.android.embracesdk.internal.anr.AnrService
@@ -27,7 +26,7 @@ internal class AnrModuleImpl(
     private val configService = essentialServiceModule.configService
 
     override val anrService: AnrService by singleton {
-        if (configService.autoDataCaptureBehavior.isAnrServiceEnabled() && !ApkToolsConfig.IS_ANR_MONITORING_DISABLED) {
+        if (configService.autoDataCaptureBehavior.isAnrServiceEnabled()) {
             // the customer didn't enable early ANR detection, so construct the service
             // as part of normal initialization.
             EmbraceAnrService(

diff --git a/...android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logging/EmbLoggerImpl.kt b/...android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logging/EmbLoggerImpl.kt
@@ -1,7 +1,6 @@
 package io.embrace.android.embracesdk.internal.logging
 
 import android.util.Log
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 
 internal const val EMBRACE_TAG = "[Embrace]"
 
@@ -52,7 +51,7 @@ internal class EmbLoggerImpl : EmbLogger {
      */
     @Suppress("NOTHING_TO_INLINE") // hot path - optimize by inlining
     private inline fun log(msg: String, severity: EmbLogger.Severity, throwable: Throwable?) {
-        if (severity >= EmbLogger.Severity.INFO || ApkToolsConfig.IS_DEVELOPER_LOGGING_ENABLED) {
+        if (severity >= EmbLogger.Severity.INFO) {
             logcatImpl(throwable, severity, msg)
         }
     }

diff --git a/...android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/EmbraceNdkService.kt b/...android-sdk/src/main/java/io/embrace/android/embracesdk/internal/ndk/EmbraceNdkService.kt
@@ -6,7 +6,6 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.DeviceArchitecture
 import io.embrace.android.embracesdk.internal.EventType
 import io.embrace.android.embracesdk.internal.SharedObjectLoader
@@ -236,7 +235,7 @@ internal class EmbraceNdkService(
                 nativeCrashId,
                 Build.VERSION.SDK_INT,
                 is32bit,
-                ApkToolsConfig.IS_DEVELOPER_LOGGING_ENABLED
+                false
             )
         }
         Systrace.traceSynchronous("update-metadata") { updateDeviceMetaData() }

diff --git a/...droid-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImplTest.kt b/...droid-sdk/src/test/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImplTest.kt
@@ -11,7 +11,6 @@ import io.embrace.android.embracesdk.fakes.fakeAnrBehavior
 import io.embrace.android.embracesdk.fakes.fakeAutoDataCaptureBehavior
 import io.embrace.android.embracesdk.fakes.fakeNetworkSpanForwardingBehavior
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
-import io.embrace.android.embracesdk.internal.ApkToolsConfig
 import io.embrace.android.embracesdk.internal.EventType
 import io.embrace.android.embracesdk.internal.api.delegate.EmbraceInternalInterfaceImpl
 import io.embrace.android.embracesdk.internal.config.local.LocalConfig
@@ -62,7 +61,6 @@ internal class EmbraceInternalInterfaceImplTest {
             fakeConfigService,
             initModule.openTelemetryModule.internalTracer
         )
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = false
     }
 
     @Test
@@ -207,8 +205,6 @@ internal class EmbraceInternalInterfaceImplTest {
     @Test
     fun `test isInternalNetworkCaptureDisabled`() {
         assertFalse(internalImpl.isInternalNetworkCaptureDisabled())
-        ApkToolsConfig.IS_NETWORK_CAPTURE_DISABLED = true
-        assertTrue(internalImpl.isInternalNetworkCaptureDisabled())
     }
 
     @Test