[metrics] IJ-CR-116469 Fixes for review: Removing confusing package

GitOrigin-RevId: a199478fb6daa1c310c187f7e4ca23bc2b824a40
This commit is contained in:
Nikita Kudrin
2023-10-17 11:29:26 +03:00
committed by intellij-monorepo-bot
parent 11e2c6ab8d
commit 7b571a219f
14 changed files with 33 additions and 40 deletions

View File

@@ -8,7 +8,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.platform.testFramework.diagnostic.MetricsPublisher
import com.intellij.teamcity.TeamCityClient
import com.intellij.testFramework.UsefulTestCase
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.publishing.CIServerBuildInfo
import com.intellij.tools.ide.metrics.collector.publishing.PerformanceMetricsDto
import java.nio.file.Files

View File

@@ -4,8 +4,8 @@ package com.intellij.tools.ide.metrics.benchmark
import com.intellij.openapi.application.PathManager
import com.intellij.platform.diagnostic.telemetry.TelemetryManager
import com.intellij.tool.withRetry
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.metrics.getMetricsFromSpanAndChildren
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.telemetry.getMetricsFromSpanAndChildren
import com.intellij.tools.ide.metrics.collector.metrics.medianValue
import com.intellij.tools.ide.metrics.collector.metrics.toPerformanceMetricDuration
import com.intellij.tools.ide.metrics.collector.telemetry.SpanFilter

View File

@@ -1,6 +1,4 @@
package com.intellij.tools.ide.metrics.collector.collector
import com.intellij.tools.ide.metrics.collector.analysis.Conclusion
package com.intellij.tools.ide.metrics.collector.analysis
data class CompareSetting(
val compareWithPrevResults: Boolean = false,

View File

@@ -1,6 +1,6 @@
package com.intellij.tools.ide.metrics.collector.analysis
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics
enum class Conclusion {
UNKNOWN,

View File

@@ -1,4 +1,4 @@
package com.intellij.tools.ide.metrics.collector.collector
package com.intellij.tools.ide.metrics.collector.metrics
import io.opentelemetry.api.common.Attributes
import io.opentelemetry.sdk.metrics.data.LongPointData

View File

@@ -1,6 +1,7 @@
package com.intellij.tools.ide.metrics.collector.collector
package com.intellij.tools.ide.metrics.collector.metrics
import com.intellij.openapi.util.BuildNumber
import com.intellij.tools.ide.metrics.collector.analysis.CompareSetting
import com.intellij.tools.ide.metrics.collector.publishing.ApplicationMetricDto
import java.time.OffsetDateTime

View File

@@ -1,4 +1,4 @@
package com.intellij.tools.ide.metrics.collector.collector
package com.intellij.tools.ide.metrics.collector.metrics
import java.util.*

View File

@@ -1,7 +1,5 @@
package com.intellij.tools.ide.metrics.collector.metrics
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
/** Returns median (not average) value of a collection */
fun Iterable<Long>.median(): Long {
val size = this.count()

View File

@@ -0,0 +1,11 @@
package com.intellij.tools.ide.metrics.collector.metrics
fun String.toDurationMetricId(): PerformanceMetrics.MetricId.Duration = PerformanceMetrics.MetricId.Duration(this)
fun String.toCounterMetricId(): PerformanceMetrics.MetricId.Counter = PerformanceMetrics.MetricId.Counter(this)
fun String.toPerformanceMetricCounter(counter: Long): PerformanceMetrics.Metric =
PerformanceMetrics.Metric(id = this.toCounterMetricId(), value = counter)
fun String.toPerformanceMetricDuration(durationMs: Long): PerformanceMetrics.Metric =
PerformanceMetrics.Metric(id = this.toDurationMetricId(), value = durationMs)

View File

@@ -1,15 +1,5 @@
package com.intellij.tools.ide.metrics.collector.metrics
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
fun String.toCounterMetricId(): PerformanceMetrics.MetricId.Counter = PerformanceMetrics.MetricId.Counter(this)
fun String.toPerformanceMetricCounter(counter: Long): PerformanceMetrics.Metric =
PerformanceMetrics.Metric(id = this.toCounterMetricId(), value = counter)
fun String.toDurationMetricId(): PerformanceMetrics.MetricId.Duration = PerformanceMetrics.MetricId.Duration(this)
fun String.toPerformanceMetricDuration(durationMs: Long): PerformanceMetrics.Metric =
PerformanceMetrics.Metric(id = this.toDurationMetricId(), value = durationMs)
fun findMetricValue(metrics: List<PerformanceMetrics.Metric>, metric: PerformanceMetrics.MetricId.Duration): Number = try {
metrics.first { it.id.name == metric.name }.value
}

View File

@@ -3,9 +3,9 @@ package com.intellij.tools.ide.metrics.collector.publishing
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
import com.intellij.openapi.util.BuildNumber
import com.intellij.openapi.util.SystemInfo
import com.intellij.tools.ide.metrics.collector.collector.MetricGroup
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.collector.toJson
import com.intellij.tools.ide.metrics.collector.metrics.MetricGroup
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.metrics.toJson
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter

View File

@@ -1,7 +1,6 @@
package com.intellij.tools.ide.metrics.collector.telemetry
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics
import com.intellij.tools.ide.metrics.collector.metrics.MetricWithAttributes
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics
interface SpanProcessor<T> {

View File

@@ -1,13 +1,9 @@
package com.intellij.tools.ide.metrics.collector.metrics
package com.intellij.tools.ide.metrics.collector.telemetry
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.Metric
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.MetricId.Counter
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.MetricId.Duration
import com.intellij.tools.ide.metrics.collector.telemetry.MetricSpanProcessor
import com.intellij.tools.ide.metrics.collector.telemetry.OpentelemetryJsonParser
import com.intellij.tools.ide.metrics.collector.telemetry.SpanFilter
import com.intellij.tools.ide.metrics.collector.telemetry.SpanInfoProcessor
import com.intellij.openapi.diagnostic.logger
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.Metric
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.MetricId.Counter
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.MetricId.Duration
import com.intellij.util.alsoIfNull
import java.io.File
import kotlin.math.pow

View File

@@ -1,10 +1,10 @@
package com.intellij.tools.ide.metrics.collector
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.Metric
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.MetricId.Counter
import com.intellij.tools.ide.metrics.collector.collector.PerformanceMetrics.MetricId.Duration
import com.intellij.tools.ide.metrics.collector.metrics.getMetricsBasedOnDiffBetweenSpans
import com.intellij.tools.ide.metrics.collector.metrics.getMetricsFromSpanAndChildren
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.Metric
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.MetricId.Counter
import com.intellij.tools.ide.metrics.collector.metrics.PerformanceMetrics.MetricId.Duration
import com.intellij.tools.ide.metrics.collector.telemetry.getMetricsBasedOnDiffBetweenSpans
import com.intellij.tools.ide.metrics.collector.telemetry.getMetricsFromSpanAndChildren
import com.intellij.tools.ide.metrics.collector.telemetry.SpanFilter
import io.kotest.matchers.collections.shouldContainAll
import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder