Show faulty source in error message

Tinkoff · Jan 23, 2023 · cbd49c8 · cbd49c8
1 parent 87c7241
commit cbd49c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/error/SpawnError.scala b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/error/SpawnError.scala
@@ -0,0 +1,5 @@
+package ru.tinkoff.tcb.mockingbird.error
+
+import ru.tinkoff.tcb.utils.id.SID
+
+final case class SpawnError(source: SID[?], cause: Throwable) extends Exception(cause)
diff --git a/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala b/backend/mockingbird/src/main/scala/ru/tinkoff/tcb/mockingbird/stream/EventSpawner.scala
@@ -22,6 +22,7 @@ import ru.tinkoff.tcb.mockingbird.error.CompoundError
 import ru.tinkoff.tcb.mockingbird.error.EventProcessingError
 import ru.tinkoff.tcb.mockingbird.error.ScenarioExecError
 import ru.tinkoff.tcb.mockingbird.error.ScenarioSearchError
+import ru.tinkoff.tcb.mockingbird.error.SpawnError
 import ru.tinkoff.tcb.mockingbird.model.EventSourceRequest
 import ru.tinkoff.tcb.mockingbird.scenario.ScenarioEngine
 import ru.tinkoff.tcb.utils.circe.JsonString
@@ -97,7 +98,7 @@ final class EventSpawner(
           .validateParDiscard(_) { sourceConf =>
             (for {
               _   <- Tracing.init
-              res <- fetch(sourceConf.request)
+              res <- fetch(sourceConf.request).mapError(SpawnError(sourceConf.name, _))
               neRes = res.filter(_.nonEmpty)
               _ <- ZIO.when(neRes.nonEmpty)(log.info(s"Отправлено в обработку: ${neRes.length}"))
               _ <- ZIO
@@ -107,7 +108,7 @@ final class EventSpawner(
                 .mapError(CompoundError(_))
             } yield ())
               .catchSomeDefect { case NonFatal(ex) =>
-                ZIO.fail(ex)
+                ZIO.fail(SpawnError(sourceConf.name, ex))
               }
           }
           .mapError(CompoundError(_))
@@ -137,6 +138,8 @@ final class EventSpawner(
       log.warn(s"Ошибка при поиске сценария: $err")
     case CallbackError(err) =>
       log.warn(s"Ошибка при выполнении колбэка: $err")
+    case SpawnError(sid, err) =>
+      log.errorCause(s"Ошибка при получении события из {}", err, sid)
     case NonFatal(t) =>
       log.errorCause("Ошибка при получении события", t)
   }

diff --git a/backend/project/Settings.scala b/backend/project/Settings.scala
@@ -26,7 +26,7 @@ object Settings {
 
   val common = Seq(
     organization := "ru.tinkoff",
-    version := "3.4.0",
+    version := "3.4.1",
     scalaVersion := "2.13.10",
     Compile / packageDoc / publishArtifact := false,
     Compile / packageSrc / publishArtifact := false,