MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[telemetry] IJ-CR-139130 Review fixes

Browse Source 
GitOrigin-RevId: 9878000a3aaac251ef73a2cef4581db2e657aeeb
This commit is contained in:
Nikita Kudrin
2024-07-26 13:55:31 +03:00
committed by intellij-monorepo-bot
parent cccd5c04a1
commit c13c5fc433
9 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt
View File

@@ -28,8 +28,6 @@ private fun createPathList(dir: Path): List<String> {
}
class ConsoleSpanExporter : AsyncSpanExporter {
override val exporterVersion: Int = 0
private val isEnabled = System.getProperty("intellij.build.console.exporter.enabled")?.toBoolean() ?: true
companion object {

2
build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt
View File

@@ -73,8 +73,6 @@ object JaegerJsonSpanExporterManager {
internal val spanExporterProvider: () -> List<AsyncSpanExporter> = {
val list = mutableListOf(ConsoleSpanExporter(), object : AsyncSpanExporter {
override val exporterVersion: Int = jaegerJsonSpanExporter.get()?.exporterVersion ?: 0
override suspend fun export(spans: Collection<SpanData>) {
jaegerJsonSpanExporter.get()?.export(spans)
}

2
platform/diagnostic/telemetry-impl/src/MessageBusSpanExporter.kt
View File

@@ -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<SpanData>) {
if (LoadingState.COMPONENTS_REGISTERED.isOccurred) {
val dataToSend = mutableListOf<SpanData>()

2
platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt
View File

@@ -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<SpanData>) {
}

2
platform/diagnostic/telemetry.exporters/src/JaegerJsonSpanExporter.kt
View File

@@ -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

2
platform/diagnostic/telemetry.exporters/src/OtlpSpanExporter.kt
View File

@@ -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<SpanData>) {
// checking whether the spans are exported from rem dev backend
if (System.getProperty(OpenTelemetryUtils.RDCT_TRACING_DIAGNOSTIC_FLAG) != null) {

2
platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt
View File

@@ -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<SpanData>)
suspend fun flush() {}

4
platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogTelemetryExporter.kt
View File

@@ -41,8 +41,6 @@ private class VcsLogTelemetryExporter : OpenTelemetryExporterProvider {
}
private object LogHistorySpanExporter : AsyncSpanExporter {
override val exporterVersion: Int = 0
override suspend fun export(spans: Collection<SpanData>) {
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<SpanData>) {
for (span in spans.vcsSpans()) {
if (span.hasErrors() || span.name != LogFilter.getName()) continue

5
tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt
View File

@@ -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<SpanElement> = Predicate { true }): Set<SpanElement> {
fun getSpanElements(file: Path, spanElementFilter: (SpanElement) -> Boolean = { true }): Set<SpanElement> {
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<SpanElement>()
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)
}