resmgr,rdt: switch to RDT OpenTelemetry metrics collector.

Use the OpenTelemetry-based RDT metrics collector.

Signed-off-by: Krisztian Litkey <[email protected]>

Author: klihub

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/containers/nri-plugins/pkg/topology v0.0.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/intel/goresctrl v0.10.0
+	github.com/intel/goresctrl v0.11.0
 	github.com/intel/memtierd v0.1.1
 	github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.2
 	github.com/onsi/ginkgo/v2 v2.21.0

go.sum

@@ -840,8 +840,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/intel/goresctrl v0.10.0 h1:Q94PBhLtQM/aVxVTKzB1j/ooMuV+9XleTN1fq2OGsSo=
-github.com/intel/goresctrl v0.10.0/go.mod h1:1S8GDqL46GuKb525bxNhIEEkhf4rhVcbSf9DuKhp7mw=
+github.com/intel/goresctrl v0.11.0 h1:FnlyrQxgjp9nm2hccwvBDc7qmf9uLxKf0DC6CKobnMA=
+github.com/intel/goresctrl v0.11.0/go.mod h1:F6jINn5WKuXXHAjmE7eTBjeHPmqT2kiWStrggYIm+UM=
 github.com/intel/memtierd v0.1.1 h1:hGSN0+dzjaUkwgkJrk6B9SU4dntggXLpXgs9Dm+jfz4=
 github.com/intel/memtierd v0.1.1/go.mod h1:NFDBvjoDS42gBK/c9q/CYCJ2pt/+g7UQwOOBvQli4z0=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

pkg/apis/config/v1alpha1/resmgr/control/rdt/config.go

@@ -37,7 +37,8 @@ var (
 	SetConfig  func(*rdt.Config, bool) error = rdt.SetConfig
 
 	// And some that we need for other plumbing.
-	NewCollector = rdt.NewCollector
+	NewCollector                     = rdt.NewCollector
+	RegisterOpenTelemetryInstruments = rdt.RegisterOpenTelemetryInstruments
 )
 
 // Config provides runtime configuration for class based cache allocation

pkg/resmgr/rdt.go

@@ -21,17 +21,15 @@ import (
 	"github.com/containers/nri-plugins/pkg/apis/config/v1alpha1/resmgr/control/rdt"
 	logger "github.com/containers/nri-plugins/pkg/log"
 	"github.com/containers/nri-plugins/pkg/metrics"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 var (
 	rdtlog = logger.Get("goresctrl")
 )
 
 type rdtControl struct {
-	hostRoot  string
-	resmgr    *resmgr
-	collector *rdtCollector
+	hostRoot string
+	resmgr   *resmgr
 }
 
 func newRdtControl(resmgr *resmgr, hostRoot string) *rdtControl {
@@ -41,15 +39,9 @@ func newRdtControl(resmgr *resmgr, hostRoot string) *rdtControl {
 		rdt.SetPrefix(opt.HostRoot)
 	}
 
-	collector, err := registerRdtCollector()
-	if err != nil {
-		log.Error("failed to register RDT metrics collector: %v", err)
-	}
-
 	return &rdtControl{
-		resmgr:    resmgr,
-		hostRoot:  hostRoot,
-		collector: collector,
+		resmgr:   resmgr,
+		hostRoot: hostRoot,
 	}
 }
 
@@ -77,46 +69,14 @@ func (c *rdtControl) configure(cfg *rdt.Config) error {
 		} else {
 			log.Info("goresctrl/rdt running in discovery mode")
 		}
+
+		meter := metrics.Provider("policy").Meter("rdt", metrics.WithOmitSubsystem())
+		if err := rdt.RegisterOpenTelemetryInstruments(meter); err != nil {
+			return fmt.Errorf("failed to register OpenTelemetry instruments: %w", err)
+		}
 	}
 
 	c.resmgr.cache.ConfigureRDTControl(cfg.Enable)
-	c.collector.enable(cfg.Enable)
 
 	return nil
 }
-
-type rdtCollector struct {
-	prometheus.Collector
-	enabled bool
-}
-
-func registerRdtCollector() (*rdtCollector, error) {
-	options := []metrics.RegisterOption{
-		metrics.WithGroup("policy"),
-		metrics.WithCollectorOptions(
-			metrics.WithoutSubsystem(),
-		),
-	}
-
-	c := &rdtCollector{Collector: rdt.NewCollector()}
-
-	if err := metrics.Register("rdt", c, options...); err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-func (c *rdtCollector) enable(enabled bool) {
-	c.enabled = enabled
-}
-
-func (c *rdtCollector) Describe(ch chan<- *prometheus.Desc) {
-	rdtlog.Debug("describing RDT metrics")
-	c.Collector.Describe(ch)
-}
-
-func (c *rdtCollector) Collect(ch chan<- prometheus.Metric) {
-	rdtlog.Debug("collecting RDT metrics")
-	c.Collector.Collect(ch)
-}

pkg/resmgr/resource-manager.go

@@ -174,15 +174,15 @@ func (m *resmgr) start(cfg cfgapi.ResmgrConfig) error {
 
 	//	m.cache.ConfigureBlockIOControl(mCfg.Control.BlockIO.Enable)
 
-	if err := m.blkio.configure(&mCfg.Control.BlockIO); err != nil {
+	if err := instrumentation.Reconfigure(&mCfg.Instrumentation); err != nil {
 		return err
 	}
 
-	if err := m.rdt.configure(&mCfg.Control.RDT); err != nil {
+	if err := m.blkio.configure(&mCfg.Control.BlockIO); err != nil {
 		return err
 	}
 
-	if err := instrumentation.Reconfigure(&mCfg.Instrumentation); err != nil {
+	if err := m.rdt.configure(&mCfg.Control.RDT); err != nil {
 		return err
 	}