refactor(balance-worker): remove old metrics

Signed-off-by: Mark Sagi-Kazar <[email protected]>

openmeter/entitlement/balanceworker/entitlementhandler.go

@@ -108,10 +108,6 @@ func (w *Worker) createSnapshotEvent(ctx context.Context, entitlementEntity *ent
 		),
 	)
 
-	w.metricRecalculationTimeOld.Record(ctx, time.Since(calculationStart).Milliseconds(), metric.WithAttributes(
-		attribute.String(metricAttributeKeyEntitltementType, string(entitlementEntity.EntitlementType)),
-	))
-
 	mappedValues, err := entitlementdriver.MapEntitlementValueToAPI(value)
 	if err != nil {
 		return nil, fmt.Errorf("failed to map entitlement value: %w", err)

openmeter/entitlement/balanceworker/recalculate.go

@@ -32,10 +32,6 @@ const (
 	metricNameRecalculationTime               = "openmeter.balance_worker.entitlement_recalculation_time_ms"
 	metricNameRecalculationJobCalculationTime = "openmeter.balance_worker.entitlement_recalculation_job_calculation_time_ms"
 
-	// TODO: remove old metrics once not used anymore
-	metricNameRecalculationTimeOld               = "balance_worker.entitlement_recalculation_time_ms"
-	metricNameRecalculationJobCalculationTimeOld = "balance_worker.entitlement_recalculation_job_calculation_time_ms"
-
 	metricAttributeKeyEntitltementType = "entitlement_type"
 )
 
@@ -107,30 +103,12 @@ func NewRecalculator(opts RecalculatorOptions) (*Recalculator, error) {
 		return nil, fmt.Errorf("failed to create recalculation time histogram: %w", err)
 	}
 
-	metricRecalculationTimeOld, err := opts.Meter.Int64Histogram(
-		metricNameRecalculationTimeOld,
-		metric.WithDescription("Entitlement recalculation time"),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create recalculation time histogram: %w", err)
-	}
-
-	metricRecalculationJobRecalculationTimeOld, err := opts.Meter.Int64Histogram(
-		metricNameRecalculationJobCalculationTimeOld,
-		metric.WithDescription("Time takes to recalculate the entitlements including the necessary data fetches"),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create recalculation time histogram: %w", err)
-	}
-
 	return &Recalculator{
 		opts:                                    opts,
 		featureCache:                            featureCache,
 		subjectCache:                            subjectCache,
 		metricRecalculationTime:                 metricRecalculationTime,
 		metricRecalculationJobRecalculationTime: metricRecalculationJobRecalculationTime,
-		metricRecalculationTimeOld:              metricRecalculationTimeOld,
-		metricRecalculationJobRecalculationTimeOld: metricRecalculationJobRecalculationTimeOld,
 	}, nil
 }
 
@@ -169,12 +147,6 @@ func (r *Recalculator) processEntitlements(ctx context.Context, entitlements []e
 				attribute.String(metricAttributeKeyEntitltementType, string(ent.EntitlementType)),
 			),
 		)
-
-		r.metricRecalculationJobRecalculationTimeOld.Record(ctx,
-			time.Since(start).Milliseconds(),
-			metric.WithAttributes(
-				attribute.String(metricAttributeKeyEntitltementType, string(ent.EntitlementType)),
-			))
 	}
 
 	return errs
@@ -245,12 +217,6 @@ func (r *Recalculator) sendEntitlementUpdatedEvent(ctx context.Context, ent enti
 		),
 	)
 
-	r.metricRecalculationTimeOld.Record(ctx,
-		time.Since(calculatedAt).Milliseconds(),
-		metric.WithAttributes(
-			attribute.String(metricAttributeKeyEntitltementType, string(ent.EntitlementType)),
-		))
-
 	mappedValues, err := entitlementdriver.MapEntitlementValueToAPI(value)
 	if err != nil {
 		return fmt.Errorf("failed to map entitlement value: %w", err)

openmeter/entitlement/balanceworker/worker.go

@@ -67,9 +67,6 @@ type Worker struct {
 	highWatermarkCache *lru.Cache[string, highWatermarkCacheEntry]
 
 	metricRecalculationTime metric.Int64Histogram
-
-	// TODO: remove old metrics once not used anymore
-	metricRecalculationTimeOld metric.Int64Histogram
 }
 
 func New(opts WorkerOptions) (*Worker, error) {
@@ -86,22 +83,13 @@ func New(opts WorkerOptions) (*Worker, error) {
 		return nil, fmt.Errorf("failed to create recalculation time histogram: %w", err)
 	}
 
-	metricRecalculationTimeOld, err := opts.Router.MetricMeter.Int64Histogram(
-		metricNameRecalculationTimeOld,
-		metric.WithDescription("Entitlement recalculation time"),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create recalculation time histogram: %w", err)
-	}
-
 	worker := &Worker{
 		opts:               opts,
 		entitlement:        opts.Entitlement,
 		repo:               opts.Repo,
 		highWatermarkCache: highWatermarkCache,
 
-		metricRecalculationTime:    metricRecalculationTime,
-		metricRecalculationTimeOld: metricRecalculationTimeOld,
+		metricRecalculationTime: metricRecalculationTime,
 	}
 
 	router, err := router.NewDefaultRouter(opts.Router)