[receiver/podman] rename struct and function to keep expected receive…

…r.Factory and pass checkapi (open-telemetry#27077)

Related to: open-telemetry#26304

cmd/checkapi/allowlist.txt

@@ -7,5 +7,4 @@ receiver/collectdreceiver
 receiver/dockerstatsreceiver
 receiver/journaldreceiver
 receiver/kafkareceiver
-receiver/podmanreceiver
 receiver/windowseventlogreceiver

receiver/podmanreceiver/factory.go

@@ -9,7 +9,7 @@ import (
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
-	rcvr "go.opentelemetry.io/collector/receiver"
+	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/scraperhelper"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata"
@@ -19,11 +19,11 @@ const (
 	defaultAPIVersion = "3.3.1"
 )
 
-func NewFactory() rcvr.Factory {
-	return rcvr.NewFactory(
+func NewFactory() receiver.Factory {
+	return receiver.NewFactory(
 		metadata.Type,
 		createDefaultReceiverConfig,
-		rcvr.WithMetrics(createMetricsReceiver, metadata.MetricsStability))
+		receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability))
 }
 
 func createDefaultConfig() *Config {
@@ -44,12 +44,12 @@ func createDefaultReceiverConfig() component.Config {
 
 func createMetricsReceiver(
 	ctx context.Context,
-	params rcvr.CreateSettings,
+	params receiver.CreateSettings,
 	config component.Config,
 	consumer consumer.Metrics,
-) (rcvr.Metrics, error) {
+) (receiver.Metrics, error) {
 	podmanConfig := config.(*Config)
-	dsr, err := newReceiver(ctx, params, podmanConfig, consumer, nil)
+	dsr, err := newMetricsReceiver(ctx, params, podmanConfig, consumer, nil)
 	if err != nil {
 		return nil, err
 	}

receiver/podmanreceiver/receiver.go

@@ -15,28 +15,28 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/pdata/pmetric"
-	rcvr "go.opentelemetry.io/collector/receiver"
+	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/scrapererror"
 	"go.opentelemetry.io/collector/receiver/scraperhelper"
 	"go.uber.org/multierr"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata"
 )
 
-type receiver struct {
+type metricsReceiver struct {
 	config        *Config
-	set           rcvr.CreateSettings
+	set           receiver.CreateSettings
 	clientFactory clientFactory
 	scraper       *ContainerScraper
 }
 
-func newReceiver(
+func newMetricsReceiver(
 	_ context.Context,
-	set rcvr.CreateSettings,
+	set receiver.CreateSettings,
 	config *Config,
 	nextConsumer consumer.Metrics,
 	clientFactory clientFactory,
-) (rcvr.Metrics, error) {
+) (receiver.Metrics, error) {
 	err := config.Validate()
 	if err != nil {
 		return nil, err
@@ -46,7 +46,7 @@ func newReceiver(
 		clientFactory = newLibpodClient
 	}
 
-	recv := &receiver{
+	recv := &metricsReceiver{
 		config:        config,
 		clientFactory: clientFactory,
 		set:           set,
@@ -59,7 +59,7 @@ func newReceiver(
 	return scraperhelper.NewScraperControllerReceiver(&recv.config.ScraperControllerSettings, set, nextConsumer, scraperhelper.AddScraper(scrp))
 }
 
-func (r *receiver) start(ctx context.Context, _ component.Host) error {
+func (r *metricsReceiver) start(ctx context.Context, _ component.Host) error {
 	var err error
 	podmanClient, err := r.clientFactory(r.set.Logger, r.config)
 	if err != nil {
@@ -79,7 +79,7 @@ type result struct {
 	err error
 }
 
-func (r *receiver) scrape(ctx context.Context) (pmetric.Metrics, error) {
+func (r *metricsReceiver) scrape(ctx context.Context) (pmetric.Metrics, error) {
 	containers := r.scraper.getContainers()
 	results := make(chan result, len(containers))
 

receiver/podmanreceiver/receiver_test.go

@@ -33,19 +33,19 @@ func TestNewReceiver(t *testing.T) {
 		},
 	}
 	nextConsumer := consumertest.NewNop()
-	mr, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), config, nextConsumer, nil)
+	mr, err := newMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), config, nextConsumer, nil)
 
 	assert.NotNil(t, mr)
 	assert.Nil(t, err)
 }
 
 func TestNewReceiverErrors(t *testing.T) {
-	r, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil)
+	r, err := newMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil)
 	assert.Nil(t, r)
 	require.Error(t, err)
 	assert.Equal(t, "config.Endpoint must be specified", err.Error())
 
-	r, err = newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{Endpoint: "someEndpoint"}, consumertest.NewNop(), nil)
+	r, err = newMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{Endpoint: "someEndpoint"}, consumertest.NewNop(), nil)
 	assert.Nil(t, r)
 	require.Error(t, err)
 	assert.Equal(t, "config.CollectionInterval must be specified", err.Error())
@@ -58,7 +58,7 @@ func TestScraperLoop(t *testing.T) {
 	client := make(mockClient)
 	consumer := make(mockConsumer)
 
-	r, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer, client.factory)
+	r, err := newMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), cfg, consumer, client.factory)
 	require.NoError(t, err)
 	assert.NotNil(t, r)
 

receiver/podmanreceiver/receiver_windows.go

@@ -11,7 +11,7 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 )
 
-func newReceiver(
+func newMetricsReceiver(
 	_ context.Context,
 	settings receiver.CreateSettings,
 	config *Config,

receiver/podmanreceiver/receiver_windows_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestNewReceiver(t *testing.T) {
-	mr, err := newReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil)
+	mr, err := newMetricsReceiver(context.Background(), receivertest.NewNopCreateSettings(), &Config{}, consumertest.NewNop(), nil)
 	assert.Nil(t, mr)
 	assert.Error(t, err)
 	assert.Equal(t, "podman receiver is not supported on windows", err.Error())