Merge pull request #2635 from digma-ai/improove-auto-reload

shalom938 · web-flow · commit f0b5cee9218e · 2024-12-25T14:31:26.000+02:00
improve auto reload registration
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt
@@ -910,6 +910,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
         val ideVersion = ideInfo.fullVersion
         val ideBuildNumber = ideInfo.build.asString()
         val pluginVersion = SemanticVersionUtil.getPluginVersionWithoutBuildNumberAndPreRelease("unknown")
+        val uiVersion = UIVersioningService.getInstance().getCurrentUiVersion()
         val isJcefSupported = JBCefApp.isSupported()
 
         postHog?.set(
@@ -920,6 +921,7 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
                 "ide.version" to ideVersion,
                 "ide.build" to ideBuildNumber,
                 "plugin.version" to pluginVersion,
+                "ui.version" to uiVersion,
                 "user.type" to if (UniqueGeneratedUserId.isDevUser) "internal" else "external",
                 "jcef.supported" to isJcefSupported,
                 INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus()
@@ -1159,4 +1161,14 @@ class ActivityMonitor(private val project: Project, cs: CoroutineScope) : Dispos
     }
 
 
+    fun setUIVersion(uiVersion: String) {
+        postHog?.set(
+            UniqueGeneratedUserId.userId,
+            mapOf(
+                "ui.version" to uiVersion
+            )
+        )
+    }
+
+
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadObserver.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadObserver.kt
@@ -74,13 +74,15 @@ class ReloadObserver(cs: CoroutineScope) {
 
     fun register(project: Project, appName: String, jcefUiComponent: JComponent, parentDisposable: Disposable) {
 
+        Log.log(logger::trace, "register called for component {} in project {}", appName, project.name)
+
         if (GraphicsEnvironment.isHeadless()) {
             Log.log(logger::trace, "GraphicsEnvironment is headless, not registering components")
             return
         }
 
         if (!SystemInfo.isMac) {
-            Log.log(logger::trace, "system is not mac, not registering components")
+            Log.log(logger::trace, "system is not mac, not registering component {}", appName)
             return
         }
 
@@ -89,9 +91,9 @@ class ReloadObserver(cs: CoroutineScope) {
         jcefUiComponent.addPropertyChangeListener(jcefPropertyChangeListener)
 
         Disposer.register(parentDisposable) {
+            Log.log(logger::trace, "registration removed for component {} in project {}", appName, project.name)
             jcefUiComponent.removePropertyChangeListener(jcefPropertyChangeListener)
         }
-
     }
 
 
@@ -185,6 +187,7 @@ class ReloadObserver(cs: CoroutineScope) {
             }
 
         } catch (e: Throwable) {
+            Log.warnWithException(logger,e,"error in ReloadObserver.checkChangesAndReload")
             ErrorReporter.getInstance().reportError("ReloadObserver.checkChangesAndReload", e)
         }
     }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/updates/ui/UIVersioningService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/updates/ui/UIVersioningService.kt
@@ -187,6 +187,10 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
                     deleteUiBundle(getCurrentUiVersion())
                     setCurrentUiVersion(latestDownloadedUiVersion)
                     setLatestDownloadedVersion(null)
+
+                    findActiveProject()?.let {
+                        ActivityMonitor.getInstance(it).setUIVersion(getCurrentUiVersion())
+                    }
                 } else {
                     //something is wrong, we have the property latestDownloadedVersion but there is no file, maybe it was deleted.
                     //reset latestDownloadedVersion
@@ -220,6 +224,9 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
                 if (unpackUiBundle()) {
                     deleteUiBundle(getCurrentUiVersion())
                     setCurrentUiVersion(bundledUiVersion)
+                    findActiveProject()?.let {
+                        ActivityMonitor.getInstance(it).setUIVersion(getCurrentUiVersion())
+                    }
                 } else {
                     Log.log(logger::warn, "could not unpack bundled ui version {}", bundledUiVersion)
                 }
@@ -240,13 +247,16 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
                 )
                 unpackUiBundle()
                 setCurrentUiVersion(bundledUiVersion)
+                findActiveProject()?.let {
+                    ActivityMonitor.getInstance(it).setUIVersion(getCurrentUiVersion())
+                }
             }
 
         } catch (e: Throwable) {
             Log.warnWithException(logger, e, "failed validating ui bundle file")
             ErrorReporter.getInstance().reportError("UIVersioningService.validateUiBundleExistsAndUpdatePath", e)
 
-            //we don't know what went wrong, So as fallback use the packaged ui bundle
+            //we don't know what went wrong, So use the packaged ui bundle as fallback
             deleteUiBundle(getCurrentUiVersion())
             getLatestDownloadedVersion()?.let {
                 deleteUiBundle(it)
@@ -255,6 +265,9 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
 
             unpackUiBundle()
             setCurrentUiVersion(bundledUiVersion)
+            findActiveProject()?.let {
+                ActivityMonitor.getInstance(it).setUIVersion(getCurrentUiVersion())
+            }
 
         }
     }
@@ -411,6 +424,11 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
 
             deleteUiBundle(getCurrentUiVersion())
             setCurrentUiVersion(uiVersion)
+
+            findActiveProject()?.let {
+                ActivityMonitor.getInstance(it).setUIVersion(getCurrentUiVersion())
+            }
+
             service<ReloadService>().reloadAllProjects(ReloadSource.UI_UPDATE)
         } else {
             ErrorReporter.getInstance().reportError(
@@ -501,11 +519,6 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
                 val responseCode: Int = connection.getResponseCode()
 
                 if (responseCode != HttpURLConnection.HTTP_OK) {
-                    ErrorReporter.getInstance().reportError(
-                        null, "UIVersioningService.downloadAndCopyUiBundleFile",
-                        "download from $url",
-                        mapOf("responseCode" to responseCode.toString())
-                    )
                     Log.log(logger::warn, "error downloading ui bundle {}, response code {}", url, responseCode)
                     throw RuntimeException("could not download file from $url, response code $responseCode")
                 } else {
@@ -532,7 +545,11 @@ class UIVersioningService(val cs: CoroutineScope) : DisposableAdaptor {
             return true
 
         } catch (e: Exception) {
-            ErrorReporter.getInstance().reportError("UIVersioningService.downloadAndCopyUiBundleFile", e)
+            ErrorReporter.getInstance().reportError(
+                "UIVersioningService.downloadAndCopyUiBundleFile", e, mapOf(
+                    "download url" to url
+                )
+            )
             Log.warnWithException(logger, e, "could not download file {}", url)
             return false
         } finally {
diff --git a/src/main/java/org/digma/intellij/plugin/dashboard/DashboardFileEditor.java b/src/main/java/org/digma/intellij/plugin/dashboard/DashboardFileEditor.java
@@ -1,12 +1,10 @@
 package org.digma.intellij.plugin.dashboard;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.jcef.JBCefApp;
-import org.digma.intellij.plugin.reload.ReloadObserver;
 import org.digma.intellij.plugin.ui.jcef.*;
 import org.jetbrains.annotations.*;
 
@@ -29,7 +27,7 @@ public DashboardFileEditor(Project project, DashboardVirtualFile file) {
         this.file = file;
         jCefComponent = createJcefComponent(project, file);
         if (jCefComponent != null) {
-            ApplicationManager.getApplication().getService(ReloadObserver.class).register(project, DASHBOARD_APP_NAME + "." + file.getName(), jCefComponent.getComponent(), this);
+            jCefComponent.registerForReloadObserver(DASHBOARD_APP_NAME + "." + file.getName());
         }
     }
 
diff --git a/src/main/java/org/digma/intellij/plugin/documentation/DocumentationEnvJsTemplateBuilder.java b/src/main/java/org/digma/intellij/plugin/documentation/DocumentationEnvJsTemplateBuilder.java
@@ -1,7 +1,7 @@
 package org.digma.intellij.plugin.documentation;
 
 import com.intellij.openapi.project.Project;
-import org.digma.intellij.plugin.ui.jcef.*;
+import org.digma.intellij.plugin.ui.jcef.BaseEnvJsTemplateBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
diff --git a/src/main/java/org/digma/intellij/plugin/documentation/DocumentationFileEditor.java b/src/main/java/org/digma/intellij/plugin/documentation/DocumentationFileEditor.java
@@ -1,12 +1,10 @@
 package org.digma.intellij.plugin.documentation;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.jcef.JBCefApp;
-import org.digma.intellij.plugin.reload.ReloadObserver;
 import org.digma.intellij.plugin.ui.jcef.*;
 import org.jetbrains.annotations.*;
 
@@ -29,7 +27,7 @@ public DocumentationFileEditor(Project project, DocumentationVirtualFile file) {
         this.file = file;
         jCefComponent = createJcefComponent(project, file);
         if (jCefComponent != null) {
-            ApplicationManager.getApplication().getService(ReloadObserver.class).register(project, DOCUMENTATION_APP_NAME + "." + file.getName(), jCefComponent.getComponent(), this);
+            jCefComponent.registerForReloadObserver(DOCUMENTATION_APP_NAME + "." + file.getName());
         }
     }
 
diff --git a/src/main/java/org/digma/intellij/plugin/jaegerui/JaegerUIFileEditor.java b/src/main/java/org/digma/intellij/plugin/jaegerui/JaegerUIFileEditor.java
@@ -1,12 +1,10 @@
 package org.digma.intellij.plugin.jaegerui;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.jcef.JBCefApp;
-import org.digma.intellij.plugin.reload.ReloadObserver;
 import org.digma.intellij.plugin.ui.jcef.*;
 import org.jetbrains.annotations.*;
 
@@ -29,7 +27,7 @@ public JaegerUIFileEditor(Project project, JaegerUIVirtualFile file) {
         this.file = file;
         jCefComponent = createJcefComponent(project, file);
         if (jCefComponent != null) {
-            ApplicationManager.getApplication().getService(ReloadObserver.class).register(project, JAEGER_UI_APP_NAME + "." + file.getName(), jCefComponent.getComponent(), this);
+            jCefComponent.registerForReloadObserver(JAEGER_UI_APP_NAME + "." + file.getName());
         }
     }
 
diff --git a/src/main/java/org/digma/intellij/plugin/jaegerui/JaegerUiProxyResourceHandler.java b/src/main/java/org/digma/intellij/plugin/jaegerui/JaegerUiProxyResourceHandler.java
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.*;
 
 import java.net.*;
-import java.util.*;
+import java.util.HashMap;
 import java.util.stream.Collectors;
 
 public class JaegerUiProxyResourceHandler implements CefResourceHandler {
diff --git a/src/main/java/org/digma/intellij/plugin/jaegerui/model/incoming/GoToSpanMessage.java b/src/main/java/org/digma/intellij/plugin/jaegerui/model/incoming/GoToSpanMessage.java
@@ -1,10 +1,6 @@
 package org.digma.intellij.plugin.jaegerui.model.incoming;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 
diff --git a/src/main/java/org/digma/intellij/plugin/jaegerui/model/outgoing/Insight.java b/src/main/java/org/digma/intellij/plugin/jaegerui/model/outgoing/Insight.java
@@ -1,11 +1,7 @@
 package org.digma.intellij.plugin.jaegerui.model.outgoing;
 
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/src/main/java/org/digma/intellij/plugin/jaegerui/model/outgoing/SpanData.java b/src/main/java/org/digma/intellij/plugin/jaegerui/model/outgoing/SpanData.java
@@ -1,11 +1,7 @@
 package org.digma.intellij.plugin.jaegerui.model.outgoing;
 
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import java.util.List;
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/SwitchButton.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/SwitchButton.kt
@@ -1,7 +1,14 @@
 package org.digma.intellij.plugin.ui.common
 
 import com.intellij.ui.JBColor
-import java.awt.*
+import java.awt.AlphaComposite
+import java.awt.Color
+import java.awt.Component
+import java.awt.Cursor
+import java.awt.Dimension
+import java.awt.Graphics
+import java.awt.Graphics2D
+import java.awt.RenderingHints
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
 import javax.swing.SwingUtilities
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
+import com.intellij.ui.AncestorListenerAdapter
 import com.intellij.ui.jcef.JBCefBrowser
 import com.intellij.util.Alarm
 import org.apache.maven.artifact.versioning.ComparableVersion
@@ -40,6 +41,7 @@ import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.model.rest.environment.Env
 import org.digma.intellij.plugin.model.rest.navigation.CodeLocation
 import org.digma.intellij.plugin.observability.ObservabilityChanged
+import org.digma.intellij.plugin.reload.ReloadObserver
 import org.digma.intellij.plugin.scope.ScopeChangedEvent
 import org.digma.intellij.plugin.scope.ScopeContext
 import org.digma.intellij.plugin.scope.SpanScope
@@ -55,18 +57,21 @@ import java.util.WeakHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.locks.ReentrantLock
 import javax.swing.JComponent
+import javax.swing.event.AncestorEvent
 
 
 class JCefComponent
 private constructor(
     private val project: Project,
-    parentDisposable: Disposable,
+    private val parentDisposable: Disposable,
     val name: String,
     val jbCefBrowser: JBCefBrowser
 ) : Disposable {
 
     private val logger: Logger = Logger.getInstance(JCefComponent::class.java)
 
+    private var registeredForReloadObserver = false
+
     init {
         val connectionEventAlarm = Alarm(Alarm.ThreadToUse.POOLED_THREAD, parentDisposable)
 
@@ -184,8 +189,11 @@ private constructor(
                                 Log.log(logger::trace, "updating digma installation status on connection lost")
                                 val status = service<LocalInstallationFacade>().getCurrentDigmaInstallationStatusOnConnectionLost()
                                 updateDigmaEngineStatus(jbCefBrowser.cefBrowser, status)
-                            }else{
-                                Log.log(logger::trace, "NOT updating digma installation status on connection lost because operation is running by installation wizard")
+                            } else {
+                                Log.log(
+                                    logger::trace,
+                                    "NOT updating digma installation status on connection lost because operation is running by installation wizard"
+                                )
                             }
 
                         } catch (e: Exception) {
@@ -206,8 +214,11 @@ private constructor(
                                 Log.log(logger::trace, "updating digma installation status on connection gained")
                                 val status = service<LocalInstallationFacade>().getCurrentDigmaInstallationStatusOnConnectionGained()
                                 updateDigmaEngineStatus(jbCefBrowser.cefBrowser, status)
-                            }else{
-                                Log.log(logger::trace, "NOT updating digma installation status on connection gained because operation is running by installation wizard")
+                            } else {
+                                Log.log(
+                                    logger::trace,
+                                    "NOT updating digma installation status on connection gained because operation is running by installation wizard"
+                                )
                             }
                         } catch (e: Exception) {
                             Log.warnWithException(logger, project, e, "error in connectionGained")
@@ -384,6 +395,22 @@ private constructor(
 
     }
 
+
+    //this method needs to be called once per instance of JCefComponent
+    fun registerForReloadObserver(registrationName: String) {
+        //need to register for ReloadObserver after the component has been added to the parent so that all graphics configuration is set.
+        //the event is called multiple times for the same component, but we need to register only once.
+        getComponent().addAncestorListener(object : AncestorListenerAdapter() {
+            override fun ancestorAdded(event: AncestorEvent) {
+                if (!registeredForReloadObserver) {
+                    registeredForReloadObserver = true
+                    service<ReloadObserver>().register(project, registrationName, getComponent(), parentDisposable)
+                }
+            }
+        })
+    }
+
+
     override fun dispose() {
         try {
             jbCefBrowser.jbCefClient.dispose()
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/list/ListCommon.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/list/ListCommon.kt
@@ -3,7 +3,11 @@ package org.digma.intellij.plugin.ui.list
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.JBUI.Borders.empty
 import org.digma.intellij.plugin.ui.common.Laf
-import java.awt.*
+import java.awt.BorderLayout
+import java.awt.Color
+import java.awt.Graphics
+import java.awt.Graphics2D
+import java.awt.RenderingHints
 import javax.swing.JComponent
 import javax.swing.JPanel
 
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/mainapp/MainAppPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/mainapp/MainAppPanel.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityPanel.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/troubleshooting/TroubleshootingPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/troubleshooting/TroubleshootingPanel.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardPanel.kt
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardService.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardService.kt
diff --git a/ui-version b/ui-version

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,15 @@ class ReloadObserver(cs: CoroutineScope) {`
`74`	`74`
`75`	`75`	`fun register(project: Project, appName: String, jcefUiComponent: JComponent, parentDisposable: Disposable) {`
`76`	`76`
	`77`	`+ Log.log(logger::trace, "register called for component {} in project {}", appName, project.name)`
	`78`	`+`
`77`	`79`	`if (GraphicsEnvironment.isHeadless()) {`
`78`	`80`	`Log.log(logger::trace, "GraphicsEnvironment is headless, not registering components")`
`79`	`81`	`return`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`if (!SystemInfo.isMac) {`
`83`		`- Log.log(logger::trace, "system is not mac, not registering components")`
	`85`	`+ Log.log(logger::trace, "system is not mac, not registering component {}", appName)`
`84`	`86`	`return`
`85`	`87`	`}`
`86`	`88`
`@@ -89,9 +91,9 @@ class ReloadObserver(cs: CoroutineScope) {`
`89`	`91`	`jcefUiComponent.addPropertyChangeListener(jcefPropertyChangeListener)`
`90`	`92`
`91`	`93`	`Disposer.register(parentDisposable) {`
	`94`	`+ Log.log(logger::trace, "registration removed for component {} in project {}", appName, project.name)`
`92`	`95`	`jcefUiComponent.removePropertyChangeListener(jcefPropertyChangeListener)`
`93`	`96`	`}`
`94`		`-`
`95`	`97`	`}`
`96`	`98`
`97`	`99`
`@@ -185,6 +187,7 @@ class ReloadObserver(cs: CoroutineScope) {`
`185`	`187`	`}`
`186`	`188`
`187`	`189`	`} catch (e: Throwable) {`
	`190`	`+ Log.warnWithException(logger,e,"error in ReloadObserver.checkChangesAndReload")`
`188`	`191`	`ErrorReporter.getInstance().reportError("ReloadObserver.checkChangesAndReload", e)`
`189`	`192`	`}`
`190`	`193`	`}`