Rebase and trim test

embrace-io · Jul 26, 2024 · 486b738 · 486b738
1 parent fb147b1
commit 486b738
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 444 deletions.
diff --git a/...src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadEventEmitter.kt b/...src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadEventEmitter.kt
@@ -12,7 +12,7 @@ internal class LoadEventEmitter(
     private val openEvents: LoadEvents,
     private val clock: Clock,
     private val versionChecker: VersionChecker,
-): ActivityLifecycleListener {
+) : ActivityLifecycleListener {
     override fun onActivityPreCreated(activity: Activity, savedInstanceState: Bundle?) {
         create(activity)
     }
@@ -106,4 +106,4 @@ internal class LoadEventEmitter(
     private fun traceInstanceId(activity: Activity): Int = activity.hashCode()
 
     private fun nowMs(): Long = clock.now().nanosToMillis()
-}
+}
diff --git a/...d-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadEvents.kt b/...d-sdk/src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadEvents.kt
@@ -25,4 +25,4 @@ internal interface LoadEvents {
     enum class EndEvent(val eventName: String) {
         RENDER("render"), RESUME("open")
     }
-}
+}
diff --git a/...src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadTraceEmitter.kt b/...src/main/java/io/embrace/android/embracesdk/internal/capture/activity/LoadTraceEmitter.kt
@@ -161,7 +161,7 @@ internal class LoadTraceEmitter(
     }
 
     private fun traceName(
-        activityName: String, 
+        activityName: String,
         openType: LoadEvents.OpenType
     ): String = "$activityName-${openType.typeName}-${getEndEvent().eventName}"
 
@@ -171,7 +171,7 @@ internal class LoadTraceEmitter(
         RESUME("resume"),
         RENDER("render");
 
-        fun spanName(activityName: String): String = "activity-$typeName-$activityName"
+        fun spanName(activityName: String): String = "$activityName-$typeName"
     }
 
     private data class ActivityLoadTrace(

diff --git a/...rc/main/java/io/embrace/android/embracesdk/internal/injection/DataCaptureServiceModule.kt b/...rc/main/java/io/embrace/android/embracesdk/internal/injection/DataCaptureServiceModule.kt
@@ -1,12 +1,12 @@
 package io.embrace.android.embracesdk.internal.injection
 
+import io.embrace.android.embracesdk.internal.capture.activity.LoadTraceEmitter
 import io.embrace.android.embracesdk.internal.capture.crumbs.BreadcrumbService
 import io.embrace.android.embracesdk.internal.capture.crumbs.PushNotificationCaptureService
 import io.embrace.android.embracesdk.internal.capture.startup.AppStartupDataCollector
 import io.embrace.android.embracesdk.internal.capture.startup.StartupService
 import io.embrace.android.embracesdk.internal.capture.startup.StartupTracker
 import io.embrace.android.embracesdk.internal.capture.webview.WebViewService
-import io.embrace.android.embracesdk.internal.session.lifecycle.ActivityLifecycleListener
 
 /**
  * This modules provides services that capture data from within an application. It could be argued
@@ -40,5 +40,5 @@ internal interface DataCaptureServiceModule {
 
     val appStartupDataCollector: AppStartupDataCollector
 
-    val activityCreateTraceEmitter: ActivityLifecycleListener
+    val activityCreateTraceEmitter: LoadTraceEmitter
 }
diff --git a/...ain/java/io/embrace/android/embracesdk/internal/injection/DataCaptureServiceModuleImpl.kt b/...ain/java/io/embrace/android/embracesdk/internal/injection/DataCaptureServiceModuleImpl.kt
@@ -1,6 +1,7 @@
 package io.embrace.android.embracesdk.internal.injection
 
 import io.embrace.android.embracesdk.internal.Systrace
+import io.embrace.android.embracesdk.internal.capture.activity.LoadTraceEmitter
 import io.embrace.android.embracesdk.internal.capture.crumbs.BreadcrumbService
 import io.embrace.android.embracesdk.internal.capture.crumbs.EmbraceBreadcrumbService
 import io.embrace.android.embracesdk.internal.capture.crumbs.PushNotificationCaptureService
@@ -69,9 +70,8 @@ internal class DataCaptureServiceModuleImpl @JvmOverloads constructor(
         )
     }
 
-    override val activityCreateTraceEmitter: ActivityCreateTraceEmitter by singleton {
-        ActivityCreateTraceEmitter(
-            clock = initModule.openTelemetryClock,
+    override val activityCreateTraceEmitter: LoadTraceEmitter by singleton {
+        LoadTraceEmitter(
             spanService = openTelemetryModule.spanService,
             backgroundWorker = workerThreadModule.backgroundWorker(WorkerName.BACKGROUND_REGISTRATION),
             versionChecker = versionChecker,
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ internal interface LoadEvents { @@
         enum class EndEvent(val eventName: String) {
             RENDER("render"), RESUME("open")
         }
-    }
+    }