Cleanup merge + missing review comments + fix deprecations from go.mo…

…d update

CHANGELOG.md

@@ -42,11 +42,6 @@ v0.38.0-rc.0 (2023-11-16)
     - renamed 3 metrics starting with `mysql_perf_schema_transaction_` to start with `mysql_perf_schema_transactions_` to be consistent with column names.
     - exposing only server's own stats by matching `MEMBER_ID` with `@@server_uuid` resulting "member_id" label to be dropped.
 
-### Other changes
-
-- Bump `mysqld_exporter` version to v0.15.0. (@marctc)
-- Bump `github-exporter` version to 1.0.6. (@marctc)
-
 ### Features
 
 - Added a new `stage.decolorize` stage to `loki.process` component which

component/otelcol/config_filter_test.go

@@ -3,11 +3,13 @@ package otelcol_test
 import (
 	"testing"
 
+	"k8s.io/utils/ptr"
+
 	"github.com/grafana/agent/component/otelcol"
+
 	"github.com/grafana/river"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/plog"
-	"k8s.io/utils/pointer"
 )
 
 func TestConvertMatchProperties(t *testing.T) {
@@ -49,7 +51,7 @@ func TestConvertMatchProperties(t *testing.T) {
 		Libraries: []otelcol.InstrumentationLibrary{
 			{
 				Name:    "mongo-java-driver",
-				Version: pointer.String("3.8.0"),
+				Version: ptr.To("3.8.0"),
 			},
 		},
 		SpanKinds: []string{"span1"},

docs/sources/static/configuration/integrations/azure-exporter-config.md

@@ -107,7 +107,7 @@ The account used by Grafana Agent needs:
   # Can't be used if `regions` is set.
   [resource_graph_query_filter: <string>]
 
-  # Optional: The list of regions for gathering metrics. Enables gather metrics for all resources in the subscription.
+  # Optional: The list of regions for gathering metrics. Enables gathering metrics for all resources in the subscription.
   # The list of available `regions` to your subscription can be found by running the Azure CLI command `az account list-locations --query '[].name'`.
   # Can't be used if `resource_graph_query_filter` is set.
   regions:
@@ -156,7 +156,7 @@ The account used by Grafana Agent needs:
   # Optional: Which azure cloud environment to connect to, azurecloud, azurechinacloud, azuregovernmentcloud, or azurepprivatecloud
   [azure_cloud_environment: <string> | default = "azurecloud"]
 
-  # Optional: validation is disabled by default to reduce the number of azure exporter instances required when a `resource_type` has metrics with varying dimensions. 
+  # Optional: Validation is disabled by default to reduce the number of Azure exporter instances required when a `resource_type` has metrics with varying dimensions. 
   # Choosing to enable `validate_dimensions` will require one exporter instance per metric + dimension combination which can be very tedious to maintain.
   [validate_dimensions: <bool> | default = false]
 ```

go.mod

@@ -228,7 +228,6 @@ require (
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.28.3
 	k8s.io/apiextensions-apiserver v0.28.0
-	k8s.io/apimachinery v0.28.3
 	k8s.io/client-go v0.28.3
 	k8s.io/component-base v0.28.1
 	k8s.io/klog/v2 v2.100.1
@@ -618,6 +617,7 @@ require (
 	github.com/prometheus/tsdb v0.10.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
+	k8s.io/apimachinery v0.28.3
 )
 
 require (

pkg/operator/config/config_test.go

@@ -4,16 +4,17 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/grafana/agent/pkg/operator/assets"
-	"github.com/grafana/agent/pkg/util"
-	"github.com/grafana/agent/pkg/util/subset"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	k8s_yaml "sigs.k8s.io/yaml"
 
+	"github.com/grafana/agent/pkg/operator/assets"
+	"github.com/grafana/agent/pkg/util"
+	"github.com/grafana/agent/pkg/util/subset"
+
 	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
 )
 
@@ -231,7 +232,7 @@ func TestAdditionalScrapeConfigsMetrics(t *testing.T) {
 				Name:      "agent",
 			},
 			Spec: gragent.GrafanaAgentSpec{
-				Image:              pointer.String("grafana/agent:latest"),
+				Image:              ptr.To("grafana/agent:latest"),
 				ServiceAccountName: "agent",
 				Metrics: gragent.MetricsSubsystemSpec{
 					InstanceSelector: &meta_v1.LabelSelector{

pkg/operator/config/metrics_templates_test.go

@@ -6,16 +6,17 @@ import (
 	"strings"
 	"testing"
 
-	jsonnet "github.com/google/go-jsonnet"
-	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
-	"github.com/grafana/agent/pkg/operator/assets"
-	"github.com/grafana/agent/pkg/util"
+	"github.com/google/go-jsonnet"
 	prom_v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
+
+	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
+	"github.com/grafana/agent/pkg/operator/assets"
+	"github.com/grafana/agent/pkg/util"
 )
 
 func TestExternalLabels(t *testing.T) {
@@ -89,8 +90,8 @@ func TestExternalLabels(t *testing.T) {
 					},
 					Spec: gragent.GrafanaAgentSpec{
 						Metrics: gragent.MetricsSubsystemSpec{
-							MetricsExternalLabelName: pointer.String("deployment"),
-							ReplicaExternalLabelName: pointer.String("replica"),
+							MetricsExternalLabelName: ptr.To("deployment"),
+							ReplicaExternalLabelName: ptr.To("replica"),
 							ExternalLabels:           map[string]string{"foo": "bar"},
 						},
 					},

pkg/operator/reconciler_metrics.go

@@ -11,16 +11,17 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/google/go-jsonnet"
-	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
-	"github.com/grafana/agent/pkg/operator/clientutil"
-	"github.com/grafana/agent/pkg/operator/config"
 	apps_v1 "k8s.io/api/apps/v1"
 	core_v1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
+	"github.com/grafana/agent/pkg/operator/clientutil"
+	"github.com/grafana/agent/pkg/operator/config"
 )
 
 // createMetricsConfigurationSecret creates the Grafana Agent metrics configuration and stores
@@ -99,7 +100,7 @@ func (r *reconciler) createTelemetryConfigurationSecret(
 			Labels:    r.config.Labels.Merge(managedByOperatorLabels),
 			OwnerReferences: []v1.OwnerReference{{
 				APIVersion:         d.Agent.APIVersion,
-				BlockOwnerDeletion: pointer.Bool(true),
+				BlockOwnerDeletion: ptr.To(true),
 				Kind:               d.Agent.Kind,
 				Name:               d.Agent.Name,
 				UID:                d.Agent.UID,

pkg/operator/resources_metrics.go

@@ -5,15 +5,16 @@ import (
 	"fmt"
 	"strings"
 
-	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
 	prom_operator "github.com/prometheus-operator/prometheus-operator/pkg/operator"
 	apps_v1 "k8s.io/api/apps/v1"
 	core_v1 "k8s.io/api/core/v1"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
 )
 
 const (
@@ -77,8 +78,8 @@ func generateMetricsStatefulSetService(cfg *Config, d gragent.Deployment) *core_
 				APIVersion:         d.Agent.APIVersion,
 				Kind:               d.Agent.Kind,
 				Name:               d.Agent.Name,
-				BlockOwnerDeletion: pointer.Bool(true),
-				Controller:         pointer.Bool(true),
+				BlockOwnerDeletion: ptr.To(true),
+				Controller:         ptr.To(true),
 				UID:                d.Agent.UID,
 			}},
 			Labels: cfg.Labels.Merge(map[string]string{
@@ -230,8 +231,8 @@ func metadataFromPodTemplate(name string, d gragent.Deployment, tmpl core_v1.Pod
 		OwnerReferences: []meta_v1.OwnerReference{{
 			APIVersion:         d.Agent.APIVersion,
 			Kind:               d.Agent.Kind,
-			BlockOwnerDeletion: pointer.Bool(true),
-			Controller:         pointer.Bool(true),
+			BlockOwnerDeletion: ptr.To(true),
+			Controller:         ptr.To(true),
 			Name:               d.Agent.Name,
 			UID:                d.Agent.UID,
 		}},

pkg/operator/resources_pod_template.go

@@ -4,13 +4,14 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/grafana/agent/pkg/build"
-	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
-	"github.com/grafana/agent/pkg/operator/clientutil"
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
+
+	"github.com/grafana/agent/pkg/build"
+	gragent "github.com/grafana/agent/pkg/operator/apis/monitoring/v1alpha1"
+	"github.com/grafana/agent/pkg/operator/clientutil"
 )
 
 type podTemplateOptions struct {
@@ -258,7 +259,7 @@ func generatePodTemplate(
 			},
 			Resources: d.Agent.Spec.Resources,
 			SecurityContext: &core_v1.SecurityContext{
-				Privileged: pointer.Bool(opts.Privileged),
+				Privileged: ptr.To(opts.Privileged),
 			},
 			TerminationMessagePolicy: core_v1.TerminationMessageFallbackToLogsOnError,
 		},
@@ -288,7 +289,7 @@ func generatePodTemplate(
 			NodeSelector:                  d.Agent.Spec.NodeSelector,
 			PriorityClassName:             d.Agent.Spec.PriorityClassName,
 			RuntimeClassName:              d.Agent.Spec.RuntimeClassName,
-			TerminationGracePeriodSeconds: pointer.Int64(4800),
+			TerminationGracePeriodSeconds: ptr.To(int64(4800)),
 			Volumes:                       volumes,
 			Tolerations:                   d.Agent.Spec.Tolerations,
 			Affinity:                      d.Agent.Spec.Affinity,

pkg/util/testappender/internal/dtobuilder/dtobuilder.go

@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/model/textparse"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // Sample represents an individually written sample to a storage.Appender.
@@ -106,11 +106,11 @@ func (b *builder) buildFamiliesFromMetadata() {
 	for familyName, m := range b.Metadata {
 		mt := textParseToMetricType(m.Type)
 		mf := &dto.MetricFamily{
-			Name: pointer.String(familyName),
+			Name: ptr.To(familyName),
 			Type: &mt,
 		}
 		if m.Help != "" {
-			mf.Help = pointer.String(m.Help)
+			mf.Help = ptr.To(m.Help)
 		}
 
 		b.families = append(b.families, mf)
@@ -164,18 +164,18 @@ func (b *builder) buildMetricsFromSamples() {
 		// Retrieve the *dto.Metric based on labels.
 		m := getOrCreateMetric(mf, sample.Labels)
 		if sample.PrintTimestamp {
-			m.TimestampMs = pointer.Int64(sample.Timestamp)
+			m.TimestampMs = ptr.To(sample.Timestamp)
 		}
 
 		switch familyType(mf) {
 		case dto.MetricType_COUNTER:
 			m.Counter = &dto.Counter{
-				Value: pointer.Float64(sample.Value),
+				Value: ptr.To(sample.Value),
 			}
 
 		case dto.MetricType_GAUGE:
 			m.Gauge = &dto.Gauge{
-				Value: pointer.Float64(sample.Value),
+				Value: ptr.To(sample.Value),
 			}
 
 		case dto.MetricType_SUMMARY:
@@ -188,7 +188,7 @@ func (b *builder) buildMetricsFromSamples() {
 				val := uint64(sample.Value)
 				m.Summary.SampleCount = &val
 			case metricName == mf.GetName()+"_sum":
-				m.Summary.SampleSum = pointer.Float64(sample.Value)
+				m.Summary.SampleSum = ptr.To(sample.Value)
 			case metricName == mf.GetName():
 				quantile, err := strconv.ParseFloat(sample.Labels.Get(model.QuantileLabel), 64)
 				if err != nil {
@@ -197,13 +197,13 @@ func (b *builder) buildMetricsFromSamples() {
 
 				m.Summary.Quantile = append(m.Summary.Quantile, &dto.Quantile{
 					Quantile: &quantile,
-					Value:    pointer.Float64(sample.Value),
+					Value:    ptr.To(sample.Value),
 				})
 			}
 
 		case dto.MetricType_UNTYPED:
 			m.Untyped = &dto.Untyped{
-				Value: pointer.Float64(sample.Value),
+				Value: ptr.To(sample.Value),
 			}
 
 		case dto.MetricType_HISTOGRAM:
@@ -216,7 +216,7 @@ func (b *builder) buildMetricsFromSamples() {
 				val := uint64(sample.Value)
 				m.Histogram.SampleCount = &val
 			case metricName == mf.GetName()+"_sum":
-				m.Histogram.SampleSum = pointer.Float64(sample.Value)
+				m.Histogram.SampleSum = ptr.To(sample.Value)
 			case metricName == mf.GetName()+"_bucket":
 				boundary, err := strconv.ParseFloat(sample.Labels.Get(model.BucketLabel), 64)
 				if err != nil {
@@ -284,8 +284,8 @@ func toLabelPairs(mt dto.MetricType, ls labels.Labels) []*dto.LabelPair {
 		}
 
 		res = append(res, &dto.LabelPair{
-			Name:  pointer.String(l.Name),
-			Value: pointer.String(l.Value),
+			Name:  ptr.To(l.Name),
+			Value: ptr.To(l.Value),
 		})
 	}
 

tools/smoke/internal/tasks.go

@@ -9,7 +9,7 @@ import (
 	"github.com/go-kit/log/level"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // The Task interface represents some unit of work performed concurrently.
@@ -32,7 +32,7 @@ type deletePodTask struct {
 func (t *deletePodTask) Run(ctx context.Context) error {
 	level.Debug(t.logger).Log("msg", "deleting pod")
 	if err := t.clientset.CoreV1().Pods(t.namespace).Delete(ctx, t.pod, metav1.DeleteOptions{
-		GracePeriodSeconds: pointer.Int64(0),
+		GracePeriodSeconds: ptr.To(int64(0)),
 	}); err != nil {
 		level.Error(t.logger).Log("msg", "failed to delete pod", "err", err)
 	}
@@ -91,7 +91,7 @@ func (t *deletePodBySelectorTask) Run(ctx context.Context) error {
 		pod := list.Items[i].Name
 		level.Debug(t.logger).Log("msg", "deleting pod", "pod", pod)
 		if err := t.clientset.CoreV1().Pods(t.namespace).Delete(ctx, pod, metav1.DeleteOptions{
-			GracePeriodSeconds: pointer.Int64(0),
+			GracePeriodSeconds: ptr.To(int64(0)),
 		}); err != nil {
 			level.Error(t.logger).Log("msg", "failed to delete pod", "pod", pod, "err", err)
 		}