diff --git a/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt b/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt index 9e58c6c6467c..bd3a7f0d35c4 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt @@ -28,8 +28,6 @@ private fun createPathList(dir: Path): List { } class ConsoleSpanExporter : AsyncSpanExporter { - override val exporterVersion: Int = 0 - private val isEnabled = System.getProperty("intellij.build.console.exporter.enabled")?.toBoolean() ?: true companion object { diff --git a/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt b/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt index 3bc7ac790d20..393521094d2a 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt @@ -73,8 +73,6 @@ object JaegerJsonSpanExporterManager { internal val spanExporterProvider: () -> List = { val list = mutableListOf(ConsoleSpanExporter(), object : AsyncSpanExporter { - override val exporterVersion: Int = jaegerJsonSpanExporter.get()?.exporterVersion ?: 0 - override suspend fun export(spans: Collection) { jaegerJsonSpanExporter.get()?.export(spans) } diff --git a/platform/diagnostic/telemetry-impl/src/MessageBusSpanExporter.kt b/platform/diagnostic/telemetry-impl/src/MessageBusSpanExporter.kt index 1bdc9f84b2e6..0fc226defb18 100644 --- a/platform/diagnostic/telemetry-impl/src/MessageBusSpanExporter.kt +++ b/platform/diagnostic/telemetry-impl/src/MessageBusSpanExporter.kt @@ -16,8 +16,6 @@ class MessageBusSpanExporter : AsyncSpanExporter { private fun initPublisher() = ApplicationManager.getApplication().messageBus.syncPublisher(TOPIC) } - override val exporterVersion: Int = 0 - override suspend fun export(spans: Collection) { if (LoadingState.COMPONENTS_REGISTERED.isOccurred) { val dataToSend = mutableListOf() diff --git a/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt b/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt index 8a51a6c4d2ef..11500b233007 100644 --- a/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt +++ b/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt @@ -77,8 +77,6 @@ class TelemetryManagerImpl(coroutineScope: CoroutineScope, isUnitTestMode: Boole batchSpanProcessor = if (hasSpanExporters) { // must be first, before JaegerJsonSpanExporter spanExporters.add(0, object : AsyncSpanExporter { - override val exporterVersion: Int = 0 - override suspend fun export(spans: Collection) { } diff --git a/platform/diagnostic/telemetry.exporters/src/JaegerJsonSpanExporter.kt b/platform/diagnostic/telemetry.exporters/src/JaegerJsonSpanExporter.kt index c2b66b47d208..b4ddedb79f3d 100644 --- a/platform/diagnostic/telemetry.exporters/src/JaegerJsonSpanExporter.kt +++ b/platform/diagnostic/telemetry.exporters/src/JaegerJsonSpanExporter.kt @@ -31,7 +31,7 @@ class JaegerJsonSpanExporter( val serviceVersion: String? = null, val serviceNamespace: String? = null, ) : AsyncSpanExporter { - override val exporterVersion: Int = 2 + val exporterVersion: Int = 2 private val fileChannel: FileChannel private var writer: JsonGenerator diff --git a/platform/diagnostic/telemetry.exporters/src/OtlpSpanExporter.kt b/platform/diagnostic/telemetry.exporters/src/OtlpSpanExporter.kt index 5892feebdb9b..490c0159e916 100644 --- a/platform/diagnostic/telemetry.exporters/src/OtlpSpanExporter.kt +++ b/platform/diagnostic/telemetry.exporters/src/OtlpSpanExporter.kt @@ -17,8 +17,6 @@ import java.net.ConnectException @Internal class OtlpSpanExporter(private val traceUrl: String) : AsyncSpanExporter { - override val exporterVersion: Int = 0 - override suspend fun export(spans: Collection) { // checking whether the spans are exported from rem dev backend if (System.getProperty(OpenTelemetryUtils.RDCT_TRACING_DIAGNOSTIC_FLAG) != null) { diff --git a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt index dbda3a16ba74..9d45f4df3d64 100644 --- a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt +++ b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt @@ -6,8 +6,6 @@ import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal interface AsyncSpanExporter { - val exporterVersion: Int // to help with breaking changes / analyses of backward compatibility - suspend fun export(spans: Collection) suspend fun flush() {} diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogTelemetryExporter.kt b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogTelemetryExporter.kt index 22d36c5fb4ea..5258633f3d76 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogTelemetryExporter.kt +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogTelemetryExporter.kt @@ -41,8 +41,6 @@ private class VcsLogTelemetryExporter : OpenTelemetryExporterProvider { } private object LogHistorySpanExporter : AsyncSpanExporter { - override val exporterVersion: Int = 0 - override suspend fun export(spans: Collection) { for (span in spans.vcsSpans()) { if (span.hasErrors()) continue @@ -64,8 +62,6 @@ private class VcsLogTelemetryExporter : OpenTelemetryExporterProvider { } private object LogFilterSpanExporter : AsyncSpanExporter { - override val exporterVersion: Int = 0 - override suspend fun export(spans: Collection) { for (span in spans.vcsSpans()) { if (span.hasErrors() || span.name != LogFilter.getName()) continue diff --git a/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt b/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt index e72b44fa9926..6d6ecee99105 100644 --- a/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt +++ b/tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt @@ -21,7 +21,6 @@ import java.nio.file.Files import java.nio.file.Path import java.time.Instant import java.util.concurrent.TimeUnit -import java.util.function.Predicate import kotlin.time.Duration import kotlin.time.Duration.Companion.microseconds import kotlin.time.Duration.Companion.milliseconds @@ -124,7 +123,7 @@ private data class OpentelemetryJsonData( ) open class OpentelemetrySpanJsonParser(private val spanFilter: SpanFilter) { - fun getSpanElements(file: Path, spanElementFilter: Predicate = Predicate { true }): Set { + fun getSpanElements(file: Path, spanElementFilter: (SpanElement) -> Boolean = { true }): Set { var jsonData = getSpans(file, jsonSerializerNanoseconds) val exporterVersion = jsonData.exporterVersion @@ -136,7 +135,7 @@ open class OpentelemetrySpanJsonParser(private val spanFilter: SpanFilter) { val index = getParentToSpanMap(spans) val result = ObjectLinkedOpenHashSet() - for (span in spans.asSequence().filter(spanFilter.rawFilter::test).map { toSpanElement(it) }.filter { spanElementFilter.test(it) }) { + for (span in spans.filter(spanFilter.rawFilter::test).map { toSpanElement(it) }.filter { spanElementFilter(it) }) { result.add(span) processChild(result, span, index) }