[receiver/kubeletstats] Update scope name to otelcol/kubeletstatsreceiver

CHANGELOG.md

@@ -7,6 +7,7 @@
 - `stackdriverexporter`: Remove the stackdriver exporter in favor of the identical googlecloud exporter (#9274)
 - `filelog`, `journald`, `syslog`, `tcplog`, `udplog`: Remove `preserve_to` field from sub-parsers (#9331)
 - `kafkametricsreceiver`: instrumentation name updated from `otelcol/kafkametrics` to `otelcol/kafkametricsreceiver` (#9406)
+- `kubeletstatsreceiver`: instrumentation name updated from `kubeletstats` to `otelcol/kubeletstatsreceiver` (#9400)
 
 ### 🚩 Deprecations 🚩
 

receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go

@@ -47,14 +47,14 @@ type metricDataAccumulator struct {
 	logger                *zap.Logger
 	metricGroupsToCollect map[MetricGroup]bool
 	time                  time.Time
-	typeStr               string
 }
 
 const (
 	k8sPrefix       = "k8s."
 	nodePrefix      = k8sPrefix + "node."
 	podPrefix       = k8sPrefix + "pod."
 	containerPrefix = "container."
+	scopeName       = "otelcol/kubeletstatsreceiver"
 )
 
 func (a *metricDataAccumulator) nodeStats(s stats.NodeStats) {
@@ -67,7 +67,7 @@ func (a *metricDataAccumulator) nodeStats(s stats.NodeStats) {
 	fillNodeResource(rm.Resource(), s)
 
 	ilm := rm.ScopeMetrics().AppendEmpty()
-	ilm.Scope().SetName(a.typeStr)
+	ilm.Scope().SetName(scopeName)
 
 	startTime := pcommon.NewTimestampFromTime(s.StartTime.Time)
 	currentTime := pcommon.NewTimestampFromTime(a.time)
@@ -90,7 +90,7 @@ func (a *metricDataAccumulator) podStats(s stats.PodStats) {
 	fillPodResource(rm.Resource(), s)
 
 	ilm := rm.ScopeMetrics().AppendEmpty()
-	ilm.Scope().SetName(a.typeStr)
+	ilm.Scope().SetName(scopeName)
 
 	startTime := pcommon.NewTimestampFromTime(s.StartTime.Time)
 	currentTime := pcommon.NewTimestampFromTime(a.time)
@@ -120,7 +120,7 @@ func (a *metricDataAccumulator) containerStats(sPod stats.PodStats, s stats.Cont
 	}
 
 	ilm := rm.ScopeMetrics().AppendEmpty()
-	ilm.Scope().SetName(a.typeStr)
+	ilm.Scope().SetName(scopeName)
 
 	startTime := pcommon.NewTimestampFromTime(s.StartTime.Time)
 	currentTime := pcommon.NewTimestampFromTime(a.time)
@@ -148,7 +148,7 @@ func (a *metricDataAccumulator) volumeStats(sPod stats.PodStats, s stats.VolumeS
 	}
 
 	ilm := rm.ScopeMetrics().AppendEmpty()
-	ilm.Scope().SetName(a.typeStr)
+	ilm.Scope().SetName(scopeName)
 
 	currentTime := pcommon.NewTimestampFromTime(a.time)
 	addVolumeMetrics(ilm.Metrics(), k8sPrefix, s, currentTime)

receiver/kubeletstatsreceiver/internal/kubelet/metrics.go

@@ -24,14 +24,13 @@ import (
 
 func MetricsData(
 	logger *zap.Logger, summary *stats.Summary,
-	metadata Metadata, typeStr string,
+	metadata Metadata,
 	metricGroupsToCollect map[MetricGroup]bool) []pmetric.Metrics {
 	acc := &metricDataAccumulator{
 		metadata:              metadata,
 		logger:                logger,
 		metricGroupsToCollect: metricGroupsToCollect,
 		time:                  time.Now(),
-		typeStr:               typeStr,
 	}
 
 	acc.nodeStats(summary.Node)

receiver/kubeletstatsreceiver/internal/kubelet/metrics_test.go

@@ -42,10 +42,10 @@ func TestMetricAccumulator(t *testing.T) {
 	metadataProvider := NewMetadataProvider(rc)
 	podsMetadata, _ := metadataProvider.Pods()
 	metadata := NewMetadata([]MetadataLabel{MetadataLabelContainerID}, podsMetadata, nil)
-	requireMetricsOk(t, MetricsData(zap.NewNop(), summary, metadata, "", ValidMetricGroups))
+	requireMetricsOk(t, MetricsData(zap.NewNop(), summary, metadata, ValidMetricGroups))
 
 	// Disable all groups
-	require.Equal(t, 0, len(MetricsData(zap.NewNop(), summary, metadata, "", map[MetricGroup]bool{})))
+	require.Equal(t, 0, len(MetricsData(zap.NewNop(), summary, metadata, map[MetricGroup]bool{})))
 }
 
 func requireMetricsOk(t *testing.T, mds []pmetric.Metrics) {
@@ -55,6 +55,7 @@ func requireMetricsOk(t *testing.T, mds []pmetric.Metrics) {
 			requireResourceOk(t, rm.Resource())
 			for j := 0; j < rm.ScopeMetrics().Len(); j++ {
 				ilm := rm.ScopeMetrics().At(j)
+				require.Equal(t, "otelcol/kubeletstatsreceiver", ilm.Scope().Name())
 				for k := 0; k < ilm.Metrics().Len(); k++ {
 					requireMetricOk(t, ilm.Metrics().At(k))
 				}
@@ -165,5 +166,5 @@ func fakeMetrics() []pmetric.Metrics {
 		PodMetricGroup:       true,
 		NodeMetricGroup:      true,
 	}
-	return MetricsData(zap.NewNop(), summary, Metadata{}, "foo", mgs)
+	return MetricsData(zap.NewNop(), summary, Metadata{}, mgs)
 }

receiver/kubeletstatsreceiver/scraper.go

@@ -84,7 +84,7 @@ func (r *kubletScraper) scrape(context.Context) (pmetric.Metrics, error) {
 	}
 
 	metadata := kubelet.NewMetadata(r.extraMetadataLabels, podsMetadata, r.detailedPVCLabelsSetter())
-	mds := kubelet.MetricsData(r.logger, summary, metadata, typeStr, r.metricGroupsToCollect)
+	mds := kubelet.MetricsData(r.logger, summary, metadata, r.metricGroupsToCollect)
 	md := pmetric.NewMetrics()
 	for i := range mds {
 		mds[i].ResourceMetrics().MoveAndAppendTo(md.ResourceMetrics())

receiver/kubeletstatsreceiver/scraper_test.go

@@ -123,6 +123,7 @@ func TestScraperWithMetadata(t *testing.T) {
 				rm := md.ResourceMetrics().At(i)
 				for j := 0; j < rm.ScopeMetrics().Len(); j++ {
 					ilm := rm.ScopeMetrics().At(j)
+					require.Equal(t, "otelcol/kubeletstatsreceiver", ilm.Scope().Name())
 					for k := 0; k < ilm.Metrics().Len(); k++ {
 						m := ilm.Metrics().At(k)
 						if strings.HasPrefix(m.Name(), tt.metricPrefix) {