Skip to content

Commit f88ce7a

Browse files
authored
[chore] more CreateSettings renames (#10416)
This only impacts internal code, no external impact. Signed-off-by: Alex Boten <[email protected]>
1 parent 654cb24 commit f88ce7a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

service/telemetry/internal/factory.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"go.opentelemetry.io/collector/component"
1414
)
1515

16-
// CreateSettings holds configuration for building Telemetry.
17-
type CreateSettings struct {
16+
// Settings holds configuration for building Telemetry.
17+
type Settings struct {
1818
BuildInfo component.BuildInfo
1919
AsyncErrorChannel chan error
2020
ZapOptions []zap.Option
@@ -29,10 +29,10 @@ type Factory interface {
2929
CreateDefaultConfig() component.Config
3030

3131
// CreateLogger creates a logger.
32-
CreateLogger(ctx context.Context, set CreateSettings, cfg component.Config) (*zap.Logger, error)
32+
CreateLogger(ctx context.Context, set Settings, cfg component.Config) (*zap.Logger, error)
3333

3434
// CreateTracerProvider creates a TracerProvider.
35-
CreateTracerProvider(ctx context.Context, set CreateSettings, cfg component.Config) (trace.TracerProvider, error)
35+
CreateTracerProvider(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error)
3636

3737
// TODO: Add CreateMeterProvider.
3838

@@ -69,7 +69,7 @@ func (f *factory) CreateDefaultConfig() component.Config {
6969
}
7070

7171
// CreateLoggerFunc is the equivalent of Factory.CreateLogger.
72-
type CreateLoggerFunc func(context.Context, CreateSettings, component.Config) (*zap.Logger, error)
72+
type CreateLoggerFunc func(context.Context, Settings, component.Config) (*zap.Logger, error)
7373

7474
// WithLogger overrides the default no-op logger.
7575
func WithLogger(createLogger CreateLoggerFunc) FactoryOption {
@@ -78,15 +78,15 @@ func WithLogger(createLogger CreateLoggerFunc) FactoryOption {
7878
})
7979
}
8080

81-
func (f *factory) CreateLogger(ctx context.Context, set CreateSettings, cfg component.Config) (*zap.Logger, error) {
81+
func (f *factory) CreateLogger(ctx context.Context, set Settings, cfg component.Config) (*zap.Logger, error) {
8282
if f.CreateLoggerFunc == nil {
8383
return zap.NewNop(), nil
8484
}
8585
return f.CreateLoggerFunc(ctx, set, cfg)
8686
}
8787

8888
// CreateTracerProviderFunc is the equivalent of Factory.CreateTracerProvider.
89-
type CreateTracerProviderFunc func(context.Context, CreateSettings, component.Config) (trace.TracerProvider, error)
89+
type CreateTracerProviderFunc func(context.Context, Settings, component.Config) (trace.TracerProvider, error)
9090

9191
// WithTracerProvider overrides the default no-op tracer provider.
9292
func WithTracerProvider(createTracerProvider CreateTracerProviderFunc) FactoryOption {
@@ -95,7 +95,7 @@ func WithTracerProvider(createTracerProvider CreateTracerProviderFunc) FactoryOp
9595
})
9696
}
9797

98-
func (f *factory) CreateTracerProvider(ctx context.Context, set CreateSettings, cfg component.Config) (trace.TracerProvider, error) {
98+
func (f *factory) CreateTracerProvider(ctx context.Context, set Settings, cfg component.Config) (trace.TracerProvider, error) {
9999
if f.CreateTracerProviderFunc == nil {
100100
return tracenoop.NewTracerProvider(), nil
101101
}

service/telemetry/telemetry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ import (
88
)
99

1010
// Settings holds configuration for building Telemetry.
11-
type Settings = internal.CreateSettings
11+
type Settings = internal.Settings

0 commit comments

Comments
 (0)