Merge pull request #2298 from digma-ai/fix-force-update

fix force update Closes #2266

Author: shalom938

ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java

@@ -125,12 +125,30 @@ synchronized void replaceClient(String url) {
         Log.log(LOGGER::debug, "AuthManager.withAuth successfully wrapped AnalyticsProvider for url {}", url);
         analyticsProviderProxy = newAnalyticsProviderProxy(analyticsProvider);
 
+        tryRegisterServerVersionEarly();
         environment.refreshNowOnBackground();
 
         project.getMessageBus().syncPublisher(ApiClientChangedEvent.getAPI_CLIENT_CHANGED_TOPIC()).apiClientChanged(url);
 
     }
 
+    //usually BackendInfoHolder registers the server version,but it depends on AnalyticsService.
+    // it may happen that getEnvironments will fail and register error but there will be no server version yet
+    // in ActivityMonitor.
+    // this is an attempt to register server version as early as possible before any errors occurs.
+    // BackendInfoHolder will continue monitoring the server info for changes.
+    private void tryRegisterServerVersionEarly() {
+        Backgroundable.executeOnPooledThread(() -> {
+            try {
+                var about = getAbout();
+                if (about != null) {
+                    ActivityMonitor.getInstance(project).registerServerInfo(about);
+                }
+            } catch (Throwable e) {
+                Log.debugWithException(LOGGER, project, e, "getAbout failed");
+            }
+        });
+    }
 
 
     public List<Env> getEnvironments() {
@@ -691,15 +709,15 @@ private void handleInvocationTargetException(InvocationTargetException invocatio
             } else if (isSslConnectionException(invocationTargetException)) {
                 message = getSslExceptionMessage(invocationTargetException);
             } else {
-                message = invocationTargetException.getCause() != null ? invocationTargetException.getCause().getMessage() : invocationTargetException.getMessage();
+                message = ExceptionUtils.getNonEmptyMessage(invocationTargetException);
             }
 
             if (message == null) {
                 message = invocationTargetException.toString();
             }
 
 
-            ErrorReporter.getInstance().reportAnalyticsServiceError(project, "AnalyticsInvocationHandler.invoke." + message, method.getName(), invocationTargetException, isConnectionException);
+            ErrorReporter.getInstance().reportAnalyticsServiceError(project, "AnalyticsInvocationHandler.invoke", method.getName(), invocationTargetException, isConnectionException);
 
 
             if (isConnectionOK()) {

ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsComponent.java

@@ -4,7 +4,9 @@
 import com.intellij.ui.*;
 import com.intellij.ui.components.*;
 import com.intellij.util.ui.FormBuilder;
+import org.digma.intellij.plugin.analytics.BackendInfoHolder;
 import org.digma.intellij.plugin.auth.account.*;
+import org.digma.intellij.plugin.common.ProjectUtilsKt;
 import org.jetbrains.annotations.*;
 
 import javax.swing.*;
@@ -160,6 +162,15 @@ public boolean verify(JComponent input) {
         var userIdLabel = new JBLabel(userId);
         userIdLabel.setCopyable(true);
 
+        var backendVersionLabel = new JBLabel("Unknown");
+        var someProject = ProjectUtilsKt.findActiveProject();
+        if (someProject != null) {
+            var about = BackendInfoHolder.getInstance(someProject).getAbout();
+            if (about != null) {
+                backendVersionLabel.setText(about.getApplicationVersion());
+            }
+        }
+
         myMainPanel = FormBuilder.createFormBuilder()
                 .addLabeledComponent(myUrlLabel, myApiUrlText, 1, false)
                 .addLabeledComponent(new JBLabel("Api token:"), myApiToken, 1, false)
@@ -174,6 +185,7 @@ public boolean verify(JComponent input) {
                 .addLabeledComponent("Extended Observability Exclude (beta)", extendedObservabilityExcludeTextBox, 1, false)
                 .addComponent(resetButton)
                 .addLabeledComponent(new JBLabel("User Id"), userIdLabel)
+                .addLabeledComponent(new JBLabel("Backend version"), backendVersionLabel)
                 .addComponentFillVertically(new JPanel(), 0)
                 .getPanel();
     }

ide-common/src/main/kotlin/org/digma/intellij/plugin/analytics/BackendInfoHolder.kt

@@ -41,6 +41,18 @@ class BackendInfoHolder(val project: Project) : DisposableAdaptor {
 
 
     init {
+
+        //update now so that about exists as part of the object instantiation
+        updateAboutInBackgroundNowWithTimeout()
+
+        @Suppress("UnstableApiUsage")
+        disposingScope().launch {
+            while (isActive) {
+                update()
+                delay(1.minutes.inWholeMilliseconds)
+            }
+        }
+
         project.messageBus.connect(this)
             .subscribe(
                 AnalyticsServiceConnectionEvent.ANALYTICS_SERVICE_CONNECTION_EVENT_TOPIC,
@@ -61,14 +73,6 @@ class BackendInfoHolder(val project: Project) : DisposableAdaptor {
                 updateInBackground()
             })
 
-
-        @Suppress("UnstableApiUsage")
-        disposingScope().launch {
-            while (isActive) {
-                update()
-                delay(1.minutes.inWholeMilliseconds)
-            }
-        }
     }
 
 
@@ -83,11 +87,14 @@ class BackendInfoHolder(val project: Project) : DisposableAdaptor {
     //must be called in background coroutine
     private fun update() {
         try {
+            Log.log(logger::trace, "updating backend info")
             aboutRef.set(AnalyticsService.getInstance(project).about)
             aboutRef.get()?.let {
                 ActivityMonitor.getInstance(project).registerServerInfo(it)
             }
+            Log.log(logger::trace, "backend info updated {}", aboutRef.get())
         } catch (e: Throwable) {
+            Log.warnWithException(logger, project, e, "error in update")
             val isConnectionException = ExceptionUtils.isAnyConnectionException(e)
             if (!isConnectionException) {
                 ErrorReporter.getInstance().reportError(project, "BackendInfoHolder.update", e)
@@ -126,22 +133,33 @@ class BackendInfoHolder(val project: Project) : DisposableAdaptor {
 
 
     private fun getAboutInBackgroundNowWithTimeout(): AboutResult? {
+        updateAboutInBackgroundNowWithTimeout()
+        return aboutRef.get()
+    }
+
+
+    private fun updateAboutInBackgroundNowWithTimeout() {
+
+        Log.log(logger::trace, "updating backend info in background with timeout")
 
         @Suppress("UnstableApiUsage")
         val deferred = disposingScope().async {
             update()
         }
 
-        return runBlocking {
+        runBlocking {
             try {
-                withTimeout(5000) {
+                withTimeout(2000) {
                     deferred.await()
                 }
-                aboutRef.get()
             } catch (e: Throwable) {
-                null
+                Log.warnWithException(logger, project, e, "error in updateAboutInBackgroundNowWithTimeout")
+                ErrorReporter.getInstance().reportError("BackendInfoHolder.updateAboutInBackgroundNowWithTimeout", e)
             }
         }
+
+        Log.log(logger::trace, "backend info updated in background with timeout {}", aboutRef.get())
     }
 
+
 }

ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.datetime.toJavaInstant
 import org.digma.intellij.plugin.analytics.BackendConnectionMonitor
-import org.digma.intellij.plugin.analytics.BackendInfoHolder
 import org.digma.intellij.plugin.common.ExceptionUtils
 import org.digma.intellij.plugin.common.UniqueGeneratedUserId
 import org.digma.intellij.plugin.common.objectToJson
@@ -71,6 +70,7 @@ class ActivityMonitor(private val project: Project) : Disposable {
     }
 
 
+    private var serverInfo: AboutResult? = null
     private val simpleEventInterceptor = SimpleEventInterceptor(project)
 
     private val userId: String = UniqueGeneratedUserId.userId
@@ -333,7 +333,7 @@ class ActivityMonitor(private val project: Project) : Disposable {
                 "ide.version" to ideVersion,
                 "ide.build" to ideBuildNumber,
                 "plugin.version" to pluginVersion,
-                "server.version" to BackendInfoHolder.getInstance(project).getAbout()?.applicationVersion.toString(),
+                "server.version" to serverInfo?.applicationVersion.toString(),
                 "user.type" to if (isDevUser) "internal" else "external"
             )
 
@@ -363,9 +363,16 @@ class ActivityMonitor(private val project: Project) : Disposable {
                 details
             )
         } catch (e: Exception) {
+            val exceptionStackTrace = e.let {
+                val stringWriter = StringWriter()
+                it.printStackTrace(PrintWriter(stringWriter))
+                stringWriter.toString()
+            }
             registerCustomEvent(
                 "error in registerError", mapOf(
-                    "message" to e.message.toString()
+                    "original message" to message,
+                    "exception type" to e.javaClass,
+                    "stack trace" to exceptionStackTrace
                 )
             )
         }
@@ -413,7 +420,7 @@ class ActivityMonitor(private val project: Project) : Disposable {
                     "ide.version" to ideVersion,
                     "ide.build" to ideBuildNumber,
                     "plugin.version" to pluginVersion,
-                    "server.version" to BackendInfoHolder.getInstance(project).getAbout()?.applicationVersion.toString(),
+                    "server.version" to serverInfo?.applicationVersion.toString(),
                     "user.type" to if (isDevUser) "internal" else "external"
                 )
             )
@@ -656,13 +663,17 @@ class ActivityMonitor(private val project: Project) : Disposable {
 
 
     fun registerServerInfo(serverInfo: AboutResult) {
-        postHog?.set(
-            userId,
-            mapOf(
-                "server.version" to serverInfo.applicationVersion,
-                "server.deploymentType" to (serverInfo.deploymentType ?: BackendDeploymentType.Unknown)
+        //AboutResult is a data class and equals should work correctly
+        if (this.serverInfo != serverInfo) {
+            this.serverInfo = serverInfo
+            postHog?.set(
+                userId,
+                mapOf(
+                    "server.version" to serverInfo.applicationVersion,
+                    "server.deploymentType" to (serverInfo.deploymentType ?: BackendDeploymentType.Unknown)
+                )
             )
-        )
+        }
     }