Recreate branch due to git pilot error

Author: stevemessick

flutter-idea/build.gradle.kts

@@ -77,6 +77,10 @@ dependencies {
     testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/artifacts/ideaIC/plugins/git4idea/lib",
                          "include" to listOf("*.jar"))))
   }
+  compileOnly("com.google.guava:guava:31.0.1-jre")
+  compileOnly("com.google.code.gson:gson:2.9.0")
+  testImplementation("com.google.guava:guava:31.0.1-jre")
+  testImplementation("com.google.code.gson:gson:2.9.0")
   compileOnly(fileTree(mapOf("dir" to "${project.rootDir}/third_party/lib/jxbrowser",
                        "include" to listOf("*.jar"))))
   testImplementation(fileTree(mapOf("dir" to "${project.rootDir}/third_party/lib/jxbrowser",

flutter-idea/src/io/flutter/FlutterInitializer.java

@@ -25,7 +25,9 @@
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.jetbrains.lang.dart.analyzer.DartAnalysisServerService;
 import io.flutter.analytics.Analytics;
+import io.flutter.analytics.FlutterAnalysisServerListener;
 import io.flutter.analytics.ToolWindowTracker;
 import io.flutter.android.IntelliJAndroidSdk;
 import io.flutter.bazel.WorkspaceCache;
@@ -206,15 +208,15 @@ public void moduleAdded(@NotNull Project project, @NotNull Module module) {
             }
           }
         });
+      boolean finalHasFlutterModule = hasFlutterModule;
       //noinspection DialogTitleCapitalization
       notification.addAction(new AnAction("Sounds good!") {
         @Override
         public void actionPerformed(@NotNull AnActionEvent event) {
           notification.expire();
-          final Analytics analytics = getAnalytics();
           // We only track for flutter projects.
-          if (FlutterModuleUtils.declaresFlutter(project)) {
-            ToolWindowTracker.track(project, analytics);
+          if (finalHasFlutterModule) {
+            enableAnalytics(project);
           }
         }
       });
@@ -230,12 +232,17 @@ public void actionPerformed(@NotNull AnActionEvent event) {
     }
     else {
       // We only track for flutter projects.
-      if (FlutterModuleUtils.declaresFlutter(project)) {
-        ToolWindowTracker.track(project, getAnalytics());
+      if (hasFlutterModule) {
+        enableAnalytics(project);
       }
     }
   }
 
+  private static void enableAnalytics(@NotNull Project project) {
+    ToolWindowTracker.track(project, getAnalytics());
+    DartAnalysisServerService.getInstance(project).addAnalysisServerListener(FlutterAnalysisServerListener.getInstance(project));
+  }
+
   private void initializeToolWindows(@NotNull Project project) {
     // Start watching for Flutter debug active events.
     FlutterViewFactory.init(project);

flutter-idea/src/io/flutter/analytics/Analytics.java

@@ -75,7 +75,7 @@ public void setCanSend(boolean value) {
   /**
    * Public for testing.
    */
-  public void setTransport(Transport transport) {
+  public void setTransport(@NotNull Transport transport) {
     this.transport = transport;
   }
 
@@ -85,38 +85,56 @@ public void sendScreenView(@NotNull String viewName) {
     sendPayload("screenview", args, null);
   }
 
-  public void sendEvent(String category, String action) {
+  public void sendEvent(@NotNull String category, @NotNull String action) {
     sendEvent(category, action, null);
   }
 
-  public void sendEvent(String category, String action, @Nullable FlutterSdk flutterSdk) {
+  public void sendEvent(@NotNull String category, @NotNull String action, @Nullable FlutterSdk flutterSdk) {
     final Map<String, String> args = new HashMap<>();
     args.put("ec", category);
     args.put("ea", action);
     sendPayload("event", args, flutterSdk);
   }
 
-  public void sendEventMetric(String category, String action, int value) {
+  public void sendEventWithSdk(@NotNull String category, @NotNull String action, @NotNull String sdkVersion) {
+    final Map<String, String> args = new HashMap<>();
+    args.put("ec", category);
+    args.put("ea", action);
+    sendPayload("event", args, null, sdkVersion);
+  }
+
+  public void sendEventMetric(@NotNull String category, @NotNull String action, int value) {
     final Map<String, String> args = new HashMap<>();
     args.put("ec", category);
     args.put("ea", action);
     args.put("ev", Integer.toString(value));
     sendPayload("event", args, null);
   }
 
-  public void sendTiming(String category, String variable, long timeMillis) {
+  public void sendEvent(@NotNull String category, @NotNull String action, @NotNull String label, @NotNull String value) {
+    final Map<String, String> args = new HashMap<>();
+    args.put("ec", category);
+    args.put("ea", action);
+    if (!label.isEmpty()) {
+      args.put("el", label);
+    }
+    args.put("ev", value);
+    sendPayload("event", args, null);
+  }
+
+  public void sendTiming(@NotNull String category, @NotNull String variable, long timeMillis) {
     final Map<String, String> args = new HashMap<>();
     args.put("utc", category);
     args.put("utv", variable);
     args.put("utt", Long.toString(timeMillis));
     sendPayload("timing", args, null);
   }
 
-  public void sendExpectedException(String location, Throwable throwable) {
+  public void sendExpectedException(@NotNull String location, @NotNull Throwable throwable) {
     sendEvent("expected-exception", location + ":" + throwable.getClass().getName());
   }
 
-  public void sendException(String throwableText, boolean isFatal) {
+  public void sendException(@NotNull String throwableText, boolean isFatal) {
     String description = throwableText;
     description = description.replaceAll("com.intellij.openapi.", "c.i.o.");
     description = description.replaceAll("com.intellij.", "c.i.");
@@ -133,6 +151,10 @@ public void sendException(String throwableText, boolean isFatal) {
   }
 
   private void sendPayload(@NotNull String hitType, @NotNull Map<String, String> args, @Nullable FlutterSdk flutterSdk) {
+    sendPayload(hitType, args, flutterSdk, null);
+  }
+
+  private void sendPayload(@NotNull String hitType, @NotNull Map<String, String> args, @Nullable FlutterSdk flutterSdk, @Nullable String sdkVersion) {
     if (!canSend()) {
       return;
     }
@@ -156,6 +178,8 @@ private void sendPayload(@NotNull String hitType, @NotNull Map<String, String> a
       if (flutterVersion.getVersionText() != null) {
         args.put("cd2", flutterVersion.getVersionText());
       }
+    } else if (sdkVersion != null) {
+      args.put("cd2", sdkVersion);
     }
 
     // Record whether this client uses bazel.
@@ -259,4 +283,4 @@ public void send(String url, Map<String, String> values) {
       });
     }
   }
-}
+}

flutter-idea/src/io/flutter/analytics/DartCompletionTimerListener.java

@@ -0,0 +1,51 @@
+package io.flutter.analytics;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+
+import com.jetbrains.lang.dart.ide.completion.DartCompletionTimerExtension;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+
+/**
+ * Implementation of the {@link DartCompletionTimerExtension} which allows the Flutter plugin to
+ * measure the total time to present a code completion to the user.
+ */
+public class DartCompletionTimerListener extends DartCompletionTimerExtension {
+  @Nullable FlutterAnalysisServerListener dasListener;
+  @Nullable Long startTimeMS;
+
+  @Override
+  public void dartCompletionStart() {
+    if (dasListener == null) {
+      Project project = ProjectManager.getInstance().getDefaultProject();
+      dasListener = FlutterAnalysisServerListener.getInstance(project);
+    }
+    startTimeMS = Instant.now().toEpochMilli();
+  }
+
+  @Override
+  public void dartCompletionEnd() {
+    if (dasListener != null && startTimeMS != null) {
+      long durationTimeMS = Instant.now().toEpochMilli() - startTimeMS;
+      dasListener.logE2ECompletionSuccessMS(durationTimeMS); // test: logE2ECompletionSuccessMS()
+      startTimeMS = null;
+    }
+  }
+
+  /**
+   * The parameters match those of {@link org.dartlang.analysis.server.protocol.RequestError}, they
+   * are not used currently because our hypothesis is that this method will never be called.
+   */
+  @Override
+  public void dartCompletionError(
+    @NotNull String code, @NotNull String message, @NotNull String stackTrace) {
+    if (dasListener != null && startTimeMS != null) {
+      long durationTimeMS = Instant.now().toEpochMilli() - startTimeMS;
+      dasListener.logE2ECompletionErrorMS(durationTimeMS); // test: logE2ECompletionErrorMS()
+      startTimeMS = null;
+    }
+  }
+}