lint fixes

signalfx · Feb 27, 2025 · db21959 · db21959
1 parent e244a25
commit db21959
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/internal/components/components.go b/internal/components/components.go
@@ -148,7 +148,7 @@ import (
 
 func Get() (otelcol.Factories, error) {
 	var errs []error
-	extensions, err := extension.MakeFactoryMap(
+	extensions, err := otelcol.MakeFactoryMap[extension.Factory](
 		ackextension.NewFactory(),
 		basicauthextension.NewFactory(),
 		bearertokenauthextension.NewFactory(),
@@ -170,7 +170,7 @@ func Get() (otelcol.Factories, error) {
 		errs = append(errs, err)
 	}
 
-	receivers, err := receiver.MakeFactoryMap(
+	receivers, err := otelcol.MakeFactoryMap[receiver.Factory](
 		activedirectorydsreceiver.NewFactory(),
 		apachereceiver.NewFactory(),
 		apachesparkreceiver.NewFactory(),
@@ -244,7 +244,7 @@ func Get() (otelcol.Factories, error) {
 		errs = append(errs, err)
 	}
 
-	exporters, err := exporter.MakeFactoryMap(
+	exporters, err := otelcol.MakeFactoryMap[exporter.Factory](
 		awss3exporter.NewFactory(),
 		debugexporter.NewFactory(),
 		fileexporter.NewFactory(),
@@ -262,7 +262,7 @@ func Get() (otelcol.Factories, error) {
 		errs = append(errs, err)
 	}
 
-	processors, err := processor.MakeFactoryMap(
+	processors, err := otelcol.MakeFactoryMap[processor.Factory](
 		attributesprocessor.NewFactory(),
 		batchprocessor.NewFactory(),
 		cumulativetodeltaprocessor.NewFactory(),

diff --git a/internal/receiver/discoveryreceiver/config_test.go b/internal/receiver/discoveryreceiver/config_test.go
@@ -16,6 +16,7 @@ package discoveryreceiver
 
 import (
 	"fmt"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 	"path"
 	"testing"
 	"time"
@@ -139,7 +140,7 @@ func TestReceiverCreatorFactoryAndConfig(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, component.MustNewType("receiver_creator"), factory.Type())
 
-	require.NoError(t, component.ValidateConfig(rCfg))
+	require.NoError(t, xconfmap.Validate(rCfg))
 
 	creatorCfg, ok := rCfg.(*receivercreator.Config)
 	require.True(t, ok)

diff --git a/internal/receiver/lightprometheusreceiver/scraper_test.go b/internal/receiver/lightprometheusreceiver/scraper_test.go
@@ -17,6 +17,7 @@ package lightprometheusreceiver
 import (
 	"context"
 	"fmt"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -26,7 +27,6 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/receiver/receivertest"
@@ -85,9 +85,9 @@ func TestScraper(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			cfg := tt.cfg
 			cfg.ClientConfig.Endpoint = fmt.Sprintf("%s%s", promMock.URL, "/metrics")
-			require.NoError(t, component.ValidateConfig(cfg))
+			require.NoError(t, xconfmap.Validate(cfg))
 
-			scraper := newScraper(receivertest.NewNopSettings(), cfg)
+			scraper := newScraper(receivertest.NewNopSettingsWithType(receivertest.NopType), cfg)
 
 			err := scraper.start(context.Background(), componenttest.NewNopHost())
 			require.NoError(t, err)

diff --git a/internal/receiver/scriptedinputsreceiver/operator.go b/internal/receiver/scriptedinputsreceiver/operator.go
@@ -17,6 +17,7 @@ package scriptedinputsreceiver
 import (
 	"bufio"
 	"context"
+	"golang.org/x/text/encoding"
 	"io"
 	"sync"
 	"time"
@@ -44,7 +45,7 @@ type stdoutOperator struct {
 	logger        *zap.SugaredLogger
 	cancelAll     context.CancelFunc
 	splitFunc     bufio.SplitFunc
-	decoder       *decode.Decoder
+	decoder       *encoding.Decoder
 	scriptContent string
 	helper.InputOperator
 	wg sync.WaitGroup

diff --git a/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory_test.go b/internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory_test.go
@@ -16,6 +16,7 @@ package signalfxgatewayprometheusremotewritereceiver
 
 import (
 	"context"
+	"go.opentelemetry.io/collector/receiver"
 	"testing"
 	"time"
 
@@ -24,7 +25,6 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/otelcol"
-	"go.opentelemetry.io/collector/receiver"
 	"go.opentelemetry.io/collector/receiver/receivertest"
 
 	"github.com/signalfx/splunk-otel-collector/internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/metadata"
@@ -61,7 +61,7 @@ func TestNewFactory(t *testing.T) {
 func TestFactoryOtelIntegration(t *testing.T) {
 	cfg := NewFactory().CreateDefaultConfig()
 	require.NotNil(t, cfg)
-	factory, err := receiver.MakeFactoryMap(NewFactory())
+	factory, err := otelcol.MakeFactoryMap[receiver.Factory]()
 	factories := otelcol.Factories{Receivers: factory}
 	require.NoError(t, err)
 	parsedFactory := factories.Receivers[metadata.Type]