SLE-271 Use detected language of file for telemetry

SonarSource · Oct 4, 2018 · ccd2b55 · ccd2b55
1 parent 4393fa7
commit ccd2b55
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/...s/src/test/java/org/sonarlint/eclipse/core/internal/telemetry/SonarLintTelemetryTest.java b/...s/src/test/java/org/sonarlint/eclipse/core/internal/telemetry/SonarLintTelemetryTest.java
@@ -143,19 +143,19 @@ public void analysisDoneOnMultipleFiles_should_not_trigger_analysisDoneOnMultipl
   @Test
   public void analysisDoneOnSingleFile_should_trigger_analysisDoneOnSingleFile_when_enabled() {
     when(engine.isEnabled()).thenReturn(true);
-    String fileExtension = "java";
+    String language = "java";
     int time = 123;
-    telemetry.analysisDoneOnSingleFile(fileExtension, time);
+    telemetry.analysisDoneOnSingleFile(language, time);
     verify(engine).isEnabled();
-    verify(engine).analysisDoneOnSingleFile(fileExtension, time);
+    verify(engine).analysisDoneOnSingleLanguage(language, time);
   }
 
   @Test
   public void analysisDoneOnSingleFile_should_not_trigger_analysisDoneOnSingleFile_when_disabled() {
     when(engine.isEnabled()).thenReturn(false);
-    String fileExtension = "java";
+    String language = "java";
     int time = 123;
-    telemetry.analysisDoneOnSingleFile(fileExtension, time);
+    telemetry.analysisDoneOnSingleFile(language, time);
     verify(engine).isEnabled();
     verifyNoMoreInteractions(engine);
   }

diff --git a/....eclipse.core/src/org/sonarlint/eclipse/core/internal/jobs/AbstractAnalyzeProjectJob.java b/....eclipse.core/src/org/sonarlint/eclipse/core/internal/jobs/AbstractAnalyzeProjectJob.java
@@ -205,27 +205,21 @@ private void runAnalysisAndUpdateMarkers(Map<ISonarLintFile, IDocument> docPerFi
     AnalysisResults result = run(config, issuesPerResource, monitor);
     if (!monitor.isCanceled()) {
       updateMarkers(docPerFiles, issuesPerResource, result, triggerType, monitor);
-      updateTelemetry(inputFiles, start);
+      updateTelemetry(result, start);
     }
   }
 
   protected abstract CONFIG prepareAnalysisConfig(Path projectBaseDir, List<ClientInputFile> inputFiles, Map<String, String> mergedExtraProps);
 
-  private static void updateTelemetry(List<ClientInputFile> inputFiles, long start) {
+  private static void updateTelemetry(AnalysisResults result, long start) {
     SonarLintTelemetry telemetry = SonarLintCorePlugin.getTelemetry();
-    if (inputFiles.size() == 1) {
-      telemetry.analysisDoneOnSingleFile(getExtension(inputFiles.iterator().next()), (int) (System.currentTimeMillis() - start));
+    if (result.languagePerFile().size() == 1) {
+      telemetry.analysisDoneOnSingleFile(result.languagePerFile().entrySet().iterator().next().getValue(), (int) (System.currentTimeMillis() - start));
     } else {
       telemetry.analysisDoneOnMultipleFiles();
     }
   }
 
-  private static String getExtension(ClientInputFile next) {
-    String path = next.getPath();
-    int lastDot = path.lastIndexOf('.');
-    return lastDot >= 0 ? path.substring(lastDot + 1) : "";
-  }
-
   private static List<ClientInputFile> buildInputFiles(Path tempDirectory, final Map<ISonarLintFile, IDocument> filesToAnalyze) {
     List<ClientInputFile> inputFiles = new ArrayList<>(filesToAnalyze.size());
 

diff --git a/...nt.eclipse.core/src/org/sonarlint/eclipse/core/internal/telemetry/SonarLintTelemetry.java b/...nt.eclipse.core/src/org/sonarlint/eclipse/core/internal/telemetry/SonarLintTelemetry.java
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 import org.eclipse.core.net.proxy.IProxyData;
 import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -160,9 +161,9 @@ public void analysisDoneOnMultipleFiles() {
     }
   }
 
-  public void analysisDoneOnSingleFile(String fileExtension, int time) {
+  public void analysisDoneOnSingleFile(@Nullable String language, int time) {
     if (enabled()) {
-      telemetry.analysisDoneOnSingleFile(fileExtension, time);
+      telemetry.analysisDoneOnSingleLanguage(language, time);
     }
   }