Update OTel dependencies (#1061)

Author: dhurley

go.mod

@@ -5,8 +5,6 @@
 package collector
 
 import (
-	"errors"
-
 	nginxreceiver "github.com/nginx/agent/v3/internal/collector/nginxossreceiver"
 	"github.com/nginx/agent/v3/internal/collector/nginxplusreceiver"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
@@ -39,32 +37,11 @@ import (
 // OTelComponentFactories returns all the OTel collector components supported
 // based on https://github.com/DataDog/datadog-agent/blob/main/comp/otelcol/collector-contrib/impl/collectorcontrib.go
 func OTelComponentFactories() (otelcol.Factories, error) {
-	var errs error
-
-	connectors, err := createConnectorFactories()
-	if err != nil {
-		errs = errors.Join(errs, err)
-	}
-
-	extensions, err := createExtensionFactories()
-	if err != nil {
-		errs = errors.Join(errs, err)
-	}
-
-	receivers, err := createReceiverFactories()
-	if err != nil {
-		errs = errors.Join(errs, err)
-	}
-
-	processors, err := createProcessorFactories()
-	if err != nil {
-		errs = errors.Join(errs, err)
-	}
-
-	exporters, err := createExporterFactories()
-	if err != nil {
-		errs = errors.Join(errs, err)
-	}
+	connectors := createConnectorFactories()
+	extensions := createExtensionFactories()
+	receivers := createReceiverFactories()
+	processors := createProcessorFactories()
+	exporters := createExporterFactories()
 
 	factories := otelcol.Factories{
 		Connectors: connectors,
@@ -74,26 +51,29 @@ func OTelComponentFactories() (otelcol.Factories, error) {
 		Exporters:  exporters,
 	}
 
-	return factories, errs
+	return factories, nil
 }
 
-func createConnectorFactories() (map[component.Type]connector.Factory, error) {
-	var connectorsList []connector.Factory
-
-	return connector.MakeFactoryMap(connectorsList...)
+func createConnectorFactories() map[component.Type]connector.Factory {
+	return make(map[component.Type]connector.Factory)
 }
 
-func createExtensionFactories() (map[component.Type]extension.Factory, error) {
+func createExtensionFactories() map[component.Type]extension.Factory {
 	extensionsList := []extension.Factory{
 		headerssetterextension.NewFactory(),
 		healthcheckextension.NewFactory(),
 		pprofextension.NewFactory(),
 	}
 
-	return extension.MakeFactoryMap(extensionsList...)
+	extensions := make(map[component.Type]extension.Factory)
+	for _, extensionFactory := range extensionsList {
+		extensions[extensionFactory.Type()] = extensionFactory
+	}
+
+	return extensions
 }
 
-func createReceiverFactories() (map[component.Type]receiver.Factory, error) {
+func createReceiverFactories() map[component.Type]receiver.Factory {
 	receiverList := []receiver.Factory{
 		otlpreceiver.NewFactory(),
 		hostmetricsreceiver.NewFactory(),
@@ -102,10 +82,15 @@ func createReceiverFactories() (map[component.Type]receiver.Factory, error) {
 		tcplogreceiver.NewFactory(),
 	}
 
-	return receiver.MakeFactoryMap(receiverList...)
+	receivers := make(map[component.Type]receiver.Factory)
+	for _, receiverFactory := range receiverList {
+		receivers[receiverFactory.Type()] = receiverFactory
+	}
+
+	return receivers
 }
 
-func createProcessorFactories() (map[component.Type]processor.Factory, error) {
+func createProcessorFactories() map[component.Type]processor.Factory {
 	processorList := []processor.Factory{
 		attributesprocessor.NewFactory(),
 		batchprocessor.NewFactory(),
@@ -117,16 +102,26 @@ func createProcessorFactories() (map[component.Type]processor.Factory, error) {
 		transformprocessor.NewFactory(),
 	}
 
-	return processor.MakeFactoryMap(processorList...)
+	processors := make(map[component.Type]processor.Factory)
+	for _, processorFactory := range processorList {
+		processors[processorFactory.Type()] = processorFactory
+	}
+
+	return processors
 }
 
-func createExporterFactories() (map[component.Type]exporter.Factory, error) {
+func createExporterFactories() map[component.Type]exporter.Factory {
 	exporterList := []exporter.Factory{
 		debugexporter.NewFactory(),
 		prometheusexporter.NewFactory(),
 		otlpexporter.NewFactory(),
 		otlphttpexporter.NewFactory(),
 	}
 
-	return exporter.MakeFactoryMap(exporterList...)
+	exporters := make(map[component.Type]exporter.Factory)
+	for _, exporterFactory := range exporterList {
+		exporters[exporterFactory.Type()] = exporterFactory
+	}
+
+	return exporters
 }

go.sum

@@ -9,27 +9,29 @@ import (
 	"context"
 	"errors"
 
-	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/receiver"
-	"go.opentelemetry.io/collector/receiver/scraperhelper"
+	"go.opentelemetry.io/collector/scraper"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/config"
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/metadata"
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/scraper/accesslog"
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/scraper/stubstatus"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/consumer"
+	"go.opentelemetry.io/collector/receiver"
+	"go.opentelemetry.io/collector/scraper/scraperhelper"
 )
 
 // nolint: ireturn
 func NewFactory() receiver.Factory {
 	return receiver.NewFactory(
 		metadata.Type,
 		config.CreateDefaultConfig,
-		receiver.WithMetrics(createMetricsReceiver, metadata.MetricsStability))
+		receiver.WithMetrics(createMetrics, metadata.MetricsStability),
+	)
 }
 
 // nolint: ireturn
-func createMetricsReceiver(
+func createMetrics(
 	_ context.Context,
 	params receiver.Settings,
 	rConf component.Config,
@@ -40,24 +42,39 @@ func createMetricsReceiver(
 		return nil, errors.New("cast to metrics receiver config")
 	}
 
-	logger := params.Logger.Sugar()
+	var controllers []scraperhelper.ControllerOption
 
-	ns := stubstatus.NewScraper(params, cfg)
-	scraperOpts := []scraperhelper.ScraperControllerOption{
-		scraperhelper.AddScraperWithType(metadata.Type, ns),
+	stubStatusScraper := stubstatus.NewScraper(params, cfg)
+	stubStatusMetrics, stubStatusMetricsError := scraper.NewMetrics(
+		stubStatusScraper.Scrape,
+		scraper.WithStart(stubStatusScraper.Start),
+		scraper.WithShutdown(stubStatusScraper.Shutdown),
+	)
+	if stubStatusMetricsError != nil {
+		return nil, stubStatusMetricsError
 	}
 
+	controllers = append(controllers, scraperhelper.AddScraper(metadata.Type, stubStatusMetrics))
+
 	if len(cfg.AccessLogs) > 0 {
-		nals, err := accesslog.NewScraper(params, cfg)
-		if err != nil {
-			logger.Errorf("Failed to initialize NGINX Access Log scraper: %s", err.Error())
-		} else {
-			scraperOpts = append(scraperOpts, scraperhelper.AddScraperWithType(metadata.Type, nals))
+		accessLogScraper := accesslog.NewScraper(params, cfg)
+
+		accessLogMetrics, accessLogMetricsError := scraper.NewMetrics(
+			accessLogScraper.Scrape,
+			scraper.WithStart(accessLogScraper.Start),
+			scraper.WithShutdown(accessLogScraper.Shutdown),
+		)
+		if accessLogMetricsError != nil {
+			return nil, accessLogMetricsError
 		}
+
+		controllers = append(controllers, scraperhelper.AddScraper(metadata.Type, accessLogMetrics))
 	}
 
-	return scraperhelper.NewScraperControllerReceiver(
-		&cfg.ControllerConfig, params, cons,
-		scraperOpts...,
+	return scraperhelper.NewMetricsController(
+		&cfg.ControllerConfig,
+		params,
+		cons,
+		controllers...,
 	)
 }

internal/collector/factories.go

@@ -14,7 +14,7 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/receiver/receivertest"
-	"go.opentelemetry.io/collector/receiver/scraperhelper"
+	"go.opentelemetry.io/collector/scraper/scraperhelper"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/config"
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/metadata"
@@ -36,7 +36,7 @@ func TestCreateMetricsReceiver(t *testing.T) {
 	factory := NewFactory()
 	metricsReceiver, err := factory.CreateMetrics(
 		context.Background(),
-		receivertest.NewNopSettings(),
+		receivertest.NewNopSettings(metadata.Type),
 		&config.Config{
 			ControllerConfig: scraperhelper.ControllerConfig{
 				CollectionInterval: 10 * time.Second,

internal/collector/nginxossreceiver/factory.go

@@ -8,9 +8,10 @@ package config // import "github.com/open-telemetry/opentelemetry-collector-cont
 import (
 	"time"
 
+	"go.opentelemetry.io/collector/scraper/scraperhelper"
+
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
-	"go.opentelemetry.io/collector/receiver/scraperhelper"
 
 	"github.com/nginx/agent/v3/internal/collector/nginxossreceiver/internal/metadata"
 )