Merge remote-tracking branch 'sdf/develop' into feature/anchor-533-ad…

…d-gradle-task-to-start-servers
stellar · Nov 21, 2023 · 04aaed7 · 04aaed7
2 parents 5706760 + b4c8061
commit 04aaed7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/platform/src/main/java/org/stellar/anchor/platform/service/AnchorMetrics.java b/platform/src/main/java/org/stellar/anchor/platform/service/AnchorMetrics.java
@@ -1,8 +1,8 @@
 package org.stellar.anchor.platform.service;
 
 public enum AnchorMetrics {
-  SEP24_TRANSACTION("sep24.transaction"),
-  SEP31_TRANSACTION("sep31.transaction"),
+  SEP24_TRANSACTION_OBSERVED("sep24.transaction.observed"),
+  SEP31_TRANSACTION_OBSERVED("sep31.transaction.observed"),
   SEP31_TRANSACTION_DB("sep31.transaction.db"),
   SEP24_TRANSACTION_DB("sep24.transaction.db"),
   PAYMENT_RECEIVED("payment.received"),

diff --git a/...rm/src/main/java/org/stellar/anchor/platform/service/PaymentOperationToEventListener.java b/...rm/src/main/java/org/stellar/anchor/platform/service/PaymentOperationToEventListener.java
@@ -171,7 +171,7 @@ void handleSep31Transaction(ObservedPayment payment, JdbcSep31Transaction txn)
 
     // Update metrics
     Metrics.counter(
-            AnchorMetrics.SEP31_TRANSACTION.toString(),
+            AnchorMetrics.SEP31_TRANSACTION_OBSERVED.toString(),
             "status",
             SepTransactionStatus.PENDING_RECEIVER.toString())
         .increment();
@@ -219,7 +219,13 @@ void handleSep24Transaction(ObservedPayment payment, JdbcSep24Transaction txn)
           rpcConfig.getCustomMessages().getIncomingPaymentReceived());
     }
 
-    // TODO(ANCHOR-545): Disable metrics temporarily
+    Metrics.counter(
+            AnchorMetrics.SEP24_TRANSACTION_OBSERVED.toString(),
+            "status",
+            SepTransactionStatus.PENDING_ANCHOR.toString())
+        .increment();
+    Metrics.counter(AnchorMetrics.PAYMENT_RECEIVED.toString(), "asset", payment.getAssetName())
+        .increment(Double.parseDouble(payment.getAmount()));
   }
 
   void handleSep6Transaction(ObservedPayment payment, JdbcSep6Transaction txn)