Merge pull request #2581 from digma-ai/reduce-engine-status-calls

reduce engine status calls Closes #2575

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/docker/DigmaInstallationDiscovery.kt

@@ -6,6 +6,7 @@ import com.intellij.execution.process.ProcessOutput
 import com.intellij.execution.util.ExecUtil
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
+import org.apache.commons.lang3.time.StopWatch
 import org.digma.intellij.plugin.analytics.BackendConnectionMonitor
 import org.digma.intellij.plugin.common.readTree
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
@@ -24,9 +25,17 @@ internal fun discoverActualRunningEngine(project: Project): DigmaInstallationSta
 //this method should be called only if we know that local engine is not installed
 internal fun discoverActualRunningEngine(hasConnection: Boolean): DigmaInstallationStatus {
 
+    var stopWatch = StopWatch.createStarted()
     val isLocalEngineRunning = isLocalEngineRunning()
+    Log.log(logger::trace,"isLocalEngineRunning took {}",stopWatch.time)
+
+    stopWatch = StopWatch.createStarted()
     val isAnyEngineRunning = isAnyEngineRunning()
+    Log.log(logger::trace,"isAnyEngineRunning took {}",stopWatch.time)
+
+    stopWatch = StopWatch.createStarted()
     val isExtensionRunning = isExtensionRunning()
+    Log.log(logger::trace,"isExtensionRunning took {}",stopWatch.time)
 
     val connectionType: ConnectionType? = if (hasConnection) {
         if (SettingsUtils.isSettingsPointsToRemoteIp()) {

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseMessageRouterHandler.kt

@@ -361,21 +361,15 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
 
 
     protected fun doCommonInitialize(browser: CefBrowser) {
-        try {
-            Log.log(logger::trace, project, "sending {} message", JCEFGlobalConstants.GLOBAL_SET_BACKEND_INFO)
-            sendBackendAboutInfo(browser, project)
-        } catch (e: Exception) {
-            Log.debugWithException(logger, project, e, "error calling about")
-        }
 
-        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null, null, null)
+        Log.log(logger::trace, project, "sending {} message", JCEFGlobalConstants.GLOBAL_SET_BACKEND_INFO)
+        sendBackendAboutInfo(browser, project)
 
-        updateDigmaEngineStatus(project, browser)
+        sendUserInfoMessage(browser, DigmaDefaultAccountHolder.getInstance().account?.userId, project)
 
         sendEnvironmentsList(browser, getAllEnvironments(project))
 
-        sendUserInfoMessage(browser, DigmaDefaultAccountHolder.getInstance().account?.userId, project)
-
+        val insightsStats = AnalyticsService.getInstance(project).getInsightsStats(null, null, null)
         sendScopeChangedMessage(
             browser,
             null,

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt

@@ -99,9 +99,9 @@ private constructor(
                     //ApiClientChangedEvent is certain to be fired after the api client was changed and surely must set the correct info to the UI.
                     Backgroundable.executeOnPooledThread {
                         try {
+                            sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
                             sendUserInfoMessage(jbCefBrowser.cefBrowser, DigmaDefaultAccountHolder.getInstance().account?.userId, project)
                             updateDigmaEngineStatus(project, jbCefBrowser.cefBrowser)
-                            sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
                         } catch (e: Throwable) {
                             Log.warnWithException(logger, project, e, "error in ApiClientChangedEvent")
                             ErrorReporter.getInstance().reportError(project, "JCefComponent.apiClientChanged", e)
@@ -176,9 +176,9 @@ private constructor(
                     connectionEventAlarm.cancelAllRequests()
                     connectionEventAlarm.addRequest({
                         try {
+                            sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
                             val status = service<LocalInstallationFacade>().getCurrentDigmaInstallationStatusOnConnectionGained()
                             updateDigmaEngineStatus(jbCefBrowser.cefBrowser, status)
-                            sendBackendAboutInfo(jbCefBrowser.cefBrowser, project)
                         } catch (e: Exception) {
                             Log.warnWithException(logger, project, e, "error in connectionGained")
                             ErrorReporter.getInstance().reportError(project, "JCefComponent.connectionGained", e)

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefMessagesUtils.kt

@@ -5,13 +5,15 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.ui.jcef.JBCefBrowser
 import org.cef.browser.CefBrowser
-import org.digma.intellij.plugin.analytics.AnalyticsService
+import org.digma.intellij.plugin.analytics.BackendInfoHolder
 import org.digma.intellij.plugin.docker.DigmaInstallationStatus
 import org.digma.intellij.plugin.docker.LocalInstallationFacade
 import org.digma.intellij.plugin.errorreporting.ErrorReporter
+import org.digma.intellij.plugin.model.rest.AboutResult
 import org.digma.intellij.plugin.model.rest.environment.Env
 import org.digma.intellij.plugin.model.rest.insights.SpanEnvironment
 import org.digma.intellij.plugin.model.rest.navigation.CodeLocation
+import org.digma.intellij.plugin.model.rest.version.BackendDeploymentType
 import org.digma.intellij.plugin.scope.ScopeContext
 import org.digma.intellij.plugin.scope.SpanScope
 import org.digma.intellij.plugin.ui.common.isJaegerButtonEnabled
@@ -120,7 +122,7 @@ fun updateDigmaEngineStatus(cefBrowser: CefBrowser, status: DigmaInstallationSta
 }
 
 fun sendBackendAboutInfo(cefBrowser: CefBrowser, project: Project) {
-    val about = AnalyticsService.getInstance(project).about
+    val about = BackendInfoHolder.getInstance(project).getAbout() ?: AboutResult("unknown", BackendDeploymentType.Unknown, false, null)
     val message = BackendInfoMessage(about)
     serializeAndExecuteWindowPostMessageJavaScript(cefBrowser, message, project)
 }

src/main/kotlin/org/digma/intellij/plugin/ui/mainapp/MainAppMessageRouterHandler.kt

@@ -4,14 +4,13 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import org.cef.browser.CefBrowser
-import org.digma.intellij.plugin.analytics.AnalyticsServiceException
-import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.protocol.DigmaProtocolApi
 import org.digma.intellij.plugin.ui.assets.AssetsMessageRouterHandler
 import org.digma.intellij.plugin.ui.errors.ErrorsMessageRouterHandler
 import org.digma.intellij.plugin.ui.highlights.HighlightsMessageRouterHandler
 import org.digma.intellij.plugin.ui.insights.InsightsMessageRouterHandler
 import org.digma.intellij.plugin.ui.jcef.BaseMessageRouterHandler
+import org.digma.intellij.plugin.ui.jcef.updateDigmaEngineStatus
 import org.digma.intellij.plugin.ui.navigation.NavigationMessageRouterHandler
 import org.digma.intellij.plugin.ui.tests.TestsMessageRouterHandler
 
@@ -63,11 +62,9 @@ class MainAppMessageRouterHandler(project: Project) : BaseMessageRouterHandler(p
 
 
     private fun onInitialize(browser: CefBrowser) {
-        try {
-            doCommonInitialize(browser)
-        } catch (e: AnalyticsServiceException) {
-            Log.warnWithException(logger, e, "error getting backend info")
-        }
+        doCommonInitialize(browser)
+        updateDigmaEngineStatus(project, browser)
+
         project.service<DigmaProtocolApi>().setMainAppInitialized()
     }