Skip to content

[chore] Simplify experimental factory wrappers #14395

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.

Sign up for GitHub

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

Merged
dmitryax merged 1 commit into from
Jan 9, 2026
Merged

[chore] Simplify experimental factory wrappers #14395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 27 additions & 35 deletions connector/xconnector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,137 +79,130 @@ type CreateProfilesToLogsFunc func(context.Context, connector.Settings, componen
// FactoryOption apply changes to ReceiverOptions.
type FactoryOption interface {
// applyOption applies the option.
applyOption(o *factoryOpts)
applyOption(o *factory)
}

// factoryOptionFunc is an ReceiverFactoryOption created through a function.
type factoryOptionFunc func(*factoryOpts)
type factoryOptionFunc func(*factory)

func (f factoryOptionFunc) applyOption(o *factoryOpts) {
func (f factoryOptionFunc) applyOption(o *factory) {
f(o)
}

type factoryOpts struct {
opts []connector.FactoryOption

*factory
deprecatedAlias component.Type
}

// WithTracesToTraces overrides the default "error not supported" implementation for WithTracesToTraces and the default "undefined" stability level.
func WithTracesToTraces(createTracesToTraces connector.CreateTracesToTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithTracesToTraces(createTracesToTraces, sl))
})
}

// WithTracesToMetrics overrides the default "error not supported" implementation for WithTracesToMetrics and the default "undefined" stability level.
func WithTracesToMetrics(createTracesToMetrics connector.CreateTracesToMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithTracesToMetrics(createTracesToMetrics, sl))
})
}

// WithTracesToLogs overrides the default "error not supported" implementation for WithTracesToLogs and the default "undefined" stability level.
func WithTracesToLogs(createTracesToLogs connector.CreateTracesToLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithTracesToLogs(createTracesToLogs, sl))
})
}

// WithMetricsToTraces overrides the default "error not supported" implementation for WithMetricsToTraces and the default "undefined" stability level.
func WithMetricsToTraces(createMetricsToTraces connector.CreateMetricsToTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithMetricsToTraces(createMetricsToTraces, sl))
})
}

// WithMetricsToMetrics overrides the default "error not supported" implementation for WithMetricsToMetrics and the default "undefined" stability level.
func WithMetricsToMetrics(createMetricsToMetrics connector.CreateMetricsToMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithMetricsToMetrics(createMetricsToMetrics, sl))
})
}

// WithMetricsToLogs overrides the default "error not supported" implementation for WithMetricsToLogs and the default "undefined" stability level.
func WithMetricsToLogs(createMetricsToLogs connector.CreateMetricsToLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithMetricsToLogs(createMetricsToLogs, sl))
})
}

// WithLogsToTraces overrides the default "error not supported" implementation for WithLogsToTraces and the default "undefined" stability level.
func WithLogsToTraces(createLogsToTraces connector.CreateLogsToTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithLogsToTraces(createLogsToTraces, sl))
})
}

// WithLogsToMetrics overrides the default "error not supported" implementation for WithLogsToMetrics and the default "undefined" stability level.
func WithLogsToMetrics(createLogsToMetrics connector.CreateLogsToMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithLogsToMetrics(createLogsToMetrics, sl))
})
}

// WithLogsToLogs overrides the default "error not supported" implementation for WithLogsToLogs and the default "undefined" stability level.
func WithLogsToLogs(createLogsToLogs connector.CreateLogsToLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, connector.WithLogsToLogs(createLogsToLogs, sl))
})
}

// WithTracesToProfiles overrides the default "error not supported" implementation for WithTracesToProfiles and the default "undefined" stability level.
func WithTracesToProfiles(createTracesToProfiles CreateTracesToProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.tracesToProfilesStabilityLevel = sl
o.createTracesToProfilesFunc = createTracesToProfiles
})
}

// WithMetricsToProfiles overrides the default "error not supported" implementation for WithMetricsToProfiles and the default "undefined" stability level.
func WithMetricsToProfiles(createMetricsToProfiles CreateMetricsToProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.metricsToProfilesStabilityLevel = sl
o.createMetricsToProfilesFunc = createMetricsToProfiles
})
}

// WithLogsToProfiles overrides the default "error not supported" implementation for WithLogsToProfiles and the default "undefined" stability level.
func WithLogsToProfiles(createLogsToProfiles CreateLogsToProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.logsToProfilesStabilityLevel = sl
o.createLogsToProfilesFunc = createLogsToProfiles
})
}

// WithProfilesToProfiles overrides the default "error not supported" implementation for WithProfilesToProfiles and the default "undefined" stability level.
func WithProfilesToProfiles(createProfilesToProfiles CreateProfilesToProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesToProfilesStabilityLevel = sl
o.createProfilesToProfilesFunc = createProfilesToProfiles
})
}

// WithProfilesToTraces overrides the default "error not supported" implementation for WithProfilesToTraces and the default "undefined" stability level.
func WithProfilesToTraces(createProfilesToTraces CreateProfilesToTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesToTracesStabilityLevel = sl
o.createProfilesToTracesFunc = createProfilesToTraces
})
}

// WithProfilesToMetrics overrides the default "error not supported" implementation for WithProfilesToMetrics and the default "undefined" stability level.
func WithProfilesToMetrics(createProfilesToMetrics CreateProfilesToMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesToMetricsStabilityLevel = sl
o.createProfilesToMetricsFunc = createProfilesToMetrics
})
}

// WithProfilesToLogs overrides the default "error not supported" implementation for WithProfilesToLogs and the default "undefined" stability level.
func WithProfilesToLogs(createProfilesToLogs CreateProfilesToLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesToLogsStabilityLevel = sl
o.createProfilesToLogsFunc = createProfilesToLogs
})
Expand All @@ -218,15 +211,16 @@ func WithProfilesToLogs(createProfilesToLogs CreateProfilesToLogsFunc, sl compon
// WithDeprecatedTypeAlias configures a deprecated type alias for the connector. Only one alias is supported per connector.
// When the alias is used in configuration, a deprecation warning is automatically logged.
func WithDeprecatedTypeAlias(alias component.Type) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
o.deprecatedAlias = alias
return factoryOptionFunc(func(o *factory) {
o.SetDeprecatedAlias(alias)
})
}

// factory implements the Factory interface.
type factory struct {
connector.Factory
componentalias.TypeAliasHolder
opts []connector.FactoryOption

createTracesToProfilesFunc CreateTracesToProfilesFunc
createMetricsToProfilesFunc CreateMetricsToProfilesFunc
Expand Down Expand Up @@ -345,15 +339,13 @@ func (f *factory) CreateProfilesToLogs(ctx context.Context, set connector.Settin
return f.createProfilesToLogsFunc(ctx, set, cfg, next)
}

// NewFactory returns a Factory.
// NewFactory creates a wrapped connector.Factory with experimental capabilities
func NewFactory(cfgType component.Type, createDefaultConfig component.CreateDefaultConfigFunc, options ...FactoryOption) Factory {
f := &factory{TypeAliasHolder: componentalias.NewTypeAliasHolder()}
opts := factoryOpts{factory: f}
for _, opt := range options {
opt.applyOption(&opts)
opt.applyOption(f)
}
opts.Factory = connector.NewFactory(cfgType, createDefaultConfig, opts.opts...)
opts.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(opts.deprecatedAlias)
f.SetDeprecatedAlias(opts.deprecatedAlias)
return opts.factory
f.Factory = connector.NewFactory(cfgType, createDefaultConfig, f.opts...)
f.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(f.DeprecatedAlias())
return f
}
37 changes: 15 additions & 22 deletions exporter/xexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,49 +34,43 @@ type Factory interface {
// FactoryOption apply changes to ReceiverOptions.
type FactoryOption interface {
// applyOption applies the option.
applyOption(o *factoryOpts)
applyOption(o *factory)
}

// factoryOptionFunc is an ReceiverFactoryOption created through a function.
type factoryOptionFunc func(*factoryOpts)
type factoryOptionFunc func(*factory)

func (f factoryOptionFunc) applyOption(o *factoryOpts) {
func (f factoryOptionFunc) applyOption(o *factory) {
f(o)
}

type factoryOpts struct {
opts []exporter.FactoryOption
*factory
deprecatedAlias component.Type
}

// CreateProfilesFunc is the equivalent of Factory.CreateProfiles.
type CreateProfilesFunc func(context.Context, exporter.Settings, component.Config) (Profiles, error)

// WithTraces overrides the default "error not supported" implementation for CreateTraces and the default "undefined" stability level.
func WithTraces(createTraces exporter.CreateTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, exporter.WithTraces(createTraces, sl))
})
}

// WithMetrics overrides the default "error not supported" implementation for CreateMetrics and the default "undefined" stability level.
func WithMetrics(createMetrics exporter.CreateMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, exporter.WithMetrics(createMetrics, sl))
})
}

// WithLogs overrides the default "error not supported" implementation for CreateLogs and the default "undefined" stability level.
func WithLogs(createLogs exporter.CreateLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, exporter.WithLogs(createLogs, sl))
})
}

// WithProfiles overrides the default "error not supported" implementation for CreateProfilesExporter and the default "undefined" stability level.
func WithProfiles(createProfiles CreateProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesStabilityLevel = sl
o.createProfilesFunc = createProfiles
})
Expand All @@ -85,14 +79,15 @@ func WithProfiles(createProfiles CreateProfilesFunc, sl component.StabilityLevel
// WithDeprecatedTypeAlias configures a deprecated type alias for the exporter. Only one alias is supported per exporter.
// When the alias is used in configuration, a deprecation warning is automatically logged.
func WithDeprecatedTypeAlias(alias component.Type) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
o.deprecatedAlias = alias
return factoryOptionFunc(func(o *factory) {
o.SetDeprecatedAlias(alias)
})
}

type factory struct {
exporter.Factory
componentalias.TypeAliasHolder
opts []exporter.FactoryOption
createProfilesFunc CreateProfilesFunc
profilesStabilityLevel component.StabilityLevel
}
Expand All @@ -111,15 +106,13 @@ func (f *factory) CreateProfiles(ctx context.Context, set exporter.Settings, cfg
return f.createProfilesFunc(ctx, set, cfg)
}

// NewFactory returns a Factory.
// NewFactory creates a wrapped exporter.Factory with experimental capabilities.
func NewFactory(cfgType component.Type, createDefaultConfig component.CreateDefaultConfigFunc, options ...FactoryOption) Factory {
f := &factory{TypeAliasHolder: componentalias.NewTypeAliasHolder()}
opts := factoryOpts{factory: f}
for _, opt := range options {
opt.applyOption(&opts)
opt.applyOption(f)
}
opts.Factory = exporter.NewFactory(cfgType, createDefaultConfig, opts.opts...)
opts.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(opts.deprecatedAlias)
f.SetDeprecatedAlias(opts.deprecatedAlias)
return opts.factory
f.Factory = exporter.NewFactory(cfgType, createDefaultConfig, f.opts...)
f.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(f.DeprecatedAlias())
return f
}
37 changes: 15 additions & 22 deletions processor/xprocessor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,20 @@ type CreateProfilesFunc func(context.Context, processor.Settings, component.Conf
// FactoryOption apply changes to ReceiverOptions.
type FactoryOption interface {
// applyOption applies the option.
applyOption(o *factoryOpts)
applyOption(o *factory)
}

// factoryOptionFunc is an ReceiverFactoryOption created through a function.
type factoryOptionFunc func(*factoryOpts)
type factoryOptionFunc func(*factory)

func (f factoryOptionFunc) applyOption(o *factoryOpts) {
func (f factoryOptionFunc) applyOption(o *factory) {
f(o)
}

type factory struct {
processor.Factory
componentalias.TypeAliasHolder
opts []processor.FactoryOption
createProfilesFunc CreateProfilesFunc
profilesStabilityLevel component.StabilityLevel
}
Expand All @@ -73,36 +74,30 @@ func (f *factory) CreateProfiles(ctx context.Context, set processor.Settings, cf
return f.createProfilesFunc(ctx, set, cfg, next)
}

type factoryOpts struct {
opts []processor.FactoryOption
*factory
deprecatedAlias component.Type
}

// WithTraces overrides the default "error not supported" implementation for CreateTraces and the default "undefined" stability level.
func WithTraces(createTraces processor.CreateTracesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, processor.WithTraces(createTraces, sl))
})
}

// WithMetrics overrides the default "error not supported" implementation for CreateMetrics and the default "undefined" stability level.
func WithMetrics(createMetrics processor.CreateMetricsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, processor.WithMetrics(createMetrics, sl))
})
}

// WithLogs overrides the default "error not supported" implementation for CreateLogs and the default "undefined" stability level.
func WithLogs(createLogs processor.CreateLogsFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.opts = append(o.opts, processor.WithLogs(createLogs, sl))
})
}

// WithProfiles overrides the default "error not supported" implementation for CreateProfiles and the default "undefined" stability level.
func WithProfiles(createProfiles CreateProfilesFunc, sl component.StabilityLevel) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
return factoryOptionFunc(func(o *factory) {
o.profilesStabilityLevel = sl
o.createProfilesFunc = createProfiles
})
Expand All @@ -111,20 +106,18 @@ func WithProfiles(createProfiles CreateProfilesFunc, sl component.StabilityLevel
// WithDeprecatedTypeAlias configures a deprecated type alias for the processor. Only one alias is supported per processor.
// When the alias is used in configuration, a deprecation warning is automatically logged.
func WithDeprecatedTypeAlias(alias component.Type) FactoryOption {
return factoryOptionFunc(func(o *factoryOpts) {
o.deprecatedAlias = alias
return factoryOptionFunc(func(o *factory) {
o.SetDeprecatedAlias(alias)
})
}

// NewFactory returns a Factory.
// NewFactory creates a wrapped processor.Factory with experimental capabilities.
func NewFactory(cfgType component.Type, createDefaultConfig component.CreateDefaultConfigFunc, options ...FactoryOption) Factory {
f := &factory{TypeAliasHolder: componentalias.NewTypeAliasHolder()}
opts := factoryOpts{factory: f}
for _, opt := range options {
opt.applyOption(&opts)
opt.applyOption(f)
}
opts.Factory = processor.NewFactory(cfgType, createDefaultConfig, opts.opts...)
opts.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(opts.deprecatedAlias)
f.SetDeprecatedAlias(opts.deprecatedAlias)
return opts.factory
f.Factory = processor.NewFactory(cfgType, createDefaultConfig, f.opts...)
f.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(f.DeprecatedAlias())
return f
}
Loading
Loading