Skip to content

Commit cfb68e5

Browse files
authored
JS-552 Stop sending telemtry under javascript.dependency.* (#5098)
1 parent 12763d6 commit cfb68e5

3 files changed

Lines changed: 2 additions & 19 deletions

File tree

sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/analysis/PluginTelemetry.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@
1717
package org.sonar.plugins.javascript.analysis;
1818

1919
import java.util.HashMap;
20-
import java.util.stream.Collectors;
2120
import org.slf4j.Logger;
2221
import org.slf4j.LoggerFactory;
2322
import org.sonar.api.batch.sensor.SensorContext;
2423
import org.sonar.api.utils.Version;
2524
import org.sonar.plugins.javascript.bridge.BridgeServer;
26-
import org.sonar.plugins.javascript.bridge.BridgeServer.Dependency;
2725

2826
public class PluginTelemetry {
2927

3028
private static final Logger LOG = LoggerFactory.getLogger(PluginTelemetry.class);
3129
private static final String KEY_PREFIX = "javascript.";
32-
private static final String DEPENDENCY_PREFIX = KEY_PREFIX + "dependency.";
3330
private static final String RUNTIME_PREFIX = KEY_PREFIX + "runtime.";
3431

3532
private final BridgeServer server;
@@ -51,14 +48,7 @@ void reportTelemetry() {
5148
return;
5249
}
5350
var telemetry = server.getTelemetry();
54-
var keyMapToSave = new HashMap<>(
55-
telemetry
56-
.dependencies()
57-
.stream()
58-
.collect(
59-
Collectors.toMap(dependency -> DEPENDENCY_PREFIX + dependency.name(), Dependency::version)
60-
)
61-
);
51+
var keyMapToSave = new HashMap<String, String>();
6252
keyMapToSave.put(
6353
RUNTIME_PREFIX + "node-executable-origin",
6454
telemetry.runtimeTelemetry().nodeExecutableOrigin()

sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/analysis/JavaScriptEslintBasedSensorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ void should_add_telemetry_for_scanner_analysis() throws Exception {
779779
createInputFile(context);
780780
sensor.execute(context);
781781
assertThat(logTester.logs(Level.DEBUG)).contains(
782-
"Telemetry saved: {javascript.runtime.node-executable-origin=embedded, javascript.runtime.major-version=22, javascript.dependency.pkg1=1.1.0, javascript.runtime.version=22.9}"
782+
"Telemetry saved: {javascript.runtime.major-version=22, javascript.runtime.version=22.9, javascript.runtime.node-executable-origin=embedded}"
783783
);
784784
}
785785

sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/analysis/PluginTelemetryTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ void shouldNotReportIfApiVersionIsLessThan109() {
6161
verify(ctx, never()).addTelemetryProperty(anyString(), anyString());
6262
}
6363

64-
@Test
65-
void shouldReport() {
66-
when(ctx.runtime().getApiVersion()).thenReturn(Version.create(10, 9));
67-
pluginTelemetry.reportTelemetry();
68-
verify(ctx).addTelemetryProperty("javascript.dependency.pkg1", "1.0.0");
69-
}
70-
7164
@Test
7265
void shouldReportRuntimeTelemetry() {
7366
when(ctx.runtime().getApiVersion()).thenReturn(Version.create(10, 9));

0 commit comments

Comments
 (0)