Merge branch 'main' into feature/simplified-insights

Author: kshmidt-digma

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

@@ -616,9 +616,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 // will not explode the logs, so we don't see all the exceptions in the log as they happen.
                 //this message will explode the idea.log if user has digma trace logging on and no backend running,
                 // which shouldn't happen, users should not have digma trace logging on all the time.
-                var realCause = ExceptionUtils.findFirstRealExceptionCause(e);
-                exception = Objects.requireNonNullElse(realCause, e);
-                Log.log(LOGGER::trace, "got exception in AnalyticsService {}", Objects.requireNonNullElse(realCause, e));
+                var realCause = ExceptionUtils.findRootCause(e);
+                exception = realCause;
+                Log.log(LOGGER::trace, "got exception in AnalyticsService {}", realCause);
 
 
                 if (methodsThatShouldNotChangeConnectionStatus.contains(method.getName())) {

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

@@ -1,5 +1,6 @@
 package org.digma.intellij.plugin.common;
 
+import com.google.common.base.Throwables;
 import org.digma.intellij.plugin.analytics.*;
 import org.jetbrains.annotations.*;
 
@@ -8,7 +9,7 @@
 import java.lang.reflect.*;
 import java.net.*;
 import java.net.http.*;
-import java.util.*;
+import java.util.List;
 
 public class ExceptionUtils {
 
@@ -55,31 +56,38 @@ public static Throwable findFirstNonWrapperException(@NotNull Throwable throwabl
         return cause;
     }
 
-    @Nullable
-    public static Throwable findFirstRealExceptionCause(@NotNull Throwable throwable) {
-        Throwable cause = throwable;
-        while (cause instanceof InvocationTargetException || cause instanceof UndeclaredThrowableException) {
 
-            cause = cause.getCause();
-            //special treatment for AnalyticsProviderException, AnalyticsProviderException.cause may be null
-            if (cause instanceof AnalyticsProviderException analyticsProviderException && analyticsProviderException.getCause() != null) {
-                cause = analyticsProviderException.getCause();
-            }
+    @NotNull
+    public static Throwable findRootCause(@NotNull Throwable throwable) {
+
+        try {
+            return Throwables.getRootCause(throwable);
+        } catch (Throwable e) {
+            return throwable;
         }
 
-        return cause;
+        //this code finds root cause without throwing exception in loop like guava does
+//        Throwable cause = throwable;
+//        Throwable latestNonNullCause = null;
+//        while (cause != null && cause != latestNonNullCause) {
+//            latestNonNullCause = cause;
+//            cause = cause.getCause();
+//        }
+//
+//        return latestNonNullCause;
     }
 
+
     @NotNull
-    public static Class<? extends Throwable> findFirstRealExceptionCauseType(@NotNull Throwable throwable) {
-        var realCause = findFirstRealExceptionCause(throwable);
-        return Objects.requireNonNullElse(realCause, throwable).getClass();
+    public static Class<? extends Throwable> findRootCauseType(@NotNull Throwable throwable) {
+        var realCause = findRootCause(throwable);
+        return realCause.getClass();
     }
 
 
     @NotNull
-    public static String findFirstRealExceptionCauseTypeName(@NotNull Throwable throwable) {
-        return findFirstRealExceptionCauseType(throwable).getName();
+    public static String findRootCauseTypeName(@NotNull Throwable throwable) {
+        return findRootCauseType(throwable).getName();
     }
 
 
@@ -104,8 +112,6 @@ public static Throwable findAuthenticationException(@NotNull Throwable throwable
     }
 
 
-
-
     public static boolean isAnyConnectionException(@NotNull Throwable e) {
         return isConnectionException(e) || isSslConnectionException(e);
     }
@@ -217,8 +223,8 @@ public static boolean isEOFException(@NotNull Throwable e) {
     @NotNull
     public static String getNonEmptyMessage(@NotNull Throwable exception) {
 
-        var realCause = findFirstRealExceptionCause(exception);
-        if (realCause != null && realCause.getMessage() != null) {
+        var realCause = findRootCause(exception);
+        if (realCause.getMessage() != null) {
             return realCause.getMessage();
         }
 

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

@@ -8,9 +8,8 @@ import com.intellij.openapi.project.ProjectManager
 import com.intellij.util.Alarm
 import org.digma.intellij.plugin.common.DisposableAdaptor
 import org.digma.intellij.plugin.common.EDT
-import org.digma.intellij.plugin.common.ExceptionUtils
 import org.digma.intellij.plugin.common.ExceptionUtils.findConnectException
-import org.digma.intellij.plugin.common.ExceptionUtils.findFirstRealExceptionCause
+import org.digma.intellij.plugin.common.ExceptionUtils.findRootCause
 import org.digma.intellij.plugin.common.ExceptionUtils.findSslException
 import org.digma.intellij.plugin.common.ExceptionUtils.getNonEmptyMessage
 import org.digma.intellij.plugin.common.ExceptionUtils.isEOFException
@@ -212,20 +211,20 @@ class ApiErrorHandler : DisposableAdaptor {
         }
     }
 
-    fun handleAuthManagerCantRefreshError(throwable: Throwable, project: Project?) {
+    fun handleAuthManagerCantRefreshError(throwable: Throwable) {
         //todo: currently only reporting
         Log.warnWithException(logger, throwable, "error in AuthManager {}", throwable)
 
         val message = if (throwable is AuthenticationException) {
             throwable.message
         } else {
-            ExceptionUtils.getNonEmptyMessage(throwable)
+            getNonEmptyMessage(throwable)
         }
 
         doForAllProjects { p ->
             EDT.ensureEDT {
                 NotificationUtil.notifyWarning(
-                    project, "<html>Error with Digma backend " + message + ".<br> "
+                    p, "<html>Error with Digma backend " + message + ".<br> "
                             + message + ".<br> See logs for details."
                 )
             }
@@ -441,7 +440,7 @@ class ApiErrorHandler : DisposableAdaptor {
 
 
         fun addIfNewError(e: Exception): Boolean {
-            val cause = findFirstRealExceptionCause(e)
+            val cause = findRootCause(e)
             val errorName = Objects.requireNonNullElse(cause, e)?.javaClass?.name.toString()
             return errors.add(errorName)
         }

ide-common/src/main/kotlin/org/digma/intellij/plugin/auth/AuthInfoChangeListener.kt

@@ -1,6 +1,8 @@
 package org.digma.intellij.plugin.auth
 
-data class AuthInfo(val userId: String?);
+//AuthManager relies on equality of AuthInfo to decide if to fire authInfoChanged event.
+// remember that when changing this class
+data class AuthInfo(val userId: String?, val accountId: String?)
 
 fun interface AuthInfoChangeListener {
     fun authInfoChanged(authInfo: AuthInfo)