SLLS-398 Collect usage data separately for Cursor and Windsurf

Author: damien-urruty-sonarsource

src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java

@@ -29,6 +29,7 @@
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -120,9 +121,11 @@ private InitializeParams toInitParams(SonarLintLanguageServerInitializationOptio
       sonarLintUserHome = overriddenUserHome.toString();
       workDir = Path.of(sonarLintUserHome);
     }
+
     return new InitializeParams(
       new ClientConstantInfoDto("Visual Studio Code", userAgent),
-      new TelemetryClientConstantAttributesDto(initializationOptions.productKey(),
+      new TelemetryClientConstantAttributesDto(
+        determineProductKey(appName, initializationOptions.productKey()),
         initializationOptions.productName(),
         initializationOptions.productVersion(),
         ideVersion,
@@ -147,6 +150,16 @@ private InitializeParams toInitParams(SonarLintLanguageServerInitializationOptio
       null);
   }
 
+  static String determineProductKey(String appName, String clientProductKey) {
+    if (appName.toLowerCase(Locale.US).contains("cursor")) {
+      return "cursor";
+    }
+    if (appName.toLowerCase(Locale.US).contains("windsurf")) {
+      return "windsurf";
+    }
+    return clientProductKey;
+  }
+
   @NotNull
   EnumSet<BackendCapability> getBackendCapabilities() {
     var backendCapabilities = EnumSet.of(BackendCapability.SMART_NOTIFICATIONS, BackendCapability.PROJECT_SYNCHRONIZATION,

src/test/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacadeTests.java

@@ -47,7 +47,8 @@ class BackendServiceFacadeTests {
   public static final String SONARLINT_HTTP_CONNECTION_TIMEOUT = "sonarlint.http.connectTimeout";
   public static final String SONARLINT_HTTP_SOCKET_TIMEOUT = "sonarlint.http.socketTimeout";
   SonarLintRpcClientDelegate backend = mock(SonarLintRpcClientDelegate.class);
-  BackendServiceFacade underTest = new BackendServiceFacade(backend, mock(LanguageClientLogger.class), mock(SonarLintExtendedLanguageClient.class), new EnabledLanguages(List.of(), null));
+  BackendServiceFacade underTest = new BackendServiceFacade(backend, mock(LanguageClientLogger.class), mock(SonarLintExtendedLanguageClient.class),
+    new EnabledLanguages(List.of(), null));
 
   @Test
   void shouldReturnDurationInMinutes() {
@@ -179,4 +180,25 @@ void shouldComputeBackendCapabilities_withFlightRecorder() {
       .contains(BackendCapability.FLIGHT_RECORDER);
 
   }
+
+  @Test
+  void should_use_cursor_as_product_key_if_present_in_app_name() {
+    var productKey = BackendServiceFacade.determineProductKey("Cursor", null);
+
+    assertThat(productKey).isEqualTo("cursor");
+  }
+
+  @Test
+  void should_use_windsurf_as_product_key_if_present_in_app_name() {
+    var productKey = BackendServiceFacade.determineProductKey("Windsurf", null);
+
+    assertThat(productKey).isEqualTo("windsurf");
+  }
+
+  @Test
+  void should_use_client_product_key_if_unknown_app_name() {
+    var productKey = BackendServiceFacade.determineProductKey("XXX", "vscode");
+
+    assertThat(productKey).isEqualTo("vscode");
+  }
 }