refactor: move the session module to core module

embrace-io · Aug 19, 2024 · 3a03203 · 3a03203
1 parent 4980619
commit 3a03203
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 23 deletions.
diff --git a/embrace-android-core/config/detekt/baseline.xml b/embrace-android-core/config/detekt/baseline.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
+    <ID>LongParameterList:SessionOrchestrationModuleSupplier.kt$( initModule: InitModule, openTelemetryModule: OpenTelemetryModule, androidServicesModule: AndroidServicesModule, essentialServiceModule: EssentialServiceModule, configModule: ConfigModule, deliveryModule: DeliveryModule, workerThreadModule: WorkerThreadModule, dataSourceModule: DataSourceModule, payloadSourceModule: PayloadSourceModule, startupDurationProvider: (coldStart: Boolean) -&gt; Long?, momentsModule: MomentsModule, logModule: LogModule )</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/...l/injection/SessionOrchestrationModule.kt → ...l/injection/SessionOrchestrationModule.kt b/...l/injection/SessionOrchestrationModule.kt → ...l/injection/SessionOrchestrationModule.kt
@@ -9,13 +9,13 @@ import io.embrace.android.embracesdk.internal.session.message.PayloadMessageColl
 import io.embrace.android.embracesdk.internal.session.orchestrator.SessionOrchestrator
 import io.embrace.android.embracesdk.internal.session.orchestrator.SessionSpanAttrPopulator
 
-internal interface SessionOrchestrationModule {
-    val payloadFactory: PayloadFactory
-    val payloadMessageCollatorImpl: PayloadMessageCollatorImpl
-    val sessionOrchestrator: SessionOrchestrator
-    val periodicSessionCacher: PeriodicSessionCacher
-    val periodicBackgroundActivityCacher: PeriodicBackgroundActivityCacher
-    val sessionSpanAttrPopulator: SessionSpanAttrPopulator
-    val memoryCleanerService: MemoryCleanerService
-    val gatingService: GatingService
+public interface SessionOrchestrationModule {
+    public val payloadFactory: PayloadFactory
+    public val payloadMessageCollatorImpl: PayloadMessageCollatorImpl
+    public val sessionOrchestrator: SessionOrchestrator
+    public val periodicSessionCacher: PeriodicSessionCacher
+    public val periodicBackgroundActivityCacher: PeriodicBackgroundActivityCacher
+    public val sessionSpanAttrPopulator: SessionSpanAttrPopulator
+    public val memoryCleanerService: MemoryCleanerService
+    public val gatingService: GatingService
 }
diff --git a/...jection/SessionOrchestrationModuleImpl.kt → ...jection/SessionOrchestrationModuleImpl.kt b/...jection/SessionOrchestrationModuleImpl.kt → ...jection/SessionOrchestrationModuleImpl.kt
@@ -26,7 +26,7 @@ internal class SessionOrchestrationModuleImpl(
     workerThreadModule: WorkerThreadModule,
     dataSourceModule: DataSourceModule,
     payloadSourceModule: PayloadSourceModule,
-    dataCaptureServiceModule: DataCaptureServiceModule,
+    startupDurationProvider: (coldStart: Boolean) -> Long?,
     momentsModule: MomentsModule,
     logModule: LogModule
 ) : SessionOrchestrationModule {
@@ -88,7 +88,7 @@ internal class SessionOrchestrationModuleImpl(
         SessionSpanAttrPopulatorImpl(
             openTelemetryModule.currentSessionSpan,
             momentsModule.eventService,
-            dataCaptureServiceModule.startupService::getSdkStartupDuration,
+            startupDurationProvider,
             logModule.logService,
             payloadSourceModule.metadataService
         )

diff --git a/...ion/SessionOrchestrationModuleSupplier.kt → ...ion/SessionOrchestrationModuleSupplier.kt b/...ion/SessionOrchestrationModuleSupplier.kt → ...ion/SessionOrchestrationModuleSupplier.kt
@@ -3,7 +3,7 @@ package io.embrace.android.embracesdk.internal.injection
 /**
  * Function that returns an instance of [SessionOrchestrationModule]. Matches the signature of the constructor for [SessionOrchestrationModuleImpl]
  */
-internal typealias SessionOrchestrationModuleSupplier = (
+public typealias SessionOrchestrationModuleSupplier = (
     initModule: InitModule,
     openTelemetryModule: OpenTelemetryModule,
     androidServicesModule: AndroidServicesModule,
@@ -13,12 +13,12 @@ internal typealias SessionOrchestrationModuleSupplier = (
     workerThreadModule: WorkerThreadModule,
     dataSourceModule: DataSourceModule,
     payloadSourceModule: PayloadSourceModule,
-    dataCaptureServiceModule: DataCaptureServiceModule,
+    startupDurationProvider: (coldStart: Boolean) -> Long?,
     momentsModule: MomentsModule,
     logModule: LogModule
 ) -> SessionOrchestrationModule
 
-internal fun createSessionOrchestrationModule(
+public fun createSessionOrchestrationModule(
     initModule: InitModule,
     openTelemetryModule: OpenTelemetryModule,
     androidServicesModule: AndroidServicesModule,
@@ -28,7 +28,7 @@ internal fun createSessionOrchestrationModule(
     workerThreadModule: WorkerThreadModule,
     dataSourceModule: DataSourceModule,
     payloadSourceModule: PayloadSourceModule,
-    dataCaptureServiceModule: DataCaptureServiceModule,
+    startupDurationProvider: (coldStart: Boolean) -> Long?,
     momentsModule: MomentsModule,
     logModule: LogModule
 ): SessionOrchestrationModule = SessionOrchestrationModuleImpl(
@@ -41,7 +41,7 @@ internal fun createSessionOrchestrationModule(
     workerThreadModule,
     dataSourceModule,
     payloadSourceModule,
-    dataCaptureServiceModule,
+    startupDurationProvider,
     momentsModule,
     logModule
 )
diff --git a/...ion/SessionOrchestrationModuleImplTest.kt → ...ion/SessionOrchestrationModuleImplTest.kt b/...ion/SessionOrchestrationModuleImplTest.kt → ...ion/SessionOrchestrationModuleImplTest.kt
@@ -3,7 +3,6 @@ package io.embrace.android.embracesdk.internal.session
 import io.embrace.android.embracesdk.fakes.FakeConfigModule
 import io.embrace.android.embracesdk.fakes.FakeConfigService
 import io.embrace.android.embracesdk.fakes.injection.FakeAndroidServicesModule
-import io.embrace.android.embracesdk.fakes.injection.FakeDataCaptureServiceModule
 import io.embrace.android.embracesdk.fakes.injection.FakeDeliveryModule
 import io.embrace.android.embracesdk.fakes.injection.FakeEssentialServiceModule
 import io.embrace.android.embracesdk.fakes.injection.FakeInitModule
@@ -44,7 +43,7 @@ internal class SessionOrchestrationModuleImplTest {
             workerThreadModule,
             dataSourceModule,
             FakePayloadSourceModule(),
-            FakeDataCaptureServiceModule(),
+            { 0L },
             FakeMomentsModule(),
             FakeLogModule()
         )
@@ -78,7 +77,7 @@ internal class SessionOrchestrationModuleImplTest {
             workerThreadModule,
             dataSourceModule,
             FakePayloadSourceModule(),
-            FakeDataCaptureServiceModule(),
+            { 0L },
             FakeMomentsModule(),
             FakeLogModule()
         )

diff --git a/embrace-android-sdk/config/detekt/baseline.xml b/embrace-android-sdk/config/detekt/baseline.xml
@@ -4,7 +4,6 @@
   <CurrentIssues>
     <ID>CyclomaticComplexMethod:ModuleInitBootstrapper.kt$ModuleInitBootstrapper$@JvmOverloads fun init( context: Context, appFramework: AppFramework, sdkStartTimeMs: Long, customAppId: String? = null, configServiceProvider: (framework: AppFramework) -&gt; ConfigService? = { null }, versionChecker: VersionChecker = BuildVersionChecker, ): Boolean</ID>
     <ID>LongParameterList:PayloadModuleSupplier.kt$( initModule: InitModule, coreModule: CoreModule, workerThreadModule: WorkerThreadModule, systemServiceModule: SystemServiceModule, androidServicesModule: AndroidServicesModule, essentialServiceModule: EssentialServiceModule, configModule: ConfigModule, nativeCoreModuleProvider: Provider&lt;NativeCoreModule?&gt;, nativeFeatureModuleProvider: Provider&lt;NativeFeatureModule?&gt;, otelModule: OpenTelemetryModule, anrModule: AnrModule, )</ID>
-    <ID>LongParameterList:SessionOrchestrationModuleSupplier.kt$( initModule: InitModule, openTelemetryModule: OpenTelemetryModule, androidServicesModule: AndroidServicesModule, essentialServiceModule: EssentialServiceModule, configModule: ConfigModule, deliveryModule: DeliveryModule, workerThreadModule: WorkerThreadModule, dataSourceModule: DataSourceModule, payloadSourceModule: PayloadSourceModule, dataCaptureServiceModule: DataCaptureServiceModule, momentsModule: MomentsModule, logModule: LogModule )</ID>
     <ID>MaxLineLength:FakeModuleInitBootstrapper.kt$sessionOrchestrationModuleSupplier: SessionOrchestrationModuleSupplier = { _, _, _, _, _, _, _, _, _, _, _, _ -&gt; FakeSessionOrchestrationModule() }</ID>
     <ID>MaximumLineLength:FakeModuleInitBootstrapper.kt$ </ID>
   </CurrentIssues>

diff --git a/.../src/main/java/io/embrace/android/embracesdk/internal/injection/ModuleInitBootstrapper.kt b/.../src/main/java/io/embrace/android/embracesdk/internal/injection/ModuleInitBootstrapper.kt
@@ -468,7 +468,7 @@ internal class ModuleInitBootstrapper(
                             workerThreadModule,
                             dataSourceModule,
                             payloadSourceModule,
-                            dataCaptureServiceModule,
+                            dataCaptureServiceModule.startupService::getSdkStartupDuration,
                             momentsModule,
                             logModule
                         )

diff --git a/...bracesdk/fakes/injection/FakeLogModule.kt → ...bracesdk/fakes/injection/FakeLogModule.kt b/...bracesdk/fakes/injection/FakeLogModule.kt → ...bracesdk/fakes/injection/FakeLogModule.kt
@@ -19,7 +19,7 @@ import io.embrace.android.embracesdk.internal.network.logging.NetworkLoggingServ
 import io.embrace.android.embracesdk.internal.serialization.EmbraceSerializer
 import io.embrace.android.embracesdk.internal.worker.BackgroundWorker
 
-internal class FakeLogModule(
+public class FakeLogModule(
     override val networkLoggingService: NetworkLoggingService = FakeNetworkLoggingService(),
 
     override val logService: LogService = EmbraceLogService(

diff --git a/...esdk/fakes/injection/FakeMomentsModule.kt → ...esdk/fakes/injection/FakeMomentsModule.kt b/...esdk/fakes/injection/FakeMomentsModule.kt → ...esdk/fakes/injection/FakeMomentsModule.kt
@@ -4,6 +4,6 @@ import io.embrace.android.embracesdk.fakes.FakeEventService
 import io.embrace.android.embracesdk.internal.event.EventService
 import io.embrace.android.embracesdk.internal.injection.MomentsModule
 
-internal class FakeMomentsModule(
+public class FakeMomentsModule(
     override val eventService: EventService = FakeEventService()
 ) : MomentsModule