add TelemetryCreateSettings

component/componenttest/nop_exporter.go

@@ -17,9 +17,6 @@ package componenttest
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
 	"go.opentelemetry.io/collector/config"
@@ -29,9 +26,8 @@ import (
 // NewNopExporterCreateSettings returns a new nop settings for Create*Exporter functions.
 func NewNopExporterCreateSettings() component.ExporterCreateSettings {
 	return component.ExporterCreateSettings{
-		Logger:         zap.NewNop(),
-		TracerProvider: trace.NewNoopTracerProvider(),
-		BuildInfo:      component.DefaultBuildInfo(),
+		TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
+		BuildInfo:               component.DefaultBuildInfo(),
 	}
 }
 

component/componenttest/nop_extension.go

@@ -17,9 +17,6 @@ package componenttest
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
 	"go.opentelemetry.io/collector/config"
@@ -28,9 +25,8 @@ import (
 // NewNopExtensionCreateSettings returns a new nop settings for Create*Extension functions.
 func NewNopExtensionCreateSettings() component.ExtensionCreateSettings {
 	return component.ExtensionCreateSettings{
-		Logger:         zap.NewNop(),
-		TracerProvider: trace.NewNoopTracerProvider(),
-		BuildInfo:      component.DefaultBuildInfo(),
+		TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
+		BuildInfo:               component.DefaultBuildInfo(),
 	}
 }
 

component/componenttest/nop_processor.go

@@ -17,9 +17,6 @@ package componenttest
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
 	"go.opentelemetry.io/collector/config"
@@ -30,9 +27,8 @@ import (
 // NewNopProcessorCreateSettings returns a new nop settings for Create*Processor functions.
 func NewNopProcessorCreateSettings() component.ProcessorCreateSettings {
 	return component.ProcessorCreateSettings{
-		Logger:         zap.NewNop(),
-		TracerProvider: trace.NewNoopTracerProvider(),
-		BuildInfo:      component.DefaultBuildInfo(),
+		TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
+		BuildInfo:               component.DefaultBuildInfo(),
 	}
 }
 

component/componenttest/nop_receiver.go

@@ -17,9 +17,6 @@ package componenttest
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenthelper"
 	"go.opentelemetry.io/collector/config"
@@ -29,9 +26,8 @@ import (
 // NewNopReceiverCreateSettings returns a new nop settings for Create*Receiver functions.
 func NewNopReceiverCreateSettings() component.ReceiverCreateSettings {
 	return component.ReceiverCreateSettings{
-		Logger:         zap.NewNop(),
-		TracerProvider: trace.NewNoopTracerProvider(),
-		BuildInfo:      component.DefaultBuildInfo(),
+		TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
+		BuildInfo:               component.DefaultBuildInfo(),
 	}
 }
 

component/componenttest/nop_telemetry.go

@@ -0,0 +1,30 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package componenttest
+
+import (
+	"go.opentelemetry.io/otel/trace"
+	"go.uber.org/zap"
+
+	"go.opentelemetry.io/collector/component"
+)
+
+// NewNopTelemetryCreateSettings returns a new nop telemetry settings for Create* functions.
+func NewNopTelemetryCreateSettings() component.TelemetryCreateSettings {
+	return component.TelemetryCreateSettings{
+		Logger:         zap.NewNop(),
+		TracerProvider: trace.NewNoopTracerProvider(),
+	}
+}

component/exporter.go

@@ -17,9 +17,6 @@ package component
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 )
@@ -49,12 +46,7 @@ type LogsExporter interface {
 
 // ExporterCreateSettings configures Exporter creators.
 type ExporterCreateSettings struct {
-	// Logger that the factory can use during creation and can pass to the created
-	// component to be used later as well.
-	Logger *zap.Logger
-
-	// TracerProvider that the factory can pass to other instrumented third-party libraries.
-	TracerProvider trace.TracerProvider
+	TelemetryCreateSettings
 
 	// BuildInfo can be used by components for informational purposes
 	BuildInfo BuildInfo

component/extension.go

@@ -17,9 +17,6 @@ package component
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/config"
 )
 
@@ -49,12 +46,7 @@ type PipelineWatcher interface {
 
 // ExtensionCreateSettings is passed to ExtensionFactory.Create* functions.
 type ExtensionCreateSettings struct {
-	// Logger that the factory can use during creation and can pass to the created
-	// component to be used later as well.
-	Logger *zap.Logger
-
-	// TracerProvider that the factory can pass to other instrumented third-party libraries.
-	TracerProvider trace.TracerProvider
+	TelemetryCreateSettings
 
 	// BuildInfo can be used by components for informational purposes
 	BuildInfo BuildInfo

component/processor.go

@@ -17,9 +17,6 @@ package component
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/component/componenterror"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
@@ -51,12 +48,7 @@ type LogsProcessor interface {
 
 // ProcessorCreateSettings is passed to Create* functions in ProcessorFactory.
 type ProcessorCreateSettings struct {
-	// Logger that the factory can use during creation and can pass to the created
-	// component to be used later as well.
-	Logger *zap.Logger
-
-	// TracerProvider that the factory can pass to other instrumented third-party libraries.
-	TracerProvider trace.TracerProvider
+	TelemetryCreateSettings
 
 	// BuildInfo can be used by components for informational purposes
 	BuildInfo BuildInfo

component/receiver.go

@@ -17,9 +17,6 @@ package component
 import (
 	"context"
 
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
-
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 )
@@ -58,12 +55,7 @@ type LogsReceiver interface {
 
 // ReceiverCreateSettings configures Receiver creators.
 type ReceiverCreateSettings struct {
-	// Logger that the factory can use during creation and can pass to the created
-	// component to be used later as well.
-	Logger *zap.Logger
-
-	// TracerProvider that the factory can pass to other instrumented third-party libraries.
-	TracerProvider trace.TracerProvider
+	TelemetryCreateSettings
 
 	// BuildInfo can be used by components for informational purposes.
 	BuildInfo BuildInfo

component/telemetry.go

@@ -0,0 +1,29 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package component
+
+import (
+	"go.opentelemetry.io/otel/trace"
+	"go.uber.org/zap"
+)
+
+type TelemetryCreateSettings struct {
+	// Logger that the factory can use during creation and can pass to the created
+	// component to be used later as well.
+	Logger *zap.Logger
+
+	// TracerProvider that the factory can pass to other instrumented third-party libraries.
+	TracerProvider trace.TracerProvider
+}

service/internal/builder/exporters_builder.go

@@ -160,9 +160,11 @@ func BuildExporters(
 	// Build exporters exporters based on configuration and required input data types.
 	for expID, expCfg := range cfg.Exporters {
 		set := component.ExporterCreateSettings{
-			Logger:         logger.With(zap.String(zapNameKey, expID.String())),
-			TracerProvider: tracerProvider,
-			BuildInfo:      buildInfo,
+			TelemetryCreateSettings: component.TelemetryCreateSettings{
+				Logger:         logger.With(zap.String(zapNameKey, expID.String())),
+				TracerProvider: tracerProvider,
+			},
+			BuildInfo: buildInfo,
 		}
 
 		factory, exists := factories[expID.Type()]

service/internal/builder/extensions_builder.go

@@ -132,11 +132,13 @@ func BuildExtensions(
 		}
 
 		set := component.ExtensionCreateSettings{
-			Logger: logger.With(
-				zap.String(zapKindKey, zapKindExtension),
-				zap.String(zapNameKey, extID.String())),
-			TracerProvider: tracerProvider,
-			BuildInfo:      buildInfo,
+			TelemetryCreateSettings: component.TelemetryCreateSettings{
+				Logger: logger.With(
+					zap.String(zapKindKey, zapKindExtension),
+					zap.String(zapNameKey, extID.String())),
+				TracerProvider: tracerProvider,
+			},
+			BuildInfo: buildInfo,
 		}
 		ext, err := buildExtension(context.Background(), factory, set, extCfg)
 		if err != nil {

service/internal/builder/pipelines_builder.go

@@ -161,9 +161,11 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf
 		// which we will build in the next loop iteration).
 		var err error
 		set := component.ProcessorCreateSettings{
-			Logger:         pb.logger.With(zap.String(zapKindKey, zapKindProcessor), zap.String(zapNameKey, procID.String())),
-			TracerProvider: pb.tracerProvider,
-			BuildInfo:      pb.buildInfo,
+			TelemetryCreateSettings: component.TelemetryCreateSettings{
+				Logger:         pb.logger.With(zap.String(zapKindKey, zapKindProcessor), zap.String(zapNameKey, procID.String())),
+				TracerProvider: pb.tracerProvider,
+			},
+			BuildInfo: pb.buildInfo,
 		}
 
 		switch pipelineCfg.InputType {

service/internal/builder/receivers_builder.go

@@ -99,9 +99,11 @@ func BuildReceivers(
 	receivers := make(Receivers)
 	for recvID, recvCfg := range cfg.Receivers {
 		set := component.ReceiverCreateSettings{
-			Logger:         logger.With(zap.String(zapKindKey, zapKindReceiver), zap.String(zapNameKey, recvID.String())),
-			TracerProvider: tracerProvider,
-			BuildInfo:      buildInfo,
+			TelemetryCreateSettings: component.TelemetryCreateSettings{
+				Logger:         logger.With(zap.String(zapKindKey, zapKindReceiver), zap.String(zapNameKey, recvID.String())),
+				TracerProvider: tracerProvider,
+			},
+			BuildInfo: buildInfo,
 		}
 
 		rcv, err := rb.buildReceiver(context.Background(), set, recvCfg)