fixup! add metrics on splicing

ACINQ · Sep 29, 2023 · b58a3bd · b58a3bd
1 parent b64a622
commit b58a3bd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Monitoring.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Monitoring.scala
@@ -16,6 +16,8 @@
 
 package fr.acinq.eclair.channel
 
+import fr.acinq.bitcoin.scalacompat.SatoshiLong
+import fr.acinq.eclair.channel.fund.InteractiveTxBuilder.{InteractiveTxParams, SharedTransaction}
 import fr.acinq.eclair.transactions.{CommitmentSpec, DirectedHtlc}
 import kamon.Kamon
 
@@ -48,6 +50,27 @@ object Monitoring {
         HtlcValueInFlightGlobal.withTag(Tags.Direction, direction).increment((value - previousValue).toDouble)
       }
     }
+
+    def recordSplice(fundingParams: InteractiveTxParams, sharedTx: SharedTransaction): Unit = {
+      if (fundingParams.localContribution > 0.sat) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceIn).record(fundingParams.localContribution.toLong)
+      }
+      if (fundingParams.remoteContribution > 0.sat) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceIn).record(fundingParams.remoteContribution.toLong)
+      }
+      if (sharedTx.localOutputs.nonEmpty) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceOut).record(sharedTx.localOutputs.map(_.amount).sum.toLong)
+      }
+      if (sharedTx.remoteOutputs.nonEmpty) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceOut).record(sharedTx.remoteOutputs.map(_.amount).sum.toLong)
+      }
+      if (fundingParams.localContribution < 0.sat && sharedTx.localOutputs.isEmpty) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceCpfp).record(Math.abs(fundingParams.localContribution.toLong))
+      }
+      if (fundingParams.remoteContribution < 0.sat && sharedTx.remoteOutputs.isEmpty) {
+        Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceCpfp).record(Math.abs(fundingParams.remoteContribution.toLong))
+      }
+    }
   }
 
   object Tags {

diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala
@@ -1072,6 +1072,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
               d.commitments.updateLocalFundingStatus(msg.txId, dfu1) match {
                 case Right((commitments1, _)) =>
                   log.info("publishing funding tx for channelId={} fundingTxId={}", d.channelId, fundingTx.signedTx.txid)
+                  Metrics.recordSplice(dfu.fundingParams, fundingTx.tx)
                   stay() using d.copy(commitments = commitments1) storing() calling publishFundingTx(dfu1)
                 case Left(_) =>
                   stay()
@@ -1091,26 +1092,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
                   val commitments1 = d.commitments.add(signingSession1.commitment)
                   val d1 = d.copy(commitments = commitments1, spliceStatus = SpliceStatus.NoSplice)
                   log.info("publishing funding tx for channelId={} fundingTxId={}", d.channelId, signingSession1.fundingTx.sharedTx.txId)
-                  val fundingParams = signingSession1.fundingTx.fundingParams
-                  val sharedTx = signingSession1.fundingTx.sharedTx.tx
-                  if (fundingParams.localContribution > 0.sat) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceIn).record(fundingParams.localContribution.toLong)
-                  }
-                  if (fundingParams.remoteContribution > 0.sat) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceIn).record(fundingParams.remoteContribution.toLong)
-                  }
-                  if (sharedTx.localOutputs.nonEmpty) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceOut).record(sharedTx.localOutputs.map(_.amount).sum.toLong)
-                  }
-                  if (sharedTx.remoteOutputs.nonEmpty) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceOut).record(sharedTx.remoteOutputs.map(_.amount).sum.toLong)
-                  }
-                  if (fundingParams.localContribution < 0.sat && sharedTx.localOutputs.isEmpty) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Local).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceCpfp).record(fundingParams.localContribution.toLong)
-                  }
-                  if (fundingParams.remoteContribution < 0.sat && sharedTx.remoteOutputs.isEmpty) {
-                    Metrics.Splices.withTag(Tags.Origin, Tags.Origins.Remote).withTag(Tags.SpliceType, Tags.SpliceTypes.SpliceCpfp).record(fundingParams.remoteContribution.toLong)
-                  }
+                  Metrics.recordSplice(signingSession1.fundingTx.fundingParams, signingSession1.fundingTx.sharedTx.tx)
                   stay() using d1 storing() sending signingSession1.localSigs calling publishFundingTx(signingSession1.fundingTx) calling endQuiescence(d1)
               }
             case _ =>