Move metrics registry and initialization to pkg/metricsconfig

Before, metrics registry was defined in pkg/metrics and initialization functions in pkg/metrics/metricsconfig. It make sense to keep them together and outside of pkg/metrics, which contains a library for defining metrics. Now all code related to running the metrics server sits in pkg/metricsconfig. Signed-off-by: Anna Kapuscinska <[email protected]>
cilium · Jun 27, 2024 · af54bb6 · af54bb6
1 parent a1cbacb
commit af54bb6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/cmd/tetra/metrics/print.go b/cmd/tetra/metrics/print.go
@@ -10,7 +10,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 
-	"github.com/cilium/tetragon/pkg/metrics/metricsconfig"
+	"github.com/cilium/tetragon/pkg/metricsconfig"
 )
 
 func New() *cobra.Command {

diff --git a/cmd/tetragon/main.go b/cmd/tetragon/main.go
@@ -39,7 +39,7 @@ import (
 	"github.com/cilium/tetragon/pkg/health"
 	"github.com/cilium/tetragon/pkg/logger"
 	"github.com/cilium/tetragon/pkg/metrics"
-	"github.com/cilium/tetragon/pkg/metrics/metricsconfig"
+	"github.com/cilium/tetragon/pkg/metricsconfig"
 	"github.com/cilium/tetragon/pkg/observer"
 	"github.com/cilium/tetragon/pkg/option"
 	"github.com/cilium/tetragon/pkg/pidfile"
@@ -357,8 +357,8 @@ func tetragonExecute() error {
 	}
 
 	if option.Config.MetricsServer != "" {
-		go metrics.EnableMetrics(option.Config.MetricsServer)
-		metricsconfig.InitAllMetrics(metrics.GetRegistry())
+		go metricsconfig.EnableMetrics(option.Config.MetricsServer)
+		metricsconfig.InitAllMetrics(metricsconfig.GetRegistry())
 		go metrics.StartPodDeleteHandler()
 		// Handler must be registered before the watcher is started
 		metrics.RegisterPodDeleteHandler()

diff --git a/pkg/metrics/metricwithpod_test.go b/pkg/metrics/metricwithpod_test.go
@@ -17,15 +17,15 @@ import (
 	"github.com/cilium/tetragon/pkg/grpc/tracing"
 	"github.com/cilium/tetragon/pkg/metrics"
 	"github.com/cilium/tetragon/pkg/metrics/eventmetrics"
-	"github.com/cilium/tetragon/pkg/metrics/metricsconfig"
+	"github.com/cilium/tetragon/pkg/metricsconfig"
 )
 
 var sampleMsgGenericTracepointUnix = tracing.MsgGenericTracepointUnix{
 	PolicyName: "fake-policy",
 }
 
 func TestPodDelete(t *testing.T) {
-	reg := metrics.GetRegistry()
+	reg := metricsconfig.GetRegistry()
 	metricsconfig.InitAllMetrics(reg)
 
 	// Process four events, each one with different combination of pod/namespace.

diff --git a/pkg/metrics/metricsconfig/initmetrics.go → pkg/metricsconfig/initmetrics.go b/pkg/metrics/metricsconfig/initmetrics.go → pkg/metricsconfig/initmetrics.go
diff --git a/pkg/metrics/metrics.go → pkg/metricsconfig/root.go b/pkg/metrics/metrics.go → pkg/metricsconfig/root.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Authors of Tetragon
 
-package metrics
+package metricsconfig
 
 import (
 	"net/http"

diff --git a/pkg/observer/observertesthelper/observer_test_helper.go b/pkg/observer/observertesthelper/observer_test_helper.go
@@ -21,8 +21,7 @@ import (
 
 	"github.com/cilium/tetragon/pkg/cgrouprate"
 	"github.com/cilium/tetragon/pkg/encoder"
-	"github.com/cilium/tetragon/pkg/metrics"
-	"github.com/cilium/tetragon/pkg/metrics/metricsconfig"
+	"github.com/cilium/tetragon/pkg/metricsconfig"
 	"github.com/cilium/tetragon/pkg/observer"
 	hubbleV1 "github.com/cilium/tetragon/pkg/oldhubble/api/v1"
 	hubbleCilium "github.com/cilium/tetragon/pkg/oldhubble/cilium"
@@ -265,8 +264,8 @@ func getDefaultObserver(tb testing.TB, ctx context.Context, initialSensor *senso
 	// at some point in the future. I just don't see a better way that doesn't involve
 	// a lot of code changes in a lot of a files.
 	if !metricsEnabled {
-		go metrics.EnableMetrics(metricsAddr)
-		metricsconfig.InitAllMetrics(metrics.GetRegistry())
+		go metricsconfig.EnableMetrics(metricsAddr)
+		metricsconfig.InitAllMetrics(metricsconfig.GetRegistry())
 		metricsEnabled = true
 	}