From 2ab121c260e4bb25f0b45ce7b1613258ac05d80b Mon Sep 17 00:00:00 2001 From: Nikita Kudrin Date: Thu, 14 Mar 2024 13:49:51 +0200 Subject: [PATCH] [telemetry] Renaming GitOrigin-RevId: ace5a5ee4673adc4889a09dc9bf86c33d08ab5c2 --- ...ricsJsonImporter.kt => OpenTelemetryMetersJsonImporter.kt} | 2 +- .../platform/diagnostic/telemetry/MetricsImporterUtils.kt | 2 +- tools/intellij.tools.ide.metrics.collector/README.md | 2 +- .../ide/metrics/collector/OpenTelemetryJsonMeterCollector.kt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename platform/diagnostic/telemetry.exporters/src/meters/{MetricsJsonImporter.kt => OpenTelemetryMetersJsonImporter.kt} (99%) diff --git a/platform/diagnostic/telemetry.exporters/src/meters/MetricsJsonImporter.kt b/platform/diagnostic/telemetry.exporters/src/meters/OpenTelemetryMetersJsonImporter.kt similarity index 99% rename from platform/diagnostic/telemetry.exporters/src/meters/MetricsJsonImporter.kt rename to platform/diagnostic/telemetry.exporters/src/meters/OpenTelemetryMetersJsonImporter.kt index ed48165a0d89..154eccb4373d 100644 --- a/platform/diagnostic/telemetry.exporters/src/meters/MetricsJsonImporter.kt +++ b/platform/diagnostic/telemetry.exporters/src/meters/OpenTelemetryMetersJsonImporter.kt @@ -21,7 +21,7 @@ import kotlin.io.path.fileSize * Imports metrics exported by com.intellij.platform.diagnostic.telemetry.exporters.meters.TelemetryMeterJsonExporter */ @ApiStatus.Internal -object MetricsJsonImporter { +object OpenTelemetryMetersJsonImporter { fun fromJsonFile(jsonPath: Path): Collection { val module = SimpleModule().apply { addDeserializer(MetricData::class.java, MetricDataDeserializer()) } diff --git a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/MetricsImporterUtils.kt b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/MetricsImporterUtils.kt index d11ca0a2dec3..cb9a01bdb6e2 100644 --- a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/MetricsImporterUtils.kt +++ b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/MetricsImporterUtils.kt @@ -10,7 +10,7 @@ import java.nio.file.Path import kotlin.io.path.bufferedReader @ApiStatus.Internal -@Deprecated("Use com.intellij.platform.diagnostic.telemetry.exporters.meters.MetricsJsonImporter") +@Deprecated("Use com.intellij.platform.diagnostic.telemetry.exporters.meters.OpenTelemetryMetersJsonImporter") object MetricsImporterUtils { private fun String.isLongNumber(): Boolean { return try { diff --git a/tools/intellij.tools.ide.metrics.collector/README.md b/tools/intellij.tools.ide.metrics.collector/README.md index 82a5ae045e15..568ca6c0f230 100644 --- a/tools/intellij.tools.ide.metrics.collector/README.md +++ b/tools/intellij.tools.ide.metrics.collector/README.md @@ -16,7 +16,7 @@ All the child spans under your provided span will be collected too. To visualize spans you can use [Jaeger](https://www.jaegertracing.io/). - Meters: -To get reported meters use `com.intellij.tools.ide.metrics.collector.OpenTelemetryMeterCollector`. +To get reported meters use `com.intellij.tools.ide.metrics.collector.OpenTelemetryJsonMeterCollector`. You can provide filter for metrics to narrow down scope of collected metrics. Also, you should provide metrics selection strategy (SUM, LATEST, etc.), since OpenTelemetry reports, for example, counters and gauges in different manner. diff --git a/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/OpenTelemetryJsonMeterCollector.kt b/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/OpenTelemetryJsonMeterCollector.kt index c6cd8f6f4a7e..2ad01141825b 100644 --- a/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/OpenTelemetryJsonMeterCollector.kt +++ b/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/OpenTelemetryJsonMeterCollector.kt @@ -1,6 +1,6 @@ package com.intellij.tools.ide.metrics.collector -import com.intellij.platform.diagnostic.telemetry.exporters.meters.MetricsJsonImporter +import com.intellij.platform.diagnostic.telemetry.exporters.meters.OpenTelemetryMetersJsonImporter import com.intellij.tools.ide.metrics.collector.meters.* import com.intellij.tools.ide.metrics.collector.metrics.MetricsSelectionStrategy import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics @@ -46,7 +46,7 @@ open class OpenTelemetryJsonMeterCollector(val metricsSelectionStrategy: Metrics }.collect(logsDirPath) } - val telemetryMetrics: List = metricsFiles.flatMap { MetricsJsonImporter.fromJsonFile(it) } + val telemetryMetrics: List = metricsFiles.flatMap { OpenTelemetryMetersJsonImporter.fromJsonFile(it) } .filter(meterFilter) val metricsGroupedByName: Map> = telemetryMetrics.groupBy { it.name }