Bump prometheus/prometheus to v0.312.0 and cascading dependencies

apis/v1alpha1/groupversion_info.go

@@ -16,6 +16,7 @@ var (
 	GroupVersion = schema.GroupVersion{Group: "cloudwatch.aws.amazon.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
+	//nolint:staticcheck // SA1019: types self-register via SchemeBuilder.Register() in init().
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

apis/v1alpha2/groupversion_info.go

@@ -16,6 +16,7 @@ var (
 	GroupVersion = schema.GroupVersion{Group: "cloudwatch.aws.amazon.com", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
+	//nolint:staticcheck // SA1019: types self-register via SchemeBuilder.Register() in init().
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

cmd/amazon-cloudwatch-agent-target-allocator/main.go

@@ -6,6 +6,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"os/signal"
 	"syscall"
@@ -88,7 +89,13 @@ func main() {
 	srv := server.NewServer(log, allocator, cfg.ListenAddr, httpOptions...)
 
 	discoveryCtx, discoveryCancel := context.WithCancel(ctx)
-	discoveryManager = discovery.NewManager(discoveryCtx, nil, prometheus.NewRegistry(), nil)
+	registry := prometheus.NewRegistry()
+	sdMetrics, err := discovery.CreateAndRegisterSDMetrics(registry)
+	if err != nil {
+		setupLog.Error(err, "Unable to register service discovery metrics")
+		os.Exit(1)
+	}
+	discoveryManager = discovery.NewManager(discoveryCtx, slog.New(slog.DiscardHandler), registry, sdMetrics)
 
 	targetDiscoverer = target.NewDiscoverer(log, discoveryManager, allocatorPrehook, srv)
 	collectorWatcher, collectorWatcherErr := collector.NewClient(log, cfg.ClusterConfig)

cmd/amazon-cloudwatch-agent-target-allocator/target/discovery_test.go

@@ -294,7 +294,10 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
 
 	scu := &mockScrapeConfigUpdater{}
 	ctx := context.Background()
-	d := discovery.NewManager(ctx, slog.Default(), prometheus.NewRegistry(), nil)
+	reg := prometheus.NewRegistry()
+	sdMetrics, err := discovery.CreateAndRegisterSDMetrics(reg)
+	require.NoError(t, err)
+	d := discovery.NewManager(ctx, slog.Default(), reg, sdMetrics)
 	manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu)
 
 	for _, tc := range tests {
@@ -330,7 +333,10 @@ func TestDiscovery_ScrapeConfigHashing(t *testing.T) {
 func TestDiscovery_NoConfig(t *testing.T) {
 	scu := &mockScrapeConfigUpdater{mockCfg: map[string]*promconfig.ScrapeConfig{}}
 	ctx, cancelFunc := context.WithCancel(context.Background())
-	d := discovery.NewManager(ctx, slog.Default(), prometheus.NewRegistry(), nil)
+	reg := prometheus.NewRegistry()
+	sdMetrics, err := discovery.CreateAndRegisterSDMetrics(reg)
+	require.NoError(t, err)
+	d := discovery.NewManager(ctx, slog.Default(), reg, sdMetrics)
 	manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu)
 	defer close(manager.close)
 	defer cancelFunc()
@@ -377,7 +383,10 @@ func BenchmarkApplyScrapeConfig(b *testing.B) {
 
 	scu := &mockScrapeConfigUpdater{}
 	ctx := context.Background()
-	d := discovery.NewManager(ctx, slog.Default(), prometheus.NewRegistry(), nil)
+	reg := prometheus.NewRegistry()
+	sdMetrics, err := discovery.CreateAndRegisterSDMetrics(reg)
+	require.NoError(b, err)
+	d := discovery.NewManager(ctx, slog.Default(), reg, sdMetrics)
 	manager := NewDiscoverer(ctrl.Log.WithName("test"), d, nil, scu)
 
 	b.ResetTimer()

config/rbac/role.yaml

@@ -72,6 +72,9 @@ rules:
   - cloudwatch.aws.amazon.com
   resources:
   - amazoncloudwatchagents
+  - dcgmexporters
+  - instrumentations
+  - neuronmonitors
   verbs:
   - get
   - list
@@ -82,75 +85,10 @@ rules:
   - cloudwatch.aws.amazon.com
   resources:
   - amazoncloudwatchagents/finalizers
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
   - amazoncloudwatchagents/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
-  - dcgmexporters
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
   - dcgmexporters/finalizers
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
   - dcgmexporters/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
-  - instrumentations
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
-  - neuronmonitors
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
   - neuronmonitors/finalizers
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloudwatch.aws.amazon.com
-  resources:
   - neuronmonitors/status
   verbs:
   - get