From 5df068a555d89c2a306429ffb5aeaaaa232e6d15 Mon Sep 17 00:00:00 2001 From: alekspog Date: Thu, 30 Mar 2023 22:06:16 +0300 Subject: [PATCH] use custom controller registry in tests Signed-off-by: alekspog --- controllers/alert_controller_test.go | 11 +++++++++-- go.mod | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/controllers/alert_controller_test.go b/controllers/alert_controller_test.go index bc82e652d..de975f249 100644 --- a/controllers/alert_controller_test.go +++ b/controllers/alert_controller_test.go @@ -28,6 +28,7 @@ import ( "github.com/fluxcd/pkg/ssa" . "github.com/onsi/gomega" + "github.com/prometheus/client_golang/prometheus" "github.com/sethvargo/go-limiter/memorystore" prommetrics "github.com/slok/go-http-metrics/metrics/prometheus" "github.com/slok/go-http-metrics/middleware" @@ -168,9 +169,12 @@ func TestAlertReconciler_EventHandler(t *testing.T) { ) g.Expect(createNamespace(namespace)).NotTo(HaveOccurred(), "failed to create test namespace") + reg := prometheus.NewRegistry() + eventMdlw := middleware.New(middleware.Config{ Recorder: prommetrics.NewRecorder(prommetrics.Config{ - Prefix: "gotk_event", + Prefix: "gotk_event", + Registry: reg, }), }) @@ -434,9 +438,12 @@ func TestAlertReconciler_EventHandler_CrossNamespaceRefs(t *testing.T) { ) g.Expect(createNamespace(namespace)).NotTo(HaveOccurred(), "failed to create test namespace") + reg := prometheus.NewRegistry() + eventMdlw := middleware.New(middleware.Config{ Recorder: prommetrics.NewRecorder(prommetrics.Config{ - Prefix: "gotk_event", + Prefix: "gotk_event", + Registry: reg, }), }) diff --git a/go.mod b/go.mod index 6f172e1ee..99b1785ee 100644 --- a/go.mod +++ b/go.mod @@ -24,6 +24,7 @@ require ( github.com/ktrysmt/go-bitbucket v0.9.55 github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1 github.com/onsi/gomega v1.27.2 + github.com/prometheus/client_golang v1.14.0 github.com/sethvargo/go-limiter v0.7.2 github.com/slok/go-http-metrics v0.10.0 github.com/spf13/pflag v1.0.5 @@ -110,7 +111,6 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect