Skip to content

Commit

Permalink
Change product ID in Ecosystem usage reports (#430)
Browse files Browse the repository at this point in the history
Removed the plugin version from the product ID in the Ecosystem usage reports.
  • Loading branch information
asafgabai authored Oct 12, 2023
1 parent f68f02e commit 3a1f9da
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/jfrog/ide/idea/utils/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
public class Utils {

public static final Path HOME_PATH = Paths.get(System.getProperty("user.home"), ".jfrog-idea-plugin");
public static final String PRODUCT_ID = "jfrog-idea-plugin/";
public static final String PRODUCT_ID = "jfrog-idea-plugin";
public static final String PLUGIN_ID = "org.jfrog.idea";

public static Path getProjectBasePath(Project project) {
Expand Down Expand Up @@ -76,12 +76,12 @@ public static void sendUsageReport(String techName) {
return;
}
String pluginVersion = jfrogPlugin.getVersion();
ClientIdUsageReporter artifactoryUsageReporter = new ClientIdUsageReporter(PRODUCT_ID + pluginVersion, featureIdArray, log);
ClientIdUsageReporter artifactoryUsageReporter = new ClientIdUsageReporter(PRODUCT_ID + "/" + pluginVersion, featureIdArray, log);
EcosystemUsageReporter ecosystemUsageReporter = new EcosystemUsageReporter(log);
String artifactoryUrl = resolveArtifactoryUrl(serverConfig.getArtifactoryUrl(), serverConfig.getUrl());
try {
artifactoryUsageReporter.reportUsage(artifactoryUrl, serverConfig.getUsername(), serverConfig.getPassword(), serverConfig.getAccessToken(), serverConfig.getProxyConfForTargetUrl(artifactoryUrl), createSSLContext(serverConfig), log);
ecosystemUsageReporter.reportUsage(new UsageReport(PRODUCT_ID + pluginVersion, new String(DigestUtils.md5(serverConfig.getXrayUrl())), artifactoryUsageReporter.getUniqueClientId(), featureIdArray), createSSLContext(serverConfig));
ecosystemUsageReporter.reportUsage(new UsageReport(PRODUCT_ID, new String(DigestUtils.md5(serverConfig.getXrayUrl())), artifactoryUsageReporter.getUniqueClientId(), featureIdArray), createSSLContext(serverConfig));
} catch (IOException | RuntimeException | NoSuchAlgorithmException | KeyStoreException |
KeyManagementException e) {
log.debug("Usage report failed: " + ExceptionUtils.getRootCauseMessage(e));
Expand Down

0 comments on commit 3a1f9da

Please sign in to comment.