add type to local/remote error metrics

Author: pm47

eclair-core/src/main/scala/fr/acinq/eclair/channel/Monitoring.scala

@@ -86,6 +86,7 @@ object Monitoring {
     val Direction = "direction"
     val Event = "event"
     val Fatal = "fatal"
+    val ErrorType = "error-type"
     val Origin = "origin"
     val State = "state"
     val CommitmentFormat = "commitment-format"

eclair-core/src/main/scala/fr/acinq/eclair/db/DbEventHandler.scala

@@ -30,6 +30,7 @@ import fr.acinq.eclair.db.DbEventHandler.ChannelEvent
 import fr.acinq.eclair.payment.Monitoring.{Metrics => PaymentMetrics, Tags => PaymentTags}
 import fr.acinq.eclair.payment._
 import fr.acinq.eclair.{Logs, NodeParams, TimestampMilli}
+import kamon.tag.TagSet
 
 /**
  * This actor sits at the interface between our event stream and the database.
@@ -112,10 +113,39 @@ class DbEventHandler(nodeParams: NodeParams) extends Actor with DiagnosticActorL
       // The first pattern matching level is to ignore some errors, the second level is to separate between different kind of errors.
       e.error match {
         case LocalError(_: CannotAffordFees) => () // will be thrown at each new block if our balance is too low to update the commitment fee
-        case _ => e.error match {
-          case LocalError(_) => ChannelMetrics.ChannelErrors.withTag(ChannelTags.Origin, ChannelTags.Origins.Local).withTag(ChannelTags.Fatal, value = e.isFatal).increment()
-          case RemoteError(_) => ChannelMetrics.ChannelErrors.withTag(ChannelTags.Origin, ChannelTags.Origins.Remote).increment()
+        case _ =>
+          val tags =
+          e.error match {
+          case LocalError(t) => TagSet.Empty
+            .withTag(ChannelTags.Origin, ChannelTags.Origins.Local)
+            .withTag(ChannelTags.Fatal, value = e.isFatal)
+            .withTag(ChannelTags.ErrorType, t.getClass.getSimpleName)
+          case RemoteError(msg) =>
+            val errorType = msg.toAscii match {
+              case ascii if ascii.equals("Awaiting unilateral close") => ascii
+              case ascii if ascii.equals("internal error") => ascii
+              case ascii if ascii.equals("We can't be together anymore.") => ascii
+              case ascii if ascii.equals("forced local commit") => ascii
+              case ascii if ascii.equals("invalid revocation") => ascii
+              case ascii if ascii.equals("Channel open canceled by us") => ascii
+              case ascii if ascii.equals("Number of pending channels exceed maximum") => ascii
+              case ascii if ascii.equals("channel rejected") => ascii
+              case ascii if ascii.equals("funding failed due to internal error") => ascii
+              case ascii if ascii.equals("unable to resume channel, recovery required") => ascii
+              case ascii if ascii.equals("Channel is closed and forgotten") => ascii
+              case ascii if ascii.equals("unknown channel") => ascii
+              case ascii if ascii.startsWith("funding tx has been spent") => "funding tx has been spent"
+              case ascii if ascii.startsWith("invalid commitment signature") => "invalid commitment signature"
+              case ascii if ascii.startsWith("channeld: received ERROR channel") => "channeld: received ERROR channel"
+              case ascii if ascii.startsWith("Witnesses lower effective feerate below agreed upon rate") => "Witnesses lower effective feerate below agreed upon rate"
+              case _ => "other"
+            }
+            TagSet.Empty
+            .withTag(ChannelTags.Origin, ChannelTags.Origins.Remote)
+            .withTag(ChannelTags.Fatal, value = true) // remote errors are always fatal
+            .withTag(ChannelTags.ErrorType, errorType)
         }
+          ChannelMetrics.ChannelErrors.withTags(tags).increment()
       }
 
     case e: ChannelStateChanged =>