diff --git a/api/v1alpha1/release_types.go b/api/v1alpha1/release_types.go index 85da80d6..60f83c71 100644 --- a/api/v1alpha1/release_types.go +++ b/api/v1alpha1/release_types.go @@ -21,6 +21,7 @@ import ( "github.com/konflux-ci/operator-toolkit/conditions" + "github.com/konflux-ci/release-service/metadata" "github.com/konflux-ci/release-service/metrics" "k8s.io/apimachinery/pkg/runtime" @@ -249,11 +250,12 @@ func (r *Release) MarkManagedPipelineProcessed() { r.Status.ManagedProcessing.CompletionTime = &metav1.Time{Time: time.Now()} conditions.SetCondition(&r.Status.Conditions, managedProcessedConditionType, metav1.ConditionTrue, SucceededReason) - go metrics.RegisterCompletedReleaseManagedPipelineProcessing( + go metrics.RegisterCompletedReleasePipelineProcessing( r.Status.ManagedProcessing.StartTime, r.Status.ManagedProcessing.CompletionTime, SucceededReason.String(), r.Status.Target, + metadata.ManagedPipelineType, ) } @@ -266,11 +268,12 @@ func (r *Release) MarkTenantPipelineProcessed() { r.Status.TenantProcessing.CompletionTime = &metav1.Time{Time: time.Now()} conditions.SetCondition(&r.Status.Conditions, tenantProcessedConditionType, metav1.ConditionTrue, SucceededReason) - go metrics.RegisterCompletedReleaseTenantPipelineProcessing( + go metrics.RegisterCompletedReleasePipelineProcessing( r.Status.TenantProcessing.StartTime, r.Status.TenantProcessing.CompletionTime, SucceededReason.String(), r.Status.Target, + metadata.TenantPipelineType, ) } @@ -286,11 +289,12 @@ func (r *Release) MarkManagedPipelineProcessing() { conditions.SetCondition(&r.Status.Conditions, managedProcessedConditionType, metav1.ConditionFalse, ProgressingReason) - go metrics.RegisterNewReleaseManagedPipelineProcessing( + go metrics.RegisterNewReleasePipelineProcessing( r.Status.ManagedProcessing.StartTime, r.Status.StartTime, ProgressingReason.String(), r.Status.Target, + metadata.ManagedPipelineType, ) } @@ -306,11 +310,12 @@ func (r *Release) MarkTenantPipelineProcessing() { conditions.SetCondition(&r.Status.Conditions, tenantProcessedConditionType, metav1.ConditionFalse, ProgressingReason) - go metrics.RegisterNewReleaseTenantPipelineProcessing( + go metrics.RegisterNewReleasePipelineProcessing( r.Status.TenantProcessing.StartTime, r.Status.StartTime, ProgressingReason.String(), r.Status.Target, + metadata.TenantPipelineType, ) } @@ -323,11 +328,12 @@ func (r *Release) MarkManagedPipelineProcessingFailed(message string) { r.Status.ManagedProcessing.CompletionTime = &metav1.Time{Time: time.Now()} conditions.SetConditionWithMessage(&r.Status.Conditions, managedProcessedConditionType, metav1.ConditionFalse, FailedReason, message) - go metrics.RegisterCompletedReleaseManagedPipelineProcessing( + go metrics.RegisterCompletedReleasePipelineProcessing( r.Status.ManagedProcessing.StartTime, r.Status.ManagedProcessing.CompletionTime, FailedReason.String(), r.Status.Target, + metadata.ManagedPipelineType, ) } @@ -340,11 +346,12 @@ func (r *Release) MarkTenantPipelineProcessingFailed(message string) { r.Status.TenantProcessing.CompletionTime = &metav1.Time{Time: time.Now()} conditions.SetConditionWithMessage(&r.Status.Conditions, tenantProcessedConditionType, metav1.ConditionFalse, FailedReason, message) - go metrics.RegisterCompletedReleaseTenantPipelineProcessing( + go metrics.RegisterCompletedReleasePipelineProcessing( r.Status.TenantProcessing.StartTime, r.Status.TenantProcessing.CompletionTime, FailedReason.String(), r.Status.Target, + metadata.TenantPipelineType, ) } diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 63c380b2..ec2bbd57 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -551,8 +551,8 @@ func (in *ReleaseStatus) DeepCopyInto(out *ReleaseStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - in.PostActionsExecution.DeepCopyInto(&out.PostActionsExecution) in.ManagedProcessing.DeepCopyInto(&out.ManagedProcessing) + in.PostActionsExecution.DeepCopyInto(&out.PostActionsExecution) in.TenantProcessing.DeepCopyInto(&out.TenantProcessing) in.Validation.DeepCopyInto(&out.Validation) if in.CompletionTime != nil { diff --git a/metrics/release.go b/metrics/release.go index 9ebc4caa..49623d36 100644 --- a/metrics/release.go +++ b/metrics/release.go @@ -39,18 +39,10 @@ var ( []string{}, ) - ReleaseConcurrentManagedPipelineProcessingsTotal = prometheus.NewGaugeVec( + ReleaseConcurrentProcessingsTotal = prometheus.NewGaugeVec( prometheus.GaugeOpts{ - Name: "release_concurrent_managed_pipeline_processings_total", - Help: "Total number of concurrent release managed pipeline processing attempts", - }, - []string{}, - ) - - ReleaseConcurrentTenantPipelineProcessingsTotal = prometheus.NewGaugeVec( - prometheus.GaugeOpts{ - Name: "release_concurrent_tenant_pipeline_processings_total", - Help: "Total number of concurrent release tenant pipeline processing attempts", + Name: "release_concurrent_processings_total", + Help: "Total number of concurrent release processing attempts", }, []string{}, ) @@ -62,6 +54,7 @@ var ( releasePreProcessingDurationSecondsLabels = []string{ "reason", "target", + "type", } releasePreProcessingDurationSecondsOpts = prometheus.HistogramOpts{ Name: "release_pre_processing_duration_seconds", @@ -115,27 +108,18 @@ var ( Buckets: []float64{60, 150, 300, 450, 600, 750, 900, 1050, 1200, 1800, 3600}, } - ReleaseManagedPipelineProcessingDurationSeconds = prometheus.NewHistogramVec( - releaseManagedPipelineProcessingDurationSecondsOpts, + ReleaseProcessingDurationSeconds = prometheus.NewHistogramVec( + releaseProcessingDurationSecondsOpts, releaseProcessingDurationSecondsLabels, ) releaseProcessingDurationSecondsLabels = []string{ "reason", "target", + "type", } - releaseManagedPipelineProcessingDurationSecondsOpts = prometheus.HistogramOpts{ - Name: "release_managed_pipeline_processing_duration_seconds", - Help: "How long in seconds a Release Managed Pipeline processing takes to complete", - Buckets: []float64{60, 150, 300, 450, 600, 750, 900, 1050, 1200, 1800, 3600}, - } - - ReleaseTenantPipelineProcessingDurationSeconds = prometheus.NewHistogramVec( - releaseTenantPipelineProcessingDurationSecondsOpts, - releaseProcessingDurationSecondsLabels, - ) - releaseTenantPipelineProcessingDurationSecondsOpts = prometheus.HistogramOpts{ - Name: "release_tenant_pipeline_processing_duration_seconds", - Help: "How long in seconds a Release Tenant Pipeline processing takes to complete", + releaseProcessingDurationSecondsOpts = prometheus.HistogramOpts{ + Name: "release_processing_duration_seconds", + Help: "How long in seconds a Release processing takes to complete", Buckets: []float64{60, 150, 300, 450, 600, 750, 900, 1050, 1200, 1800, 3600}, } @@ -199,40 +183,22 @@ func RegisterCompletedReleasePostActionsExecuted(startTime, completionTime *meta ReleaseConcurrentPostActionsExecutionsTotal.WithLabelValues().Dec() } -// RegisterCompletedReleaseManagedPipelineProcessing registers a Release processing as complete, adding a -// new observation for the Release Managed Pipeline processing duration and decreasing the number of -// concurrent processings. If either the startTime or the completionTime parameters are nil, no action -// will be taken. -func RegisterCompletedReleaseManagedPipelineProcessing(startTime, completionTime *metav1.Time, reason, target string) { - if startTime == nil || completionTime == nil { - return - } - - ReleaseManagedPipelineProcessingDurationSeconds. - With(prometheus.Labels{ - "reason": reason, - "target": target, - }). - Observe(completionTime.Sub(startTime.Time).Seconds()) - ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues().Dec() -} - -// RegisterCompletedReleaseTenantPipelineProcessing registers a Release processing as complete, adding a -// new observation for the Release Tenant Pipeline processing duration and decreasing the number of -// concurrent processings. If either the startTime or the completionTime parameters are nil, no action -// will be taken. -func RegisterCompletedReleaseTenantPipelineProcessing(startTime, completionTime *metav1.Time, reason, target string) { +// RegisterCompletedReleasePipelineProcessing registers a Release pipeline processing as complete, adding a +// new observation for the Release processing duration with the specific type and decreasing the number of +// concurent processings. If either the startTime or the completionTime parameters are nil, no action will be taken. +func RegisterCompletedReleasePipelineProcessing(startTime, completionTime *metav1.Time, reason, target, pipelineType string) { if startTime == nil || completionTime == nil { return } - ReleaseTenantPipelineProcessingDurationSeconds. + ReleaseProcessingDurationSeconds. With(prometheus.Labels{ "reason": reason, "target": target, + "type": pipelineType, }). Observe(completionTime.Sub(startTime.Time).Seconds()) - ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues().Dec() + ReleaseConcurrentProcessingsTotal.WithLabelValues().Dec() } // RegisterValidatedRelease registers a Release as validated, adding a new observation for the @@ -256,30 +222,10 @@ func RegisterNewRelease() { ReleaseConcurrentTotal.WithLabelValues().Inc() } -// RegisterNewReleaseManagedPipelineProcessing registers a new Release Managed Pipeline processing, -// adding a new observation for the Release start managed pipeline processing duration and increasing -// the number of concurrent processings. If either the startTime or the processingStartTime are nil, no -// action will be taken. -func RegisterNewReleaseManagedPipelineProcessing(startTime, processingStartTime *metav1.Time, reason, target string) { - if startTime == nil || processingStartTime == nil { - return - } - - ReleasePreProcessingDurationSeconds. - With(prometheus.Labels{ - "reason": reason, - "target": target, - }). - Observe(processingStartTime.Sub(startTime.Time).Seconds()) - - ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues().Inc() -} - -// RegisterNewReleaseTenantPipelineProcessing registers a new Release Tenant Pipeline processing, -// adding a new observation for the Release start tenant pipeline processing duration and increasing -// the number of concurrent processings. If either the startTime or the processingStartTime are nil, no -// action will be taken. -func RegisterNewReleaseTenantPipelineProcessing(startTime, processingStartTime *metav1.Time, reason, target string) { +// RegisterNewReleaseManagedPipelineProcessing registers a new Release Pipeline processing, adding a +// new observation for the Release start pipeline processing duration and increasing the number of +// concurrent processings. If either the startTime or the processingStartTime are nil, no action will be taken. +func RegisterNewReleasePipelineProcessing(startTime, processingStartTime *metav1.Time, reason, target, pipelineType string) { if startTime == nil || processingStartTime == nil { return } @@ -288,10 +234,11 @@ func RegisterNewReleaseTenantPipelineProcessing(startTime, processingStartTime * With(prometheus.Labels{ "reason": reason, "target": target, + "type": pipelineType, }). Observe(processingStartTime.Sub(startTime.Time).Seconds()) - ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues().Inc() + ReleaseConcurrentProcessingsTotal.WithLabelValues().Inc() } // RegisterNewReleasePostActionsExecution register a new Release post-actions execution, increasing the number of @@ -303,15 +250,13 @@ func RegisterNewReleasePostActionsExecution() { func init() { metrics.Registry.MustRegister( ReleaseConcurrentTotal, - ReleaseConcurrentManagedPipelineProcessingsTotal, - ReleaseConcurrentTenantPipelineProcessingsTotal, + ReleaseConcurrentProcessingsTotal, ReleaseConcurrentPostActionsExecutionsTotal, ReleasePreProcessingDurationSeconds, ReleaseValidationDurationSeconds, ReleaseDurationSeconds, ReleasePostActionsExecutionDurationSeconds, - ReleaseManagedPipelineProcessingDurationSeconds, - ReleaseTenantPipelineProcessingDurationSeconds, + ReleaseProcessingDurationSeconds, ReleaseTotal, ) } diff --git a/metrics/release_test.go b/metrics/release_test.go index 1d31e175..05420ba5 100644 --- a/metrics/release_test.go +++ b/metrics/release_test.go @@ -134,7 +134,7 @@ var _ = Describe("Release metrics", Ordered, func() { }) }) - When("RegisterCompletedReleaseManagedPipelineProcessing is called", func() { + When("RegisterCompletedReleasePipelineProcessing is called", func() { var completionTime, startTime *metav1.Time BeforeEach(func() { @@ -145,73 +145,32 @@ var _ = Describe("Release metrics", Ordered, func() { }) It("does nothing if the start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseManagedPipelineProcessing(nil, completionTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterCompletedReleasePipelineProcessing(nil, completionTime, "", "", "") + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) }) It("does nothing if the completion time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseManagedPipelineProcessing(startTime, nil, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterCompletedReleasePipelineProcessing(startTime, nil, "", "", "") + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) }) - It("decrements ReleaseConcurrentManagedPipelineProcessingsTotal", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseManagedPipelineProcessing(startTime, completionTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(-1))) + It("decrements ReleaseConcurrentProcessingsTotal", func() { + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterCompletedReleasePipelineProcessing(startTime, completionTime, "", "", "") + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(-1))) }) - It("adds an observation to ReleaseManagedPipelineProcessingDurationSeconds", func() { - RegisterCompletedReleaseManagedPipelineProcessing(startTime, completionTime, + It("adds an observation to ReleaseProcessingDurationSeconds", func() { + RegisterCompletedReleasePipelineProcessing(startTime, completionTime, releaseProcessingDurationSecondsLabels[0], releaseProcessingDurationSecondsLabels[1], + releaseProcessingDurationSecondsLabels[2], ) - Expect(testutil.CollectAndCompare(ReleaseManagedPipelineProcessingDurationSeconds, + Expect(testutil.CollectAndCompare(ReleaseProcessingDurationSeconds, test.NewHistogramReader( - releaseManagedPipelineProcessingDurationSecondsOpts, - releaseProcessingDurationSecondsLabels, - startTime, completionTime, - ))).To(Succeed()) - }) - }) - - When("RegisterCompletedReleaseTenantPipelineProcessing is called", func() { - var completionTime, startTime *metav1.Time - - BeforeEach(func() { - initializeMetrics() - - completionTime = &metav1.Time{} - startTime = &metav1.Time{Time: completionTime.Add(-60 * time.Second)} - }) - - It("does nothing if the start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseTenantPipelineProcessing(nil, completionTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - }) - - It("does nothing if the completion time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseTenantPipelineProcessing(startTime, nil, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - }) - - It("decrements ReleaseConcurrentTenantPipelineProcessingsTotal", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterCompletedReleaseTenantPipelineProcessing(startTime, completionTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(-1))) - }) - - It("adds an observation to ReleaseTenantPipelineProcessingDurationSeconds", func() { - RegisterCompletedReleaseTenantPipelineProcessing(startTime, completionTime, - releaseProcessingDurationSecondsLabels[0], - releaseProcessingDurationSecondsLabels[1], - ) - Expect(testutil.CollectAndCompare(ReleaseTenantPipelineProcessingDurationSeconds, - test.NewHistogramReader( - releaseTenantPipelineProcessingDurationSecondsOpts, + releaseProcessingDurationSecondsOpts, releaseProcessingDurationSecondsLabels, startTime, completionTime, ))).To(Succeed()) @@ -262,52 +221,7 @@ var _ = Describe("Release metrics", Ordered, func() { }) }) - When("RegisterNewReleaseManagedPipelineProcessing is called", func() { - var processingStartTime, startTime *metav1.Time - - BeforeEach(func() { - initializeMetrics() - - processingStartTime = &metav1.Time{} - startTime = &metav1.Time{Time: processingStartTime.Add(-60 * time.Second)} - }) - - It("does nothing if the processing start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseManagedPipelineProcessing(nil, processingStartTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - }) - - It("does nothing if the start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseManagedPipelineProcessing(startTime, nil, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - }) - - It("adds an observation to ReleasePreProcessingDurationSeconds", func() { - RegisterNewReleaseManagedPipelineProcessing(startTime, processingStartTime, - releasePreProcessingDurationSecondsLabels[0], - releasePreProcessingDurationSecondsLabels[1], - ) - Expect(testutil.CollectAndCompare(ReleasePreProcessingDurationSeconds, - test.NewHistogramReader( - releasePreProcessingDurationSecondsOpts, - releasePreProcessingDurationSecondsLabels, - startTime, processingStartTime, - ))).To(Succeed()) - }) - - It("increments ReleaseConcurrentManagedPipelineProcessingsTotal", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseManagedPipelineProcessing(startTime, processingStartTime, - releasePreProcessingDurationSecondsLabels[0], - releasePreProcessingDurationSecondsLabels[1], - ) - Expect(testutil.ToFloat64(ReleaseConcurrentManagedPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(1))) - }) - }) - - When("RegisterNewReleaseTenantPipelineProcessing is called", func() { + When("RegisterNewReleasePipelineProcessing is called", func() { var processingStartTime, startTime *metav1.Time BeforeEach(func() { @@ -318,21 +232,22 @@ var _ = Describe("Release metrics", Ordered, func() { }) It("does nothing if the processing start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseTenantPipelineProcessing(nil, processingStartTime, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterNewReleasePipelineProcessing(nil, processingStartTime, "", "", "") + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) }) It("does nothing if the start time is nil", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseTenantPipelineProcessing(startTime, nil, "", "") - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterNewReleasePipelineProcessing(startTime, nil, "", "", "") + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) }) It("adds an observation to ReleasePreProcessingDurationSeconds", func() { - RegisterNewReleaseTenantPipelineProcessing(startTime, processingStartTime, + RegisterNewReleasePipelineProcessing(startTime, processingStartTime, releasePreProcessingDurationSecondsLabels[0], releasePreProcessingDurationSecondsLabels[1], + releasePreProcessingDurationSecondsLabels[2], ) Expect(testutil.CollectAndCompare(ReleasePreProcessingDurationSeconds, test.NewHistogramReader( @@ -342,13 +257,14 @@ var _ = Describe("Release metrics", Ordered, func() { ))).To(Succeed()) }) - It("increments ReleaseConcurrentTenantPipelineProcessingsTotal", func() { - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) - RegisterNewReleaseTenantPipelineProcessing(startTime, processingStartTime, + It("increments ReleaseConcurrentProcessingsTotal", func() { + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(0))) + RegisterNewReleasePipelineProcessing(startTime, processingStartTime, releasePreProcessingDurationSecondsLabels[0], releasePreProcessingDurationSecondsLabels[1], + releasePreProcessingDurationSecondsLabels[2], ) - Expect(testutil.ToFloat64(ReleaseConcurrentTenantPipelineProcessingsTotal.WithLabelValues())).To(Equal(float64(1))) + Expect(testutil.ToFloat64(ReleaseConcurrentProcessingsTotal.WithLabelValues())).To(Equal(float64(1))) }) }) @@ -366,14 +282,12 @@ var _ = Describe("Release metrics", Ordered, func() { initializeMetrics = func() { ReleaseConcurrentTotal.Reset() - ReleaseConcurrentManagedPipelineProcessingsTotal.Reset() - ReleaseConcurrentTenantPipelineProcessingsTotal.Reset() + ReleaseConcurrentProcessingsTotal.Reset() ReleaseConcurrentPostActionsExecutionsTotal.Reset() ReleaseValidationDurationSeconds.Reset() ReleasePreProcessingDurationSeconds.Reset() ReleaseDurationSeconds.Reset() - ReleaseManagedPipelineProcessingDurationSeconds.Reset() - ReleaseTenantPipelineProcessingDurationSeconds.Reset() + ReleaseProcessingDurationSeconds.Reset() ReleasePostActionsExecutionDurationSeconds.Reset() ReleaseTotal.Reset() }