Small fixes to ingest endpoint (#4537)

porter-dev · Apr 15, 2024 · c29aa33 · c29aa33
1 parent 900f3d7
commit c29aa33
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/api/server/handlers/billing/ingest.go b/api/server/handlers/billing/ingest.go
@@ -49,15 +49,21 @@ func (c *IngestEventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		telemetry.AttributeKV{Key: "usage-id", Value: proj.UsageID},
 	)
 
-	request := []types.BillingEvent{}
+	ingestEventsRequest := struct {
+		Events []types.BillingEvent `json:"billing_events"`
+	}{}
 
-	if ok := c.DecodeAndValidate(w, r, &request); !ok {
+	if ok := c.DecodeAndValidate(w, r, &ingestEventsRequest); !ok {
 		err := telemetry.Error(ctx, span, nil, "error decoding ingest events request")
 		c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusBadRequest))
 		return
 	}
 
-	err := c.Config().BillingManager.MetronomeClient.IngestEvents(ctx, request)
+	telemetry.WithAttributes(span,
+		telemetry.AttributeKV{Key: "usage-events-count", Value: len(ingestEventsRequest.Events)},
+	)
+
+	err := c.Config().BillingManager.MetronomeClient.IngestEvents(ctx, ingestEventsRequest.Events)
 	if err != nil {
 		err := telemetry.Error(ctx, span, err, "error ingesting events")
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))

diff --git a/internal/billing/metronome.go b/internal/billing/metronome.go
@@ -259,6 +259,10 @@ func (m MetronomeClient) GetCustomerDashboard(ctx context.Context, customerID uu
 
 // IngestEvents sends a list of billing events to Metronome's ingest endpoint
 func (m MetronomeClient) IngestEvents(ctx context.Context, events []types.BillingEvent) (err error) {
+	if len(events) == 0 {
+		return nil
+	}
+
 	path := "ingest"
 
 	var currentAttempts int