feat(metrics): add operator metric attributes in generic connector calls

internal/connectors/plugins/public/generic/client/accounts.go

@@ -8,10 +8,8 @@ import (
 )
 
 func (c *Client) ListAccounts(ctx context.Context, page, pageSize int64, createdAtFrom time.Time) ([]genericclient.Account, error) {
-	// TODO(f): Add metrics
-	// f := connectors.ClientMetrics(ctx, "generic", "list_accounts")
-	// now := time.Now()
-	// defer f(ctx, now)
+	start := time.Now()
+	defer c.recordMetrics(ctx, start, "list_accounts")
 
 	req := c.apiClient.DefaultApi.
 		GetAccounts(ctx).

internal/connectors/plugins/public/generic/client/balances.go

@@ -2,15 +2,14 @@ package client
 
 import (
 	"context"
+	"time"
 
 	"github.com/formancehq/payments/genericclient"
 )
 
 func (c *Client) GetBalances(ctx context.Context, accountID string) (*genericclient.Balances, error) {
-	// TODO(polo): add metrics
-	// f := connectors.ClientMetrics(ctx, "generic", "get_balance")
-	// now := time.Now()
-	// defer f(ctx, now)
+	start := time.Now()
+	defer c.recordMetrics(ctx, start, "list_balances")
 
 	req := c.apiClient.DefaultApi.GetAccountBalances(ctx, accountID)
 

internal/connectors/plugins/public/generic/client/beneficiaries.go

@@ -8,10 +8,8 @@ import (
 )
 
 func (c *Client) ListBeneficiaries(ctx context.Context, page, pageSize int64, createdAtFrom time.Time) ([]genericclient.Beneficiary, error) {
-	// TODO(polo): add metrics
-	// f := connectors.ClientMetrics(ctx, "generic", "list_beneficiaries")
-	// now := time.Now()
-	// defer f(ctx, now)
+	start := time.Now()
+	defer c.recordMetrics(ctx, start, "list_beneficiaries")
 
 	req := c.apiClient.DefaultApi.
 		GetBeneficiaries(ctx).

internal/connectors/plugins/public/generic/client/client.go

@@ -1,11 +1,17 @@
 package client
 
 import (
+	"context"
 	"fmt"
 	"net/http"
+	"os"
+	"time"
 
 	"github.com/formancehq/payments/genericclient"
+	"github.com/formancehq/payments/internal/connectors/metrics"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
 )
 
 type apiTransport struct {
@@ -20,7 +26,8 @@ func (t *apiTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 }
 
 type Client struct {
-	apiClient *genericclient.APIClient
+	apiClient              *genericclient.APIClient
+	commonMetricAttributes []attribute.KeyValue
 }
 
 func New(apiKey, baseURL string) *Client {
@@ -38,6 +45,30 @@ func New(apiKey, baseURL string) *Client {
 	genericClient := genericclient.NewAPIClient(configuration)
 
 	return &Client{
-		apiClient: genericClient,
+		apiClient:              genericClient,
+		commonMetricAttributes: CommonMetricsAttributes(),
 	}
 }
+
+// recordMetrics is meant to be called in a defer
+func (c *Client) recordMetrics(ctx context.Context, start time.Time, operation string) {
+	registry := metrics.GetMetricsRegistry()
+
+	attrs := c.commonMetricAttributes
+	attrs = append(attrs, attribute.String("operation", operation))
+	opts := metric.WithAttributes(attrs...)
+
+	registry.ConnectorPSPCalls().Add(ctx, 1, opts)
+	registry.ConnectorPSPCallLatencies().Record(ctx, time.Since(start).Milliseconds(), opts)
+}
+
+func CommonMetricsAttributes() []attribute.KeyValue {
+	metricsAttributes := []attribute.KeyValue{
+		attribute.String("connector", "generic"),
+	}
+	stack := os.Getenv("STACK")
+	if stack != "" {
+		metricsAttributes = append(metricsAttributes, attribute.String("stack", stack))
+	}
+	return metricsAttributes
+}

internal/connectors/plugins/public/generic/client/transactions.go

@@ -8,10 +8,8 @@ import (
 )
 
 func (c *Client) ListTransactions(ctx context.Context, page, pageSize int64, updatedAtFrom time.Time) ([]genericclient.Transaction, error) {
-	// TODO(polo): add metrics
-	// f := connectors.ClientMetrics(ctx, "generic", "list_transactions")
-	// now := time.Now()
-	// defer f(ctx, now)
+	start := time.Now()
+	defer c.recordMetrics(ctx, start, "list_transactions")
 
 	req := c.apiClient.DefaultApi.GetTransactions(ctx).
 		Page(page).