diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsClient.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsClient.kt index 40b4953902fe..83f0725b366d 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsClient.kt +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsClient.kt @@ -130,19 +130,7 @@ abstract class EventLogSettingsClient { */ fun provideMetadataProductUrl(): String? { val result = logError { - configurationClient.provideMetadataProductUrl() - } - applicationInfo.logger.info("Statistics. Configuration metadata product url: $result") - return result - } - - /** - * @return versioned metadata product url for the required product version, - * null otherwise. Info/warn exception, log exception to 'recorderId.event.log' group. - */ - fun provideMetadataProductUrl(metadataVersion: Int): String? { - val result = logError { - configurationClient.provideMetadataProductUrl(metadataVersion) + configurationClient.provideMetadataProductUrl(applicationInfo.baselineVersion) } applicationInfo.logger.info("Statistics. Configuration metadata product url: $result") return result @@ -168,8 +156,8 @@ abstract class EventLogSettingsClient { /** * @return LogEventMetadataFilter. */ - fun provideBaseEventFilter(metadataVersion: Int? = null): LogEventFilter { - return LogEventMetadataFilter(notNull(loadApprovedGroupsRules(metadataVersion), EventGroupsFilterRules.empty())) + fun provideBaseEventFilter(): LogEventFilter { + return LogEventMetadataFilter(notNull(loadApprovedGroupsRules(), EventGroupsFilterRules.empty())) } /** @@ -198,8 +186,8 @@ abstract class EventLogSettingsClient { } - private fun loadApprovedGroupsRules(metadataVersion: Int? = null): EventGroupsFilterRules? { - val productUrl = if (metadataVersion == null) provideMetadataProductUrl() else provideMetadataProductUrl(metadataVersion) + private fun loadApprovedGroupsRules(): EventGroupsFilterRules? { + val productUrl = provideMetadataProductUrl() if (productUrl == null) return null return EventLogMetadataUtils.loadAndParseGroupsFilterRules(productUrl, applicationInfo.connectionSettings) } diff --git a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java index 6fb2c919c5b9..71f70db0d147 100644 --- a/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java +++ b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java @@ -94,7 +94,7 @@ public class EventLogStatisticsService implements StatisticsService { final boolean isInternal = info.isInternal(); final String productCode = info.getProductCode(); EventLogBuildType defaultBuildType = getDefaultBuildType(info.isEAP()); - LogEventFilter baseFilter = settings.provideBaseEventFilter(info.getBaselineVersion()); + LogEventFilter baseFilter = settings.provideBaseEventFilter(); MachineId machineId = getActualOrDisabledMachineId(config.getMachineId(), settings); try {