Remove the unnecessary MetadataService interface (#2153)

Author: rakyll

receiver/prometheusreceiver/internal/metadata.go

@@ -22,11 +22,6 @@ import (
 	"github.com/prometheus/prometheus/scrape"
 )
 
-// MetadataService is an adapter to ScrapeManager and provide only the functionality which is needed
-type MetadataService interface {
-	Get(job, instance string) (MetadataCache, error)
-}
-
 // MetadataCache is an adapter to prometheus' scrape.Target  and provide only the functionality which is needed
 type MetadataCache interface {
 	Metadata(metricName string) (scrape.MetricMetadata, bool)
@@ -37,12 +32,12 @@ type ScrapeManager interface {
 	TargetsAll() map[string][]*scrape.Target
 }
 
-type mService struct {
+type metadataService struct {
 	sm ScrapeManager
 }
 
-func (t *mService) Get(job, instance string) (MetadataCache, error) {
-	targetGroup, ok := t.sm.TargetsAll()[job]
+func (s *metadataService) Get(job, instance string) (MetadataCache, error) {
+	targetGroup, ok := s.sm.TargetsAll()[job]
 	if !ok {
 		return nil, errors.New("unable to find a target group with job=" + job)
 	}

receiver/prometheusreceiver/internal/ocastore.go

@@ -50,7 +50,7 @@ type ocaStore struct {
 
 	running              int32 // access atomically
 	sink                 consumer.MetricsConsumer
-	mc                   *mService
+	mc                   *metadataService
 	jobsMap              *JobsMap
 	useStartTimeMetric   bool
 	startTimeMetricRegex string
@@ -77,7 +77,7 @@ func NewOcaStore(ctx context.Context, sink consumer.MetricsConsumer, logger *zap
 // cannot accept any Appender() request
 func (o *ocaStore) SetScrapeManager(scrapeManager *scrape.Manager) {
 	if scrapeManager != nil && atomic.CompareAndSwapInt32(&o.running, runningStateInit, runningStateReady) {
-		o.mc = &mService{sm: scrapeManager}
+		o.mc = &metadataService{sm: scrapeManager}
 	}
 }
 

receiver/prometheusreceiver/internal/transaction.go

@@ -66,14 +66,14 @@ type transaction struct {
 	useStartTimeMetric   bool
 	startTimeMetricRegex string
 	receiverName         string
-	ms                   MetadataService
+	ms                   *metadataService
 	node                 *commonpb.Node
 	resource             *resourcepb.Resource
 	metricBuilder        *metricBuilder
 	logger               *zap.Logger
 }
 
-func newTransaction(ctx context.Context, jobsMap *JobsMap, useStartTimeMetric bool, startTimeMetricRegex string, receiverName string, ms MetadataService, sink consumer.MetricsConsumer, logger *zap.Logger) *transaction {
+func newTransaction(ctx context.Context, jobsMap *JobsMap, useStartTimeMetric bool, startTimeMetricRegex string, receiverName string, ms *metadataService, sink consumer.MetricsConsumer, logger *zap.Logger) *transaction {
 	return &transaction{
 		id:                   atomic.AddInt64(&idSeq, 1),
 		ctx:                  ctx,

receiver/prometheusreceiver/internal/transaction_test.go

@@ -53,7 +53,7 @@ func Test_transaction(t *testing.T) {
 		},
 	)
 
-	ms := &mService{
+	ms := &metadataService{
 		sm: &mockScrapeManager{targets: map[string][]*scrape.Target{
 			"test": {scrape.NewTarget(processedLabels, discoveredLabels, nil)},
 		}},