diff --git a/pom.xml b/pom.xml index e480d24e1..69d774640 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.sonarsource.sonarlint.ls sonarlint-language-server - 3.5-SNAPSHOT + 3.4.2-SNAPSHOT jar SonarLint Language Server SonarLint Language Server @@ -24,7 +24,7 @@ 17 - 10.1.0.77276 + 10.0.3.77436 1.6.10 diff --git a/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java b/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java index 19a9115f9..8229d845c 100644 --- a/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java +++ b/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java @@ -245,7 +245,6 @@ public class SonarLintLanguageServer implements SonarLintExtendedLanguageServer, client, globalLogOutput, backendServiceFacade, openNotebooksCache); vsCodeClient.setBindingManager(bindingManager); this.telemetry = new SonarLintTelemetry(backendServiceFacade, globalLogOutput); - backendServiceFacade.setTelemetry(this.telemetry); this.settingsManager.addListener(telemetry); this.settingsManager.addListener((WorkspaceSettingsChangeListener) bindingManager); this.settingsManager.addListener((WorkspaceFolderSettingsChangeListener) bindingManager); diff --git a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java index 6601a464c..898ce226a 100644 --- a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java +++ b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java @@ -51,7 +51,6 @@ import org.sonarsource.sonarlint.ls.log.LanguageClientLogger; import org.sonarsource.sonarlint.ls.settings.ServerConnectionSettings; import org.sonarsource.sonarlint.ls.settings.SettingsManager; -import org.sonarsource.sonarlint.ls.telemetry.SonarLintTelemetry; import org.sonarsource.sonarlint.ls.telemetry.TelemetryInitParams; public class BackendServiceFacade { @@ -67,7 +66,6 @@ public class BackendServiceFacade { private SettingsManager settingsManager; private TelemetryInitParams telemetryInitParams; private final CountDownLatch initLatch = new CountDownLatch(1); - private SonarLintTelemetry telemetry; public BackendServiceFacade(SonarLintRpcClientDelegate rpcClient, LanguageClientLogger lsLogOutput, SonarLintExtendedLanguageClient client) { this.lsLogOutput = lsLogOutput; @@ -127,7 +125,6 @@ private void initOnce(Map connections) { } private InitializeParams toInitParams(BackendInitParams initParams) { - var telemetryEnabled = telemetry != null && telemetry.enabled(); return new InitializeParams( new ClientConstantInfoDto("Visual Studio Code", initParams.getUserAgent()), new TelemetryClientConstantAttributesDto(initParams.getTelemetryProductKey(), @@ -138,7 +135,7 @@ private InitializeParams toInitParams(BackendInitParams initParams) { getHttpConfiguration(), getSonarCloudAlternativeEnvironment(), new FeatureFlagsDto(true, true, true, - true, initParams.isEnableSecurityHotspots(), true, true, true, telemetryEnabled), + true, initParams.isEnableSecurityHotspots(), true, true, true), initParams.getStorageRoot(), Path.of(initParams.getSonarlintUserHome()), initParams.getEmbeddedPluginPaths(), @@ -221,8 +218,4 @@ public TelemetryInitParams getTelemetryInitParams() { public CountDownLatch getInitLatch() { return initLatch; } - - public void setTelemetry(SonarLintTelemetry telemetry) { - this.telemetry = telemetry; - } }