Freeze test (#112)

shalom938 · web-flow · commit b52ac76cefae · 2022-08-02T18:45:28.000+03:00
* test ui freeze

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;

* test ui freeze

Signed-off-by: shalom &lt;shalom938@gmail.com&gt;
diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
@@ -45,4 +45,4 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: digma-intellij-plugin
-        path: build/distributions/digma-intellij-1.0.13.zip
+        path: build/distributions/digma-intellij-1.0.14.zip
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@
 pluginGroup = org.digma.plugins
 pluginName = digma-intellij
 # SemVer format -> https://semver.org
-pluginVersion=1.0.13
+pluginVersion=1.0.14
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
diff --git a/ide-common/build.gradle.kts b/ide-common/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     //from here the model classes can't use it
     api(libs.prettytime)
     api(libs.threeten)
+    api(libs.commons.lang3)
 
 
     implementation(project(":model"))
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java
@@ -6,6 +6,7 @@
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
+import org.apache.commons.lang3.time.StopWatch;
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.model.rest.errordetails.CodeObjectErrorDetails;
 import org.digma.intellij.plugin.model.rest.errors.CodeObjectError;
@@ -37,6 +38,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.concurrent.TimeUnit;
+
 
 public class AnalyticsService implements Disposable {
 
@@ -206,11 +209,14 @@ public AnalyticsInvocationHandler(AnalyticsProvider analyticsProvider,Project pr
 
 
         @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable{
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+
+            var stopWatch = StopWatch.createStarted();
+
             try {
 
                 if (LOGGER.isDebugEnabled()) {
-                    Log.log(LOGGER::debug, "Sending request to {}: args '{}'",method.getName(), argsToString(args));
+                    Log.log(LOGGER::debug, "Sending request to {}: args '{}'", method.getName(), argsToString(args));
                 }
 
                 Object result = method.invoke(analyticsProvider, args);
@@ -241,21 +247,24 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                     LOGGER.warn(e);
                     var message = isConnectionException(e) ? getConnectExceptionMessage(e):getSslExceptionMessage(e);
                     NotificationUtil.notifyError(project,"<html>Connection error with Digma backend api for method "+method.getName()+".<br> "
-                                + message + ".<br> See logs for details.");
+                            + message + ".<br> See logs for details.");
                 }else if (status.isOk()){
                     status.error();
                     Log.log(LOGGER::debug,"Error invoking AnalyticsProvider.{}({}), exception {}", method.getName(), argsToString(args), e.getCause().getMessage());
                     var message = getExceptionMessage(e);
-                    NotificationUtil.notifyError(project,"<html>Error with Digma backend api for method "+method.getName()+".<br> "
+                    NotificationUtil.notifyError(project, "<html>Error with Digma backend api for method " + method.getName() + ".<br> "
                             + message + ".<br> See logs for details.");
 
-                }else if(!status.hadError(e)){
+                } else if (!status.hadError(e)) {
                     status.error();
-                    Log.log(LOGGER::debug,"Error invoking AnalyticsProvider.{}({}), exception {}", method.getName(), argsToString(args), e.getCause().getMessage());
+                    Log.log(LOGGER::debug, "Error invoking AnalyticsProvider.{}({}), exception {}", method.getName(), argsToString(args), e.getCause().getMessage());
                 }
 
 
                 throw new AnalyticsServiceException(e);
+            } finally {
+                stopWatch.stop();
+                Log.log(LOGGER::debug, "Api call {} took {} milliseconds", method.getName(), stopWatch.getTime(TimeUnit.MILLISECONDS));
             }
         }
 
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java
@@ -4,6 +4,7 @@
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
+import org.apache.commons.lang3.time.StopWatch;
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.notifications.NotificationUtil;
 import org.digma.intellij.plugin.persistence.PersistenceData;
@@ -16,6 +17,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class Environment implements EnvironmentsSupplier {
 
@@ -110,7 +112,10 @@ public void refresh() {
         new Task.Backgroundable(project, "Digma: Refreshing environments...") {
             @Override
             public void run(@NotNull ProgressIndicator indicator) {
+                var stopWatch = StopWatch.createStarted();
                 refreshEnvironments();
+                stopWatch.stop();
+                Log.log(LOGGER::debug, "Refresh environments took {} milliseconds", stopWatch.getTime(TimeUnit.MILLISECONDS));
             }
         }.queue();
     }
@@ -165,6 +170,7 @@ private void refreshEnvironments() {
 
     //this method may be called from both ui threads or background threads
     void replaceEnvironmentsList(@NotNull List<String> envs) {
+        Log.log(LOGGER::debug, "replaceEnvironmentsList called");
         this.environments = envs;
         var oldEnv = current;
         if (current == null || !this.environments.contains(current)) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -43,6 +43,7 @@ dependencyResolutionManagement {
             library("okhttp-mockwebserver", "com.squareup.okhttp3", "mockwebserver").versionRef("okhttp")
             library("prettytime", "org.ocpsoft.prettytime", "prettytime").version("5.0.3.Final")
             library("threeten", "org.threeten", "threeten-extra").version("1.7.0")
+            library("commons-lang3", "org.apache.commons", "commons-lang3").version("3.12.0")
         }
     }
 }
diff --git a/src/main/java/org/digma/intellij/plugin/service/EditorInteractionService.java b/src/main/java/org/digma/intellij/plugin/service/EditorInteractionService.java
@@ -2,7 +2,10 @@
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
+import org.apache.commons.lang3.time.StopWatch;
 import org.digma.intellij.plugin.analytics.AnalyticsService;
 import org.digma.intellij.plugin.document.DocumentInfoContainer;
 import org.digma.intellij.plugin.document.DocumentInfoService;
@@ -14,8 +17,11 @@
 import org.digma.intellij.plugin.ui.model.environment.EnvironmentsSupplier;
 import org.digma.intellij.plugin.ui.service.ErrorsViewService;
 import org.digma.intellij.plugin.ui.service.InsightsViewService;
+import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A service to implement the interactions between listeners and UI components.
@@ -25,6 +31,8 @@ public class EditorInteractionService implements CaretContextService, Disposable
 
     private final Logger LOGGER = Logger.getInstance(EditorInteractionService.class);
 
+    private ProgressIndicator runningTask;
+
     private final Project project;
 
     private final InsightsViewService insightsViewService;
@@ -48,6 +56,35 @@ public static CaretContextService getInstance(Project project) {
     @Override
     public void contextChanged(MethodUnderCaret methodUnderCaret) {
 
+        environmentsSupplier.refresh();
+
+        if (runningTask != null) {
+            runningTask.cancel();
+        }
+
+        var stopWatch = StopWatch.createStarted();
+
+        if (SwingUtilities.isEventDispatchThread()) {
+
+            Log.log(LOGGER::debug, "Executing contextChanged in background for {}", methodUnderCaret.getId());
+            new Task.Backgroundable(project, "Digma: Context change...") {
+                @Override
+                public void run(@NotNull ProgressIndicator indicator) {
+                    runningTask = indicator;
+                    contextChangedImpl(methodUnderCaret);
+                }
+            }.queue();
+        } else {
+            Log.log(LOGGER::debug, "Executing contextChanged in current thread for {}", methodUnderCaret.getId());
+            contextChangedImpl(methodUnderCaret);
+        }
+
+        stopWatch.stop();
+        Log.log(LOGGER::debug, "contextChanged took {} milliseconds", stopWatch.getTime(TimeUnit.MILLISECONDS));
+    }
+
+    private void contextChangedImpl(MethodUnderCaret methodUnderCaret) {
+
         Log.log(LOGGER::debug, "contextChanged: {}", methodUnderCaret);
         /*
         Assuming here that we must have a MethodInfo in DocumentInfoService that was populated in an earlier stage.
@@ -62,7 +99,6 @@ public void contextChanged(MethodUnderCaret methodUnderCaret) {
 
          */
 
-        environmentsSupplier.refresh();
 
         if (!methodUnderCaret.isSupportedFile()){
             Log.log(LOGGER::debug, "methodUnderCaret is non supported file {}. ", methodUnderCaret);

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ dependencyResolutionManagement {`
`43`	`43`	`library("okhttp-mockwebserver", "com.squareup.okhttp3", "mockwebserver").versionRef("okhttp")`
`44`	`44`	`library("prettytime", "org.ocpsoft.prettytime", "prettytime").version("5.0.3.Final")`
`45`	`45`	`library("threeten", "org.threeten", "threeten-extra").version("1.7.0")`
	`46`	`+ library("commons-lang3", "org.apache.commons", "commons-lang3").version("3.12.0")`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`	`}`