exchange

commit 356c59ebb688dca23d7fa1680c0d871d41bdbe84
parent add2d29acf1d73258c034f82a544e591009cd238
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  8 Dec 2021 08:57:09 +0100

-improve graphana compatibility

Diffstat:
M
src/exchange/taler-exchange-httpd_metrics.c
 | 
72
++++++++++++++++++++++++++++++++++++++++++++----------------------------

1 file changed, 44 insertions(+), 28 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_metrics.c b/src/exchange/taler-exchange-httpd_metrics.c
@@ -44,48 +44,64 @@ TEH_handler_metrics (struct TEH_RequestContext *rc,
 
   (void) args;
   GNUNET_asprintf (&reply,
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n"
-                   "received_requests(type='%s') %llu\n"
-                   "serialization_failures(type='%s') %llu\n",
-                   "other",
-                   TEH_METRICS_num_requests[TEH_MT_OTHER],
+                   "# HELP taler_exchange_serialization_failures "
+                   " number of database serialization errors by
+type\n"
+                   "# TYPE taler_exchange_serialization_failures
+counter\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "taler_exchange_serialization_failures{type='%s'}
+%llu\n"
+                   "# HELP taler_exchange_received_requests "
+                   " number of received requests by type\n"
+                   "# TYPE taler_exchange_received_requests counter\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'} %llu\n"
+                   "taler_exchange_received_requests{type='%s'}
+%llu\n",
                    "other",
                    TEH_METRICS_num_conflict[TEH_MT_OTHER],
                    "deposit",
-                   TEH_METRICS_num_requests[TEH_MT_DEPOSIT],
-                   "deposit",
                    TEH_METRICS_num_conflict[TEH_MT_DEPOSIT],
                    "withdraw",
-                   TEH_METRICS_num_requests[TEH_MT_WITHDRAW],
-                   "withdraw",
                    TEH_METRICS_num_conflict[TEH_MT_WITHDRAW],
                    "melt",
-                   TEH_METRICS_num_requests[TEH_MT_MELT],
-                   "melt",
                    TEH_METRICS_num_conflict[TEH_MT_MELT],
                    "reveal-precheck",
-                   TEH_METRICS_num_requests[TEH_MT_REVEAL_PRECHECK],
-                   "reveal-precheck",
                    TEH_METRICS_num_conflict[TEH_MT_REVEAL_PRECHECK],
                    "reveal",
-                   TEH_METRICS_num_requests[TEH_MT_REVEAL],
-                   "reveal",
                    TEH_METRICS_num_conflict[TEH_MT_REVEAL],
                    "reveal-persist",
-                   TEH_METRICS_num_requests[TEH_MT_REVEAL_PERSIST],
+                   TEH_METRICS_num_conflict[TEH_MT_REVEAL_PERSIST],
+                   "other",
+                   TEH_METRICS_num_requests[TEH_MT_OTHER],
+                   "deposit",
+                   TEH_METRICS_num_requests[TEH_MT_DEPOSIT],
+                   "withdraw",
+                   TEH_METRICS_num_requests[TEH_MT_WITHDRAW],
+                   "melt",
+                   TEH_METRICS_num_requests[TEH_MT_MELT],
+                   "reveal-precheck",
+                   TEH_METRICS_num_requests[TEH_MT_REVEAL_PRECHECK],
+                   "reveal",
+                   TEH_METRICS_num_requests[TEH_MT_REVEAL],
                    "reveal-persist",
-                   TEH_METRICS_num_conflict[TEH_MT_REVEAL_PERSIST]);
+                   TEH_METRICS_num_requests[TEH_MT_REVEAL_PERSIST]);
   resp = MHD_create_response_from_buffer (strlen (reply),
                                           reply,
                                           MHD_RESPMEM_MUST_FREE);