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

rename withRetry to withRetryBlocking — avoid errors line nested runBlocking calls

Browse Source 
GitOrigin-RevId: c2e9817344c3ce07ec236b3e56ae57975d830cc1
This commit is contained in:
Vladimir Krivosheev
2024-03-16 11:18:15 +00:00
committed by intellij-monorepo-bot
parent 289da42fad
commit dff1750f62
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/intellij.tools.ide.metrics.collector/src/com/intellij/tools/ide/metrics/collector/telemetry/OpentelemetrySpanJsonParser.kt
+2 -2
View File
@@ -3,7 +3,7 @@
package com.intellij.tools.ide.metrics.collector.telemetry
import com.intellij.tools.ide.util.common.PrintFailuresMode
import com.intellij.tools.ide.util.common.withRetry
import com.intellij.tools.ide.util.common.withRetryBlocking
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap
import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet
@@ -33,7 +33,7 @@ private data class OpentelemetryJsonData(
)
private fun getSpans(file: Path): List<SpanData> {
val spanData = withRetry(
val spanData = withRetryBlocking(
messageOnFailure = "Failure during spans extraction from OpenTelemetry json file",
retries = 5,
printFailuresMode = PrintFailuresMode.ONLY_LAST_FAILURE,
tools/intellij.tools.ide.util.common/src/com/intellij/tools/ide/util/common/retry.kt
+7 -7
View File
@@ -16,11 +16,11 @@ enum class PrintFailuresMode {
/** @return T - if successful; null - otherwise */
suspend fun <T> withRetryAsync(messageOnFailure: String,
retries: Long = 3,
printFailuresMode: PrintFailuresMode = PrintFailuresMode.ALL_FAILURES,
delay: Duration = 10.seconds,
retryAction: suspend () -> T): T? {
suspend fun <T> withRetry(messageOnFailure: String,
retries: Long = 3,
printFailuresMode: PrintFailuresMode = PrintFailuresMode.ALL_FAILURES,
delay: Duration = 10.seconds,
retryAction: suspend () -> T): T? {
(1..retries).forEach { failureCount ->
try {
@@ -57,14 +57,14 @@ open class NoRetryException(message: String, cause: Throwable?) : IllegalStateEx
/** @return T - if successful; null - otherwise */
@Suppress("RAW_RUN_BLOCKING")
fun <T> withRetry(
fun <T> withRetryBlocking(
messageOnFailure: String,
retries: Long = 3,
printFailuresMode: PrintFailuresMode = PrintFailuresMode.ALL_FAILURES,
delay: Duration = 10.seconds,
retryAction: () -> T
): T? = runBlocking(Dispatchers.IO) {
withRetryAsync(
withRetry(
messageOnFailure = messageOnFailure,
retries = retries,
printFailuresMode = printFailuresMode,