Merge pull request #2252 from digma-ai/migrate-startup-activity-to-project-activity

shalom938 · web-flow · commit b76d4388afdc · 2024-07-01T18:28:39.000+03:00
migrate-startup-activity-to-project-activity Closes #1865
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsServiceStarter.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsServiceStarter.java
@@ -1,17 +1,18 @@
 package org.digma.intellij.plugin.analytics;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.startup.StartupActivity;
 import org.digma.intellij.plugin.common.Backgroundable;
+import org.digma.intellij.plugin.startup.DigmaProjectActivity;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Initialize AnalyticsService early as possible
  */
-public class AnalyticsServiceStarter implements StartupActivity.DumbAware {
+public class AnalyticsServiceStarter extends DigmaProjectActivity {
+
 
     @Override
-    public void runActivity(@NotNull Project project) {
+    public void executeProjectStartup(@NotNull Project project) {
         Backgroundable.ensureBackgroundWithoutReadAccess(project, "initializing analytics service", () -> {
             //start AnalyticsServiceSettingsWatcher so it will start listening to settings change events
             AnalyticsServiceSettingsWatcher.getInstance();
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/common/StartupStartupActivity.java b/ide-common/src/main/java/org/digma/intellij/plugin/common/StartupStartupActivity.java
@@ -2,25 +2,27 @@
 
 import com.intellij.ide.util.RunOnceUtil;
 import com.intellij.openapi.project.*;
-import com.intellij.openapi.startup.StartupActivity;
 import org.digma.intellij.plugin.posthog.ActivityMonitor;
 import org.digma.intellij.plugin.session.SessionMetadataProperties;
+import org.digma.intellij.plugin.startup.DigmaProjectActivity;
 import org.digma.intellij.plugin.ui.ToolWindowShower;
 import org.jetbrains.annotations.NotNull;
 
 import static org.digma.intellij.plugin.session.SessionMetadataPropertiesKt.getPluginLoadedKey;
 
-public class StartupStartupActivity implements StartupActivity.DumbAware {
+public class StartupStartupActivity extends DigmaProjectActivity {
 
     private static final String RUN_ONCE_ID = "org.digma.runonce.opentoolwindow";
 
+
     @Override
-    public void runActivity(@NotNull Project project) {
+    public void executeProjectStartup(@NotNull Project project) {
         RunOnceUtil.runOnceForApp(RUN_ONCE_ID, () -> {
             ActivityMonitor.getInstance(project).registerFirstTimePluginLoaded();
             project.getService(DumbService.class).runWhenSmart(() -> EDT.ensureEDT(() -> ToolWindowShower.getInstance(project).showToolWindow()));
         });
         ActivityMonitor.getInstance(project).registerPluginLoaded();
         SessionMetadataProperties.getInstance().put(getPluginLoadedKey(project), true);
     }
+
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/digmathon/DigmathonStartup.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/digmathon/DigmathonStartup.kt
@@ -1,11 +1,11 @@
 package org.digma.intellij.plugin.digmathon
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class DigmathonStartup : StartupActivity.DumbAware {
+class DigmathonStartup : DigmaProjectActivity() {
 
-    override fun runActivity(project: Project) {
+    override fun executeProjectStartup(project: Project) {
         DigmathonService.getInstance()
     }
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitorStarter.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitorStarter.kt
@@ -1,13 +1,13 @@
 package org.digma.intellij.plugin.posthog
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class ActivityMonitorStarter : StartupActivity.Background {
+class ActivityMonitorStarter : DigmaProjectActivity() {
 
     //try to start ActivityMonitor as early as possible. although if the digma tool window is opened on start it will call
     // ActivityMonitor on UI thread
-    override fun runActivity(project: Project) {
+    override fun executeProjectStartup(project: Project) {
         ActivityMonitor.getInstance(project)
     }
 
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ContainerEngineStartupActivity.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ContainerEngineStartupActivity.kt
@@ -2,14 +2,12 @@ package org.digma.intellij.plugin.posthog
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.util.ExecUtil
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class ContainerEngineStartupActivity : StartupActivity {
-    private val logger = Logger.getInstance(ContainerEngineStartupActivity::class.java)
+class ContainerEngineStartupActivity : DigmaProjectActivity() {
     private val isWindows: Boolean = System.getProperty("os.name").startsWith("windows", true)
 
     enum class ContainerEngine {
@@ -18,7 +16,7 @@ class ContainerEngineStartupActivity : StartupActivity {
         UNKNOWN
     }
 
-    override fun runActivity(project: Project) {
+    override fun executeProjectStartup(project: Project) {
         val containerPlatform = getInstalled(project).toString().lowercase()
         ActivityMonitor.getInstance(project).registerContainerEngine(containerPlatform)
     }
@@ -32,6 +30,8 @@ class ContainerEngineStartupActivity : StartupActivity {
 
         return ContainerEngine.UNKNOWN
     }
+
+
     private fun getExecPath(project: Project, executable: String): String ? {
         val cmd = GeneralCommandLine(if (isWindows) "where" else "which")
         cmd.addParameter(executable)
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/PerformanceMetricsPosthogEventStartupActivity.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/PerformanceMetricsPosthogEventStartupActivity.kt
@@ -6,7 +6,6 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
@@ -20,13 +19,15 @@ import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.model.rest.version.PerformanceMetricsResponse
 import org.digma.intellij.plugin.persistence.PersistenceService
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 
-class PerformanceMetricsPosthogEventStartupActivity : StartupActivity {
-    override fun runActivity(project: Project) {
+class PerformanceMetricsPosthogEventStartupActivity : DigmaProjectActivity() {
+
+    override fun executeProjectStartup(project: Project) {
         service<ContinuousPerformanceMetricsReporter>().start()
     }
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/startup/DigmaProjectActivity.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/startup/DigmaProjectActivity.kt
@@ -0,0 +1,24 @@
+package org.digma.intellij.plugin.startup
+
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.ProjectActivity
+import org.digma.intellij.plugin.errorreporting.ErrorReporter
+import org.digma.intellij.plugin.log.Log
+
+abstract class DigmaProjectActivity : ProjectActivity {
+
+    protected val logger = Logger.getInstance(this::class.java)
+
+    abstract fun executeProjectStartup(project: Project)
+
+    override suspend fun execute(project: Project) {
+        runCatching {
+            Log.log(logger::trace, project, "Project activity {} started", this::class.java.simpleName)
+            executeProjectStartup(project)
+            Log.log(logger::trace, project, "Project activity {} ended", this::class.java.simpleName)
+        }.onFailure {
+            ErrorReporter.getInstance().reportError(project, "DigmaProjectActivity.execute", it)
+        }
+    }
+}
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/updates/AggressiveUpdateService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/updates/AggressiveUpdateService.kt
@@ -6,7 +6,6 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import io.ktor.utils.io.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
@@ -29,7 +28,6 @@ import org.digma.intellij.plugin.model.rest.version.BackendDeploymentType
 import org.digma.intellij.plugin.model.rest.version.VersionResponse
 import org.digma.intellij.plugin.posthog.ActivityMonitor
 import org.digma.intellij.plugin.settings.InternalFileSettings
-import org.digma.intellij.plugin.updates.AggressiveUpdateService.Companion.getInstance
 import org.digma.intellij.plugin.updates.CurrentUpdateState.OK
 import org.digma.intellij.plugin.updates.CurrentUpdateState.UPDATE_BACKEND
 import org.digma.intellij.plugin.updates.CurrentUpdateState.UPDATE_BOTH
@@ -406,10 +404,3 @@ class AggressiveUpdateService(val project: Project) : Disposable {
 
 
 data class PublicUpdateState(val updateState: CurrentUpdateState, val backendDeploymentType: BackendDeploymentType)
-
-
-class AggressiveUpdateServiceStarter : StartupActivity.DumbAware {
-    override fun runActivity(project: Project) {
-        getInstance(project)
-    }
-}
diff --git a/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/deps/ModulesDepsService.kt b/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/deps/ModulesDepsService.kt
@@ -7,10 +7,10 @@ import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.ModuleRootManager
-import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.posthog.ActivityMonitor
 import org.digma.intellij.plugin.posthog.MonitoredFramework
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 import org.jetbrains.annotations.NotNull
 import java.util.Timer
 import java.util.TimerTask
@@ -406,8 +406,8 @@ class ModulesDepsService(private val project: Project) : Disposable {
     }
 }
 
-class ModuleDepsStarter : StartupActivity {
-    override fun runActivity(project: Project) {
+class ModuleDepsStarter : DigmaProjectActivity() {
+    override fun executeProjectStartup(project: Project) {
         // its enough just call getInstance and it will be initialized
         ModulesDepsService.getInstance(project)
     }
diff --git a/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/OTELJarProviderStartup.kt b/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/OTELJarProviderStartup.kt
@@ -2,10 +2,11 @@ package org.digma.intellij.plugin.idea.execution
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class OTELJarProviderStartup : StartupActivity {
-    override fun runActivity(project: Project) {
+class OTELJarProviderStartup : DigmaProjectActivity() {
+
+    override fun executeProjectStartup(project: Project) {
         //just call the service so its initializes if it's the first IDE startup.
         //opening more projects will do nothing because it's an application service.
         service<OTELJarProvider>()
diff --git a/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/RunConfigurationStartupActivity.kt b/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/execution/RunConfigurationStartupActivity.kt
@@ -5,12 +5,13 @@ import com.intellij.execution.RunnerAndConfigurationSettings
 import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.execution.configurations.RunConfigurationBase
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.posthog.ActivityMonitor
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class RunConfigurationStartupActivity : StartupActivity {
-    override fun runActivity(project: Project) {
+class RunConfigurationStartupActivity : DigmaProjectActivity() {
+
+    override fun executeProjectStartup(project: Project) {
 
 
         try {
diff --git a/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/navigation/JvmNavigationDiscoveryStartupActivity.kt b/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/navigation/JvmNavigationDiscoveryStartupActivity.kt
@@ -1,17 +1,14 @@
 package org.digma.intellij.plugin.idea.navigation
 
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.common.Backgroundable
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-internal class JvmNavigationDiscoveryStartupActivity : StartupActivity {
+internal class JvmNavigationDiscoveryStartupActivity : DigmaProjectActivity() {
 
-    private val logger = Logger.getInstance(this::class.java)
-
-    override fun runActivity(project: Project) {
+    override fun executeProjectStartup(project: Project) {
 
         Backgroundable.executeOnPooledThread {
 
diff --git a/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/userstats/UserStatsService.kt b/jvm-common/src/main/kotlin/org/digma/intellij/plugin/idea/userstats/UserStatsService.kt
@@ -2,18 +2,20 @@ package org.digma.intellij.plugin.idea.userstats
 
 import com.intellij.collaboration.async.disposingScope
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.digma.intellij.plugin.analytics.AnalyticsService
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.posthog.ActivityMonitor
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 import java.util.concurrent.TimeUnit
 
+@Service(Service.Level.PROJECT)
 class UserStatsService(private val project: Project) : Disposable {
 
     companion object {
@@ -73,9 +75,8 @@ class UserStatsService(private val project: Project) : Disposable {
 
 }
 
-class UserStatsServiceStarter : StartupActivity {
-    override fun runActivity(project: Project) {
-        // its enough just to have reference to the service, and it will get initialized
-        val service = UserStatsService.getInstance(project)
+class UserStatsServiceStarter : DigmaProjectActivity() {
+    override fun executeProjectStartup(project: Project) {
+        UserStatsService.getInstance(project)
     }
 }
diff --git a/python/src/main/java/org/digma/intellij/plugin/psi/python/PythonSpanNavigationStartupActivity.java b/python/src/main/java/org/digma/intellij/plugin/psi/python/PythonSpanNavigationStartupActivity.java
@@ -1,12 +1,11 @@
 package org.digma.intellij.plugin.psi.python;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.startup.StartupActivity;
 import org.digma.intellij.plugin.common.Backgroundable;
 import org.digma.intellij.plugin.errorreporting.ErrorReporter;
 import org.jetbrains.annotations.NotNull;
 
-public class PythonSpanNavigationStartupActivity implements StartupActivity {
+public class PythonSpanNavigationStartupActivity implements ProjectActivity {
 
 
     @Override
diff --git a/rider/src/main/kotlin/org/digma/intellij/plugin/rider/ServicesStarter.kt b/rider/src/main/kotlin/org/digma/intellij/plugin/rider/ServicesStarter.kt
@@ -1,9 +1,7 @@
 package org.digma.intellij.plugin.rider
 
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import com.jetbrains.rd.platform.util.lifetime
 import com.jetbrains.rd.util.reactive.whenTrue
 import com.jetbrains.rider.projectView.SolutionLifecycleHost
@@ -12,16 +10,17 @@ import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.rider.protocol.CodeLensHost
 import org.digma.intellij.plugin.rider.protocol.LanguageServiceHost
 import org.digma.intellij.plugin.rider.protocol.ShowToolWindowHost
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 import java.util.Objects
 
-class ServicesStarter : StartupActivity, DumbAware {
+class ServicesStarter : DigmaProjectActivity() {
 
     //some rider services need to start when the project starts because they need to start listening
     // to events from resharper.
     // some services need a protocol object and may need to run on startup under EDT to initialize
     // early
 
-    override fun runActivity(project: Project) {
+    override fun executeProjectStartup(project: Project) {
         loadStartupServices(project)
     }
 
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/notificationcenter/NotificationsStartupActivity.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/notificationcenter/NotificationsStartupActivity.kt
@@ -2,11 +2,11 @@ package org.digma.intellij.plugin.ui.notificationcenter
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
 import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
 
-class NotificationsStartupActivity: StartupActivity {
-    override fun runActivity(project: Project) {
+class NotificationsStartupActivity: DigmaProjectActivity() {
+    override fun executeProjectStartup(project: Project) {
         Log.log(AppNotificationCenter.logger::info,"NotificationsStartupActivity called")
         project.service<EventsNotificationsService>().waitForEvents()
         service<AppNotificationCenter>() //just make sure to start the service
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivitiesStartup.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivitiesStartup.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityUpdater.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityUpdater.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/toolwindow/ToolWindowBadgeChanger.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/toolwindow/ToolWindowBadgeChanger.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/updates/AggressiveUpdateProjectStartup.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/updates/AggressiveUpdateProjectStartup.kt
diff --git a/src/main/resources/META-INF/org.digma.intellij-with-jvm.xml b/src/main/resources/META-INF/org.digma.intellij-with-jvm.xml
diff --git a/src/main/resources/META-INF/org.digma.intellij-with-python.xml b/src/main/resources/META-INF/org.digma.intellij-with-python.xml
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package org.digma.intellij.plugin.digmathon`
`2`	`2`
`3`	`3`	`import com.intellij.openapi.project.Project`
`4`		`-import com.intellij.openapi.startup.StartupActivity`
	`4`	`+import org.digma.intellij.plugin.startup.DigmaProjectActivity`
`5`	`5`
`6`		`-class DigmathonStartup : StartupActivity.DumbAware {`
	`6`	`+class DigmathonStartup : DigmaProjectActivity() {`
`7`	`7`
`8`		`- override fun runActivity(project: Project) {`
	`8`	`+ override fun executeProjectStartup(project: Project) {`
`9`	`9`	`DigmathonService.getInstance()`
`10`	`10`	`}`
`11`	`11`	`}`