Upgrade uses of configgrpc/confighttp

cmd/opampsupervisor/supervisor/supervisor.go

@@ -764,7 +764,7 @@ func (s *Supervisor) startHealthCheckServer() error {
 	healthCheckServerPort := s.config.HealthCheck.Port()
 	server, err := s.config.HealthCheck.ToServer(
 		s.runCtx,
-		nopHost{},
+		nil,
 		s.telemetrySettings.TelemetrySettings,
 		mux,
 	)

connector/grafanacloudconnector/connector_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/connector/connectortest"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -141,7 +142,7 @@ func TestConsumeTraces(t *testing.T) {
 			assert.NilError(t, err)
 
 			ctx := t.Context()
-			assert.NilError(t, c.Start(ctx, nil))
+			assert.NilError(t, c.Start(ctx, componenttest.NewNopHost()))
 			err = c.ConsumeTraces(ctx, tc.input)
 			assert.NilError(t, err)
 			assert.NilError(t, c.Shutdown(ctx))

exporter/alertmanagerexporter/alertmanager_exporter.go

@@ -189,7 +189,7 @@ func (s *alertmanagerExporter) pushTraces(ctx context.Context, td ptrace.Traces)
 }
 
 func (s *alertmanagerExporter) start(ctx context.Context, host component.Host) error {
-	client, err := s.config.ToClient(ctx, host, s.settings)
+	client, err := s.config.ToClient(ctx, host.GetExtensions(), s.settings)
 	if err != nil {
 		return fmt.Errorf("failed to create HTTP Client: %w", err)
 	}

exporter/azuremonitorexporter/azuremonitor_exporter.go

@@ -34,7 +34,7 @@ func (exporter *azureMonitorExporter) Start(ctx context.Context, host component.
 	exporter.config.InstrumentationKey = configopaque.String(connectionVars.InstrumentationKey)
 	exporter.config.ClientConfig.Endpoint = connectionVars.IngestionURL
 	telemetryConfiguration := appinsights.NewTelemetryConfiguration(connectionVars.InstrumentationKey)
-	telemetryConfiguration.Client, err = exporter.config.ClientConfig.ToClient(ctx, host, exporter.settings)
+	telemetryConfiguration.Client, err = exporter.config.ClientConfig.ToClient(ctx, host.GetExtensions(), exporter.settings)
 	if err != nil {
 		return err
 	}

exporter/bmchelixexporter/internal/operationsmanagement/metrics_client.go

@@ -26,7 +26,7 @@ type MetricsClient struct {
 
 // NewMetricsClient creates a new MetricsClient
 func NewMetricsClient(ctx context.Context, clientConfig confighttp.ClientConfig, apiKey configopaque.String, host component.Host, settings component.TelemetrySettings, logger *zap.Logger) (*MetricsClient, error) {
-	httpClient, err := clientConfig.ToClient(ctx, host, settings)
+	httpClient, err := clientConfig.ToClient(ctx, host.GetExtensions(), settings)
 	if err != nil {
 		return nil, err
 	}

exporter/coralogixexporter/config.go

@@ -49,7 +49,7 @@ func (c *TransportConfig) ToHTTPClient(ctx context.Context, host component.Host,
 		Headers:         c.Headers,
 		Compression:     c.Compression,
 	}
-	return httpClientConfig.ToClient(ctx, host, settings)
+	return httpClientConfig.ToClient(ctx, host.GetExtensions(), settings)
 }
 
 // Config defines configuration for Coralogix exporter.

exporter/coralogixexporter/signals.go

@@ -36,7 +36,7 @@ type signalConfigWrapper struct {
 }
 
 func (w *signalConfigWrapper) ToClientConn(ctx context.Context, host component.Host, settings component.TelemetrySettings, opts ...configgrpc.ToClientConnOption) (*grpc.ClientConn, error) {
-	return w.config.ToClientConn(ctx, host, settings, opts...)
+	return w.config.ToClientConn(ctx, host.GetExtensions(), settings, opts...)
 }
 
 func (w *signalConfigWrapper) ToHTTPClient(ctx context.Context, host component.Host, settings component.TelemetrySettings) (*http.Client, error) {
@@ -146,7 +146,7 @@ func (e *signalExporter) startSignalExporter(ctx context.Context, host component
 			return err
 		}
 	} else {
-		if e.clientConn, err = transportConfig.ToClientConn(ctx, host, e.settings, configgrpc.WithGrpcDialOption(grpc.WithUserAgent(e.userAgent))); err != nil {
+		if e.clientConn, err = transportConfig.ToClientConn(ctx, host.GetExtensions(), e.settings, configgrpc.WithGrpcDialOption(grpc.WithUserAgent(e.userAgent))); err != nil {
 			return err
 		}
 		e.callOptions = []grpc.CallOption{

exporter/datadogexporter/factory_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
@@ -236,7 +237,7 @@ func TestOnlyMetadata(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, expMetrics)
 
-	err = expTraces.Start(ctx, nil)
+	err = expTraces.Start(ctx, componenttest.NewNopHost())
 	assert.NoError(t, err)
 	defer func() {
 		assert.NoError(t, expTraces.Shutdown(ctx))
@@ -284,9 +285,9 @@ func TestStopExporters(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, expMetrics)
 
-	err = expTraces.Start(ctx, nil)
+	err = expTraces.Start(ctx, componenttest.NewNopHost())
 	assert.NoError(t, err)
-	err = expMetrics.Start(ctx, nil)
+	err = expMetrics.Start(ctx, componenttest.NewNopHost())
 	assert.NoError(t, err)
 
 	finishShutdown := make(chan bool)

exporter/datadogexporter/logs_exporter_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/exporter/exportertest"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -433,7 +434,7 @@ func TestLogsExporterHostMetadata(t *testing.T) {
 	assert.NotNil(t, exp)
 
 	// Test 2: Verify exporter can start successfully (this initializes metadata infrastructure)
-	err = exp.Start(t.Context(), nil)
+	err = exp.Start(t.Context(), componenttest.NewNopHost())
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, exp.Shutdown(t.Context()))
@@ -495,7 +496,7 @@ func TestLogsExporterHostMetadataOnlyMode(t *testing.T) {
 	require.NoError(t, err)
 	assert.NotNil(t, exp)
 
-	err = exp.Start(t.Context(), nil)
+	err = exp.Start(t.Context(), componenttest.NewNopHost())
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, exp.Shutdown(t.Context()))

exporter/dorisexporter/exporter_common.go

@@ -111,7 +111,7 @@ func streamLoadRequest(ctx context.Context, cfg *Config, table string, data []by
 }
 
 func createDorisHTTPClient(ctx context.Context, cfg *Config, host component.Host, settings component.TelemetrySettings) (*http.Client, error) {
-	client, err := cfg.ToClient(ctx, host, settings)
+	client, err := cfg.ToClient(ctx, host.GetExtensions(), settings)
 	if err != nil {
 		return nil, err
 	}

exporter/dorisexporter/exporter_logs_test.go

@@ -33,7 +33,7 @@ func TestPushLogData(t *testing.T) {
 
 	ctx := t.Context()
 
-	client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
+	client, err := createDorisHTTPClient(ctx, config, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
 	require.NoError(t, err)
 	require.NotNil(t, client)
 

exporter/dorisexporter/exporter_metrics_test.go

@@ -31,7 +31,7 @@ func TestPushMetricData(t *testing.T) {
 
 	ctx := t.Context()
 
-	client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
+	client, err := createDorisHTTPClient(ctx, config, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
 	require.NoError(t, err)
 	require.NotNil(t, client)
 

exporter/dorisexporter/exporter_traces_test.go

@@ -32,7 +32,7 @@ func TestPushTraceData(t *testing.T) {
 
 	ctx := t.Context()
 
-	client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
+	client, err := createDorisHTTPClient(ctx, config, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
 	require.NoError(t, err)
 	require.NotNil(t, client)
 

exporter/elasticsearchexporter/esclient.go

@@ -107,7 +107,7 @@ func newElasticsearchClient(
 	telemetry component.TelemetrySettings,
 	userAgent string,
 ) (esapi.Transport, error) {
-	httpClient, err := config.ToClient(ctx, host, telemetry)
+	httpClient, err := config.ToClient(ctx, host.GetExtensions(), telemetry)
 	if err != nil {
 		return nil, err
 	}

exporter/elasticsearchexporter/integrationtest/datareceiver.go

@@ -368,7 +368,7 @@ func (es *mockESReceiver) Start(ctx context.Context, host component.Host) error
 		}
 	})
 
-	es.server, err = es.config.ToServer(ctx, host, es.params.TelemetrySettings, r)
+	es.server, err = es.config.ToServer(ctx, host.GetExtensions(), es.params.TelemetrySettings, r)
 	if err != nil {
 		return fmt.Errorf("failed to create mock ES server: %w", err)
 	}

exporter/faroexporter/exporter.go

@@ -66,7 +66,7 @@ func newExporter(cfg component.Config, set exporter.Settings) (*faroExporter, er
 }
 
 func (fe *faroExporter) start(ctx context.Context, host component.Host) error {
-	client, err := fe.config.ToClient(ctx, host, fe.settings)
+	client, err := fe.config.ToClient(ctx, host.GetExtensions(), fe.settings)
 	if err != nil {
 		return err
 	}

exporter/honeycombmarkerexporter/logs_exporter.go

@@ -158,7 +158,7 @@ func (e *honeycombLogsExporter) sendMarker(ctx context.Context, m marker, logRec
 }
 
 func (e *honeycombLogsExporter) start(ctx context.Context, host component.Host) (err error) {
-	client, err := e.httpClientSettings.ToClient(ctx, host, e.set)
+	client, err := e.httpClientSettings.ToClient(ctx, host.GetExtensions(), e.set)
 	if err != nil {
 		return err
 	}

exporter/influxdbexporter/writer.go

@@ -108,7 +108,7 @@ func composeWriteURL(config *Config) (string, error) {
 
 // Start implements component.StartFunc
 func (w *influxHTTPWriter) Start(ctx context.Context, host component.Host) error {
-	httpClient, err := w.httpClientSettings.ToClient(ctx, host, w.telemetrySettings)
+	httpClient, err := w.httpClientSettings.ToClient(ctx, host.GetExtensions(), w.telemetrySettings)
 	if err != nil {
 		return err
 	}

exporter/logicmonitorexporter/logs_exporter.go

@@ -46,7 +46,7 @@ func newLogsExporter(_ context.Context, cfg component.Config, set exporter.Setti
 }
 
 func (e *logExporter) start(ctx context.Context, host component.Host) error {
-	client, err := e.config.ToClient(ctx, host, e.settings)
+	client, err := e.config.ToClient(ctx, host.GetExtensions(), e.settings)
 	if err != nil {
 		return fmt.Errorf("failed to create http client: %w", err)
 	}

exporter/logicmonitorexporter/traces_exporter.go

@@ -34,7 +34,7 @@ func newTracesExporter(_ context.Context, cfg component.Config, set exporter.Set
 }
 
 func (e *tracesExporter) start(ctx context.Context, host component.Host) error {
-	client, err := e.config.ToClient(ctx, host, e.settings)
+	client, err := e.config.ToClient(ctx, host.GetExtensions(), e.settings)
 	if err != nil {
 		return fmt.Errorf("failed to create http client: %w", err)
 	}

exporter/logzioexporter/exporter.go

@@ -105,7 +105,7 @@ func newLogzioLogsExporter(config *Config, set exporter.Settings) (exporter.Logs
 }
 
 func (exporter *logzioExporter) start(ctx context.Context, host component.Host) error {
-	client, err := exporter.config.ToClient(ctx, host, exporter.settings)
+	client, err := exporter.config.ToClient(ctx, host.GetExtensions(), exporter.settings)
 	if err != nil {
 		return err
 	}

exporter/mezmoexporter/exporter.go

@@ -58,7 +58,7 @@ func (m *mezmoExporter) pushLogData(_ context.Context, ld plog.Logs) error {
 }
 
 func (m *mezmoExporter) start(ctx context.Context, host component.Host) (err error) {
-	m.client, err = m.config.ToClient(ctx, host, m.settings)
+	m.client, err = m.config.ToClient(ctx, host.GetExtensions(), m.settings)
 	return err
 }
 

exporter/opensearchexporter/sso_log_exporter.go

@@ -57,7 +57,7 @@ func newLogExporter(cfg *Config, set exporter.Settings) *logExporter {
 }
 
 func (l *logExporter) Start(ctx context.Context, host component.Host) error {
-	httpClient, err := l.httpSettings.ToClient(ctx, host, l.telemetry)
+	httpClient, err := l.httpSettings.ToClient(ctx, host.GetExtensions(), l.telemetry)
 	if err != nil {
 		return err
 	}

exporter/opensearchexporter/sso_trace_exporter.go

@@ -48,7 +48,7 @@ func newSSOTracesExporter(cfg *Config, set exporter.Settings) *ssoTracesExporter
 }
 
 func (s *ssoTracesExporter) Start(ctx context.Context, host component.Host) error {
-	httpClient, err := s.httpSettings.ToClient(ctx, host, s.telemetry)
+	httpClient, err := s.httpSettings.ToClient(ctx, host.GetExtensions(), s.telemetry)
 	if err != nil {
 		return err
 	}

exporter/otelarrowexporter/otelarrow.go

@@ -117,7 +117,7 @@ func (e *baseExporter) start(ctx context.Context, host component.Host) (err erro
 		dialOpts = append(dialOpts, configgrpc.WithGrpcDialOption(opt))
 	}
 
-	if e.clientConn, err = e.config.ToClientConn(ctx, host, e.settings.TelemetrySettings, dialOpts...); err != nil {
+	if e.clientConn, err = e.config.ToClientConn(ctx, host.GetExtensions(), e.settings.TelemetrySettings, dialOpts...); err != nil {
 		return err
 	}
 	e.traceExporter = ptraceotlp.NewGRPCClient(e.clientConn)

exporter/prometheusexporter/end_to_end_test.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/exporter/exportertest"
 	"go.opentelemetry.io/collector/receiver/receivertest"
@@ -67,7 +68,7 @@ func TestEndToEndSummarySupport(t *testing.T) {
 	set := exportertest.NewNopSettings(metadata.Type)
 	exporter, err := exporterFactory.CreateMetrics(ctx, set, exporterCfg)
 	require.NoError(t, err)
-	require.NoError(t, exporter.Start(ctx, nil), "Failed to start the Prometheus exporter")
+	require.NoError(t, exporter.Start(ctx, componenttest.NewNopHost()), "Failed to start the Prometheus exporter")
 	t.Cleanup(func() { require.NoError(t, exporter.Shutdown(ctx)) })
 
 	// 3. Create the Prometheus receiver scraping from the DropWizard mock server and
@@ -94,7 +95,7 @@ func TestEndToEndSummarySupport(t *testing.T) {
 	// 3.5 Create the Prometheus receiver and pass in the previously created Prometheus exporter.
 	prometheusReceiver, err := receiverFactory.CreateMetrics(ctx, receiverCreateSet, rcvCfg, exporter)
 	require.NoError(t, err)
-	require.NoError(t, prometheusReceiver.Start(ctx, nil), "Failed to start the Prometheus receiver")
+	require.NoError(t, prometheusReceiver.Start(ctx, componenttest.NewNopHost()), "Failed to start the Prometheus receiver")
 	t.Cleanup(func() { require.NoError(t, prometheusReceiver.Shutdown(ctx)) })
 
 	// 4. Scrape from the Prometheus receiver to ensure that we export summary metrics

exporter/prometheusexporter/prometheus.go

@@ -71,7 +71,7 @@ func (pe *prometheusExporter) Start(ctx context.Context, host component.Host) er
 
 	mux := http.NewServeMux()
 	mux.Handle("/metrics", pe.handler)
-	srv, err := pe.config.ToServer(ctx, host, pe.settings, mux)
+	srv, err := pe.config.ToServer(ctx, host.GetExtensions(), pe.settings, mux)
 	if err != nil {
 		lnerr := ln.Close()
 		return errors.Join(err, lnerr)

exporter/prometheusremotewriteexporter/exporter.go

@@ -230,7 +230,7 @@ func newPRWExporter(cfg *Config, set exporter.Settings) (*prwExporter, error) {
 
 // Start creates the prometheus client
 func (prwe *prwExporter) Start(ctx context.Context, host component.Host) (err error) {
-	prwe.client, err = prwe.clientSettings.ToClient(ctx, host, prwe.settings)
+	prwe.client, err = prwe.clientSettings.ToClient(ctx, host.GetExtensions(), prwe.settings)
 	if err != nil {
 		return err
 	}

exporter/sematextexporter/writer.go

@@ -88,7 +88,7 @@ func composeWriteURL(config *Config) (string, error) {
 
 // Start implements component.StartFunc
 func (w *sematextHTTPWriter) Start(ctx context.Context, host component.Host) error {
-	httpClient, err := w.httpClientSettings.ToClient(ctx, host, w.telemetrySettings)
+	httpClient, err := w.httpClientSettings.ToClient(ctx, host.GetExtensions(), w.telemetrySettings)
 	if err != nil {
 		return err
 	}

exporter/signalfxexporter/exporter.go

@@ -217,7 +217,7 @@ func (se *signalfxExporter) startLogs(ctx context.Context, host component.Host)
 func (se *signalfxExporter) createClient(ctx context.Context, host component.Host) (*http.Client, error) {
 	se.config.TLS = se.config.IngestTLSs
 
-	return se.config.ToClient(ctx, host, se.telemetrySettings)
+	return se.config.ToClient(ctx, host.GetExtensions(), se.telemetrySettings)
 }
 
 func (se *signalfxExporter) pushMetrics(ctx context.Context, md pmetric.Metrics) error {

exporter/signalfxexporter/exporter_test.go

@@ -192,7 +192,7 @@ func TestConsumeMetrics(t *testing.T) {
 				},
 			}
 
-			client, err := cfg.ToClient(t.Context(), componenttest.NewNopHost(), exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
+			client, err := cfg.ToClient(t.Context(), nil, exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
 			require.NoError(t, err)
 
 			c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "", false, true)
@@ -938,7 +938,7 @@ func TestConsumeEventData(t *testing.T) {
 				},
 			}
 
-			client, err := cfg.ToClient(t.Context(), componenttest.NewNopHost(), exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
+			client, err := cfg.ToClient(t.Context(), nil, exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
 			require.NoError(t, err)
 
 			eventClient := &sfxEventClient{
@@ -2057,7 +2057,7 @@ func TestConsumeMixedMetrics(t *testing.T) {
 				},
 			}
 
-			client, err := cfg.ToClient(t.Context(), componenttest.NewNopHost(), exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
+			client, err := cfg.ToClient(t.Context(), nil, exportertest.NewNopSettings(componentmetadata.Type).TelemetrySettings)
 			require.NoError(t, err)
 
 			c, err := translation.NewMetricsConverter(zap.NewNop(), nil, nil, nil, "", false, false)

exporter/signalfxexporter/internal/correlation/correlation.go

@@ -56,7 +56,7 @@ func newCorrelationClient(ctx context.Context, cfg *Config, accessToken configop
 		return nil, fmt.Errorf("failed to parse correlation endpoint URL %q: %w", cfg.Endpoint, err)
 	}
 
-	httpClient, err := cfg.ToClient(ctx, host, params.TelemetrySettings)
+	httpClient, err := cfg.ToClient(ctx, host.GetExtensions(), params.TelemetrySettings)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create correlation API client: %w", err)
 	}

exporter/splunkhecexporter/client.go

@@ -658,7 +658,7 @@ func checkHecHealth(ctx context.Context, client *http.Client, healthCheckURL *ur
 func buildHTTPClient(ctx context.Context, config *Config, host component.Host, telemetrySettings component.TelemetrySettings) (*http.Client, error) {
 	// we handle compression explicitly.
 	config.Compression = ""
-	return config.ToClient(ctx, host, telemetrySettings)
+	return config.ToClient(ctx, host.GetExtensions(), telemetrySettings)
 }
 
 func buildHTTPHeaders(config *Config, buildInfo component.BuildInfo) map[string]string {

exporter/stefexporter/exporter.go

@@ -66,7 +66,7 @@ func newStefExporter(set component.TelemetrySettings, cfg *Config) *stefExporter
 func (s *stefExporter) Start(ctx context.Context, host component.Host) error {
 	// Prepare gRPC connection.
 	var err error
-	s.grpcConn, err = s.cfg.ToClientConn(ctx, host, s.set)
+	s.grpcConn, err = s.cfg.ToClientConn(ctx, host.GetExtensions(), s.set)
 	if err != nil {
 		return err
 	}