Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename TelemetryCreateSettings -> TelemetrySettings #3986

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions component/componenttest/nop_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
// NewNopExporterCreateSettings returns a new nop settings for Create*Exporter functions.
func NewNopExporterCreateSettings() component.ExporterCreateSettings {
return component.ExporterCreateSettings{
TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
BuildInfo: component.DefaultBuildInfo(),
TelemetrySettings: NewNopTelemetrySettings(),
BuildInfo: component.DefaultBuildInfo(),
}
}

Expand Down
4 changes: 2 additions & 2 deletions component/componenttest/nop_extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
// NewNopExtensionCreateSettings returns a new nop settings for Create*Extension functions.
func NewNopExtensionCreateSettings() component.ExtensionCreateSettings {
return component.ExtensionCreateSettings{
TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
BuildInfo: component.DefaultBuildInfo(),
TelemetrySettings: NewNopTelemetrySettings(),
BuildInfo: component.DefaultBuildInfo(),
}
}

Expand Down
4 changes: 2 additions & 2 deletions component/componenttest/nop_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
// NewNopProcessorCreateSettings returns a new nop settings for Create*Processor functions.
func NewNopProcessorCreateSettings() component.ProcessorCreateSettings {
return component.ProcessorCreateSettings{
TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
BuildInfo: component.DefaultBuildInfo(),
TelemetrySettings: NewNopTelemetrySettings(),
BuildInfo: component.DefaultBuildInfo(),
}
}

Expand Down
4 changes: 2 additions & 2 deletions component/componenttest/nop_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
// NewNopReceiverCreateSettings returns a new nop settings for Create*Receiver functions.
func NewNopReceiverCreateSettings() component.ReceiverCreateSettings {
return component.ReceiverCreateSettings{
TelemetryCreateSettings: NewNopTelemetryCreateSettings(),
BuildInfo: component.DefaultBuildInfo(),
TelemetrySettings: NewNopTelemetrySettings(),
BuildInfo: component.DefaultBuildInfo(),
}
}

Expand Down
6 changes: 3 additions & 3 deletions component/componenttest/nop_telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"go.opentelemetry.io/collector/component"
)

// NewNopTelemetryCreateSettings returns a new nop telemetry settings for Create* functions.
func NewNopTelemetryCreateSettings() component.TelemetryCreateSettings {
return component.TelemetryCreateSettings{
// NewNopTelemetrySettings returns a new nop telemetry settings for Create* functions.
func NewNopTelemetrySettings() component.TelemetrySettings {
return component.TelemetrySettings{
Logger: zap.NewNop(),
TracerProvider: trace.NewNoopTracerProvider(),
}
Expand Down
2 changes: 1 addition & 1 deletion component/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type LogsExporter interface {

// ExporterCreateSettings configures Exporter creators.
type ExporterCreateSettings struct {
TelemetryCreateSettings
TelemetrySettings

// BuildInfo can be used by components for informational purposes
BuildInfo BuildInfo
Expand Down
2 changes: 1 addition & 1 deletion component/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type PipelineWatcher interface {

// ExtensionCreateSettings is passed to ExtensionFactory.Create* functions.
type ExtensionCreateSettings struct {
TelemetryCreateSettings
TelemetrySettings

// BuildInfo can be used by components for informational purposes
BuildInfo BuildInfo
Expand Down
2 changes: 1 addition & 1 deletion component/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type LogsProcessor interface {

// ProcessorCreateSettings is passed to Create* functions in ProcessorFactory.
type ProcessorCreateSettings struct {
TelemetryCreateSettings
TelemetrySettings

// BuildInfo can be used by components for informational purposes
BuildInfo BuildInfo
Expand Down
2 changes: 1 addition & 1 deletion component/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type LogsReceiver interface {

// ReceiverCreateSettings configures Receiver creators.
type ReceiverCreateSettings struct {
TelemetryCreateSettings
TelemetrySettings

// BuildInfo can be used by components for informational purposes.
BuildInfo BuildInfo
Expand Down
2 changes: 1 addition & 1 deletion component/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"go.uber.org/zap"
)

type TelemetryCreateSettings struct {
type TelemetrySettings 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
Expand Down
2 changes: 1 addition & 1 deletion service/internal/builder/exporters_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func BuildExporters(
// Build exporters exporters based on configuration and required input data types.
for expID, expCfg := range cfg.Exporters {
set := component.ExporterCreateSettings{
TelemetryCreateSettings: component.TelemetryCreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: logger.With(zap.String(zapNameKey, expID.String())),
TracerProvider: tracerProvider,
},
Expand Down
2 changes: 1 addition & 1 deletion service/internal/builder/extensions_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func BuildExtensions(
}

set := component.ExtensionCreateSettings{
TelemetryCreateSettings: component.TelemetryCreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: logger.With(
zap.String(zapKindKey, zapKindExtension),
zap.String(zapNameKey, extID.String())),
Expand Down
2 changes: 1 addition & 1 deletion service/internal/builder/pipelines_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (pb *pipelinesBuilder) buildPipeline(ctx context.Context, pipelineCfg *conf
// which we will build in the next loop iteration).
var err error
set := component.ProcessorCreateSettings{
TelemetryCreateSettings: component.TelemetryCreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: pb.logger.With(zap.String(zapKindKey, zapKindProcessor), zap.String(zapNameKey, procID.String())),
TracerProvider: pb.tracerProvider,
},
Expand Down
2 changes: 1 addition & 1 deletion service/internal/builder/receivers_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func BuildReceivers(
receivers := make(Receivers)
for recvID, recvCfg := range cfg.Receivers {
set := component.ReceiverCreateSettings{
TelemetryCreateSettings: component.TelemetryCreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: logger.With(zap.String(zapKindKey, zapKindReceiver), zap.String(zapNameKey, recvID.String())),
TracerProvider: tracerProvider,
},
Expand Down