Fix metrics

grpc/routes.go

@@ -72,7 +72,9 @@ func NewApp() *App {
 			transfers := []types.Transfer{}
 			lenPayloads := float64(len(payloads))
 			if Config.PrometheusEnabled {
-				metrics.BufferFullRatio.Add(lenPayloads / lenMaxBuf)
+				metrics.TotalBufferCount.Inc()
+				metrics.TotalBufferContents.Add(lenPayloads)
+				metrics.TotalBufferMax.Add(lenMaxBuf)
 			} else if lenPayloads < lenMaxBufSlog {
 				slog.Warn("Flushing Buffer", "max buffer", Config.BufferSize, "buffer size collected", lenPayloads)
 			}
@@ -107,6 +109,7 @@ func (s *App) GetID(ctx context.Context, in *proto.GetIDRequest) (*proto.GetIDRe
 }
 
 func (s *App) CreateAccounts(ctx context.Context, in *proto.CreateAccountsRequest) (*proto.CreateAccountsReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if len(in.Accounts) == 0 {
 		return nil, ErrZeroAccounts
 	}
@@ -160,6 +163,7 @@ func (s *App) CreateAccounts(ctx context.Context, in *proto.CreateAccountsReques
 }
 
 func (s *App) CreateTransfers(ctx context.Context, in *proto.CreateTransfersRequest) (*proto.CreateTransfersReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if len(in.Transfers) == 0 {
 		return nil, ErrZeroTransfers
 	}
@@ -243,6 +247,7 @@ func (s *App) CreateTransfers(ctx context.Context, in *proto.CreateTransfersRequ
 }
 
 func (s *App) LookupAccounts(ctx context.Context, in *proto.LookupAccountsRequest) (*proto.LookupAccountsReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if len(in.AccountIds) == 0 {
 		return nil, ErrZeroAccounts
 	}
@@ -267,6 +272,7 @@ func (s *App) LookupAccounts(ctx context.Context, in *proto.LookupAccountsReques
 }
 
 func (s *App) LookupTransfers(ctx context.Context, in *proto.LookupTransfersRequest) (*proto.LookupTransfersReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if len(in.TransferIds) == 0 {
 		return nil, ErrZeroTransfers
 	}
@@ -291,6 +297,7 @@ func (s *App) LookupTransfers(ctx context.Context, in *proto.LookupTransfersRequ
 }
 
 func (s *App) GetAccountTransfers(ctx context.Context, in *proto.GetAccountTransfersRequest) (*proto.GetAccountTransfersReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if in.Filter.AccountId == "" {
 		return nil, ErrZeroAccounts
 	}
@@ -310,6 +317,7 @@ func (s *App) GetAccountTransfers(ctx context.Context, in *proto.GetAccountTrans
 }
 
 func (s *App) GetAccountBalances(ctx context.Context, in *proto.GetAccountBalancesRequest) (*proto.GetAccountBalancesReply, error) {
+	metrics.AddTotalRequests(Config.PrometheusEnabled)
 	if in.Filter.AccountId == "" {
 		return nil, ErrZeroAccounts
 	}

metrics/counters.go

@@ -5,6 +5,30 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
-var BufferFullRatio = promauto.NewCounter(prometheus.CounterOpts{
-	Name: "tigerbeetle_buffer_full_ratio",
-})
+var (
+	TotalBufferContents = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "tigerbeetleapi_buffer_contents_total",
+		Help: "Tigerbeetle requests buffered filled size sum",
+	})
+
+	TotalBufferMax = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "tigerbeetleapi_buffer_max_total",
+		Help: "Tigerbeetle requests buffer max size sum",
+	})
+
+	TotalBufferCount = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "tigerbeetleapi_buffer_count_total",
+		Help: "Tigerbeetle requests total buffers",
+	})
+
+	TotalRequests = promauto.NewCounter(prometheus.CounterOpts{
+		Name: "tigerbeetleapi_grpc_requests_total",
+		Help: "The total number of grpc requests",
+	})
+)
+
+func AddTotalRequests(enabled bool) {
+	if enabled {
+		TotalRequests.Inc()
+	}
+}