MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DO-1093: receive metadata by baseline version

Browse Source 
GitOrigin-RevId: 0cb4d8ea83e07bb04fdc949897767dd29e6faed8
This commit is contained in:
Liubov Afanaseva
2025-09-30 10:58:52 +00:00
committed by intellij-monorepo-bot
parent ed95556209
commit 58538583ae
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogSettingsClient.kt
+5 -17
View File
@@ -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<EventLogBuild>? {
val productUrl = if (metadataVersion == null) provideMetadataProductUrl() else provideMetadataProductUrl(metadataVersion)
private fun loadApprovedGroupsRules(): EventGroupsFilterRules<EventLogBuild>? {
val productUrl = provideMetadataProductUrl()
if (productUrl == null) return null
return EventLogMetadataUtils.loadAndParseGroupsFilterRules(productUrl, applicationInfo.connectionSettings)
}
platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/connection/EventLogStatisticsService.java
+1 -1
View File
@@ -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 {