Replace ExporterCreateParams with ExporterCreateSettings.

Replace all dependencies in Exporters.

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>

component/componenttest/nop_exporter.go

@@ -52,7 +52,7 @@ func (f *nopExporterFactory) CreateDefaultConfig() config.Exporter {
 // CreateTracesExporter implements component.ExporterFactory interface.
 func (f *nopExporterFactory) CreateTracesExporter(
  _ context.Context,
- _ component.ExporterCreateParams,
+ _ component.ExporterCreateSettings,
  _ config.Exporter,
 ) (component.TracesExporter, error) {
  return nopExporterInstance, nil
@@ -61,7 +61,7 @@ func (f *nopExporterFactory) CreateTracesExporter(
 // CreateMetricsExporter implements component.ExporterFactory interface.
 func (f *nopExporterFactory) CreateMetricsExporter(
  _ context.Context,
- _ component.ExporterCreateParams,
+ _ component.ExporterCreateSettings,
  _ config.Exporter,
 ) (component.MetricsExporter, error) {
  return nopExporterInstance, nil
@@ -70,7 +70,7 @@ func (f *nopExporterFactory) CreateMetricsExporter(
 // CreateLogsExporter implements component.ExporterFactory interface.
 func (f *nopExporterFactory) CreateLogsExporter(
  _ context.Context,
- _ component.ExporterCreateParams,
+ _ component.ExporterCreateSettings,
  _ config.Exporter,
 ) (component.LogsExporter, error) {
  return nopExporterInstance, nil

component/componenttest/nop_exporter_test.go

@@ -33,19 +33,19 @@ func TestNewNopExporterFactory(t *testing.T) {
  cfg := factory.CreateDefaultConfig()
  assert.Equal(t, &nopExporterConfig{ExporterSettings: config.NewExporterSettings(config.NewID("nop"))}, cfg)
 
- traces, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{}, cfg)
+ traces, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateSettings{}, cfg)
  require.NoError(t, err)
  assert.NoError(t, traces.Start(context.Background(), NewNopHost()))
  assert.NoError(t, traces.ConsumeTraces(context.Background(), pdata.NewTraces()))
  assert.NoError(t, traces.Shutdown(context.Background()))
 
- metrics, err := factory.CreateMetricsExporter(context.Background(), component.ExporterCreateParams{}, cfg)
+ metrics, err := factory.CreateMetricsExporter(context.Background(), component.ExporterCreateSettings{}, cfg)
  require.NoError(t, err)
  assert.NoError(t, metrics.Start(context.Background(), NewNopHost()))
  assert.NoError(t, metrics.ConsumeMetrics(context.Background(), pdata.NewMetrics()))
  assert.NoError(t, metrics.Shutdown(context.Background()))
 
- logs, err := factory.CreateLogsExporter(context.Background(), component.ExporterCreateParams{}, cfg)
+ logs, err := factory.CreateLogsExporter(context.Background(), component.ExporterCreateSettings{}, cfg)
  require.NoError(t, err)
  assert.NoError(t, logs.Start(context.Background(), NewNopHost()))
  assert.NoError(t, logs.ConsumeLogs(context.Background(), pdata.NewLogs()))

component/exporter.go

@@ -46,8 +46,8 @@ type LogsExporter interface {
  consumer.Logs
 }
 
-// ExporterCreateParams configures Exporter creators.
-type ExporterCreateParams struct {
+// 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
@@ -73,18 +73,18 @@ type ExporterFactory interface {
  // CreateTracesExporter creates a trace exporter based on this config.
  // If the exporter type does not support tracing or if the config is not valid
  // error will be returned instead.
- CreateTracesExporter(ctx context.Context, params ExporterCreateParams,
+ CreateTracesExporter(ctx context.Context, set ExporterCreateSettings,
  cfg config.Exporter) (TracesExporter, error)
 
  // CreateMetricsExporter creates a metrics exporter based on this config.
  // If the exporter type does not support metrics or if the config is not valid
  // error will be returned instead.
- CreateMetricsExporter(ctx context.Context, params ExporterCreateParams,
+ CreateMetricsExporter(ctx context.Context, set ExporterCreateSettings,
  cfg config.Exporter) (MetricsExporter, error)
 
  // CreateLogsExporter creates an exporter based on the config.
  // If the exporter type does not support logs or if the config is not valid
  // error will be returned instead.
- CreateLogsExporter(ctx context.Context, params ExporterCreateParams,
+ CreateLogsExporter(ctx context.Context, set ExporterCreateSettings,
  cfg config.Exporter) (LogsExporter, error)
 }

component/exporter_test.go

@@ -39,17 +39,17 @@ func (f *TestExporterFactory) CreateDefaultConfig() config.Exporter {
 }
 
 // CreateTracesExporter creates a trace exporter based on this config.
-func (f *TestExporterFactory) CreateTracesExporter(context.Context, ExporterCreateParams, config.Exporter) (TracesExporter, error) {
+func (f *TestExporterFactory) CreateTracesExporter(context.Context, ExporterCreateSettings, config.Exporter) (TracesExporter, error) {
  return nil, componenterror.ErrDataTypeIsNotSupported
 }
 
 // CreateMetricsExporter creates a metrics exporter based on this config.
-func (f *TestExporterFactory) CreateMetricsExporter(context.Context, ExporterCreateParams, config.Exporter) (MetricsExporter, error) {
+func (f *TestExporterFactory) CreateMetricsExporter(context.Context, ExporterCreateSettings, config.Exporter) (MetricsExporter, error) {
  return nil, componenterror.ErrDataTypeIsNotSupported
 }
 
 // CreateLogsExporter creates a logs exporter based on this config.
-func (f *TestExporterFactory) CreateLogsExporter(context.Context, ExporterCreateParams, config.Exporter) (LogsExporter, error) {
+func (f *TestExporterFactory) CreateLogsExporter(context.Context, ExporterCreateSettings, config.Exporter) (LogsExporter, error) {
  return nil, componenterror.ErrDataTypeIsNotSupported
 }
 

exporter/exporterhelper/factory.go

@@ -29,13 +29,13 @@ type FactoryOption func(o *factory)
 type CreateDefaultConfig func() config.Exporter
 
 // CreateTracesExporter is the equivalent of component.ExporterFactory.CreateTracesExporter()
-type CreateTracesExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.TracesExporter, error)
+type CreateTracesExporter func(context.Context, component.ExporterCreateSettings, config.Exporter) (component.TracesExporter, error)
 
 // CreateMetricsExporter is the equivalent of component.ExporterFactory.CreateMetricsExporter()
-type CreateMetricsExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.MetricsExporter, error)
+type CreateMetricsExporter func(context.Context, component.ExporterCreateSettings, config.Exporter) (component.MetricsExporter, error)
 
 // CreateLogsExporter is the equivalent of component.ExporterFactory.CreateLogsExporter()
-type CreateLogsExporter func(context.Context, component.ExporterCreateParams, config.Exporter) (component.LogsExporter, error)
+type CreateLogsExporter func(context.Context, component.ExporterCreateSettings, config.Exporter) (component.LogsExporter, error)
 
 type factory struct {
  cfgType config.Type
@@ -94,33 +94,33 @@ func (f *factory) CreateDefaultConfig() config.Exporter {
 // CreateTracesExporter creates a component.TracesExporter based on this config.
 func (f *factory) CreateTracesExporter(
  ctx context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter) (component.TracesExporter, error) {
  if f.createTracesExporter != nil {
- return f.createTracesExporter(ctx, params, cfg)
+ return f.createTracesExporter(ctx, set, cfg)
  }
  return nil, componenterror.ErrDataTypeIsNotSupported
 }
 
 // CreateMetricsExporter creates a component.MetricsExporter based on this config.
 func (f *factory) CreateMetricsExporter(
  ctx context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter) (component.MetricsExporter, error) {
  if f.createMetricsExporter != nil {
- return f.createMetricsExporter(ctx, params, cfg)
+ return f.createMetricsExporter(ctx, set, cfg)
  }
  return nil, componenterror.ErrDataTypeIsNotSupported
 }
 
 // CreateLogsExporter creates a metrics processor based on this config.
 func (f *factory) CreateLogsExporter(
  ctx context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter,
 ) (component.LogsExporter, error) {
  if f.createLogsExporter != nil {
- return f.createLogsExporter(ctx, params, cfg)
+ return f.createLogsExporter(ctx, set, cfg)
  }
  return nil, componenterror.ErrDataTypeIsNotSupported
 }

exporter/exporterhelper/factory_test.go

@@ -48,11 +48,11 @@ func TestNewFactory(t *testing.T) {
  defaultConfig)
  assert.EqualValues(t, typeStr, factory.Type())
  assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig())
- _, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ _, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.Equal(t, componenterror.ErrDataTypeIsNotSupported, err)
- _, err = factory.CreateMetricsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ _, err = factory.CreateMetricsExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.Equal(t, componenterror.ErrDataTypeIsNotSupported, err)
- _, err = factory.CreateLogsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ _, err = factory.CreateLogsExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.Equal(t, componenterror.ErrDataTypeIsNotSupported, err)
 }
 
@@ -66,15 +66,15 @@ func TestNewFactory_WithConstructors(t *testing.T) {
  assert.EqualValues(t, typeStr, factory.Type())
  assert.EqualValues(t, &defaultCfg, factory.CreateDefaultConfig())
 
- te, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ te, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.NoError(t, err)
  assert.Same(t, nopTracesExporter, te)
 
- me, err := factory.CreateMetricsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ me, err := factory.CreateMetricsExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.NoError(t, err)
  assert.Same(t, nopMetricsExporter, me)
 
- le, err := factory.CreateLogsExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, &defaultCfg)
+ le, err := factory.CreateLogsExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, &defaultCfg)
  assert.NoError(t, err)
  assert.Same(t, nopLogsExporter, le)
 }
@@ -83,14 +83,14 @@ func defaultConfig() config.Exporter {
  return &defaultCfg
 }
 
-func createTracesExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.TracesExporter, error) {
+func createTracesExporter(context.Context, component.ExporterCreateSettings, config.Exporter) (component.TracesExporter, error) {
  return nopTracesExporter, nil
 }
 
-func createMetricsExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.MetricsExporter, error) {
+func createMetricsExporter(context.Context, component.ExporterCreateSettings, config.Exporter) (component.MetricsExporter, error) {
  return nopMetricsExporter, nil
 }
 
-func createLogsExporter(context.Context, component.ExporterCreateParams, config.Exporter) (component.LogsExporter, error) {
+func createLogsExporter(context.Context, component.ExporterCreateSettings, config.Exporter) (component.LogsExporter, error) {
  return nopLogsExporter, nil
 }

exporter/fileexporter/factory.go

@@ -46,35 +46,35 @@ func createDefaultConfig() config.Exporter {
 
 func createTracesExporter(
  _ context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter,
 ) (component.TracesExporter, error) {
  fe := exporters.GetOrAdd(cfg, func() component.Component {
  return &fileExporter{path: cfg.(*Config).Path}
  })
- return exporterhelper.NewTracesExporter(cfg, params.Logger, fe.Unwrap().(*fileExporter).ConsumeTraces)
+ return exporterhelper.NewTracesExporter(cfg, set.Logger, fe.Unwrap().(*fileExporter).ConsumeTraces)
 }
 
 func createMetricsExporter(
  _ context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter,
 ) (component.MetricsExporter, error) {
  fe := exporters.GetOrAdd(cfg, func() component.Component {
  return &fileExporter{path: cfg.(*Config).Path}
  })
- return exporterhelper.NewMetricsExporter(cfg, params.Logger, fe.Unwrap().(*fileExporter).ConsumeMetrics)
+ return exporterhelper.NewMetricsExporter(cfg, set.Logger, fe.Unwrap().(*fileExporter).ConsumeMetrics)
 }
 
 func createLogsExporter(
  _ context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  cfg config.Exporter,
 ) (component.LogsExporter, error) {
  fe := exporters.GetOrAdd(cfg, func() component.Component {
  return &fileExporter{path: cfg.(*Config).Path}
  })
- return exporterhelper.NewLogsExporter(cfg, params.Logger, fe.Unwrap().(*fileExporter).ConsumeLogs)
+ return exporterhelper.NewLogsExporter(cfg, set.Logger, fe.Unwrap().(*fileExporter).ConsumeLogs)
 }
 
 // This is the map of already created File exporters for particular configurations.

exporter/fileexporter/factory_test.go

@@ -36,7 +36,7 @@ func TestCreateMetricsExporter(t *testing.T) {
  cfg := createDefaultConfig()
  exp, err := createMetricsExporter(
  context.Background(),
- component.ExporterCreateParams{Logger: zap.NewNop()},
+ component.ExporterCreateSettings{Logger: zap.NewNop()},
  cfg)
  assert.NoError(t, err)
  require.NotNil(t, exp)
@@ -46,7 +46,7 @@ func TestCreateTracesExporter(t *testing.T) {
  cfg := createDefaultConfig()
  exp, err := createTracesExporter(
  context.Background(),
- component.ExporterCreateParams{Logger: zap.NewNop()},
+ component.ExporterCreateSettings{Logger: zap.NewNop()},
  cfg)
  assert.NoError(t, err)
  require.NotNil(t, exp)
@@ -56,7 +56,7 @@ func TestCreateLogsExporter(t *testing.T) {
  cfg := createDefaultConfig()
  exp, err := createLogsExporter(
  context.Background(),
- component.ExporterCreateParams{Logger: zap.NewNop()},
+ component.ExporterCreateSettings{Logger: zap.NewNop()},
  cfg)
  assert.NoError(t, err)
  require.NotNil(t, exp)

exporter/jaegerexporter/config_test.go

@@ -71,8 +71,8 @@ func TestLoadConfig(t *testing.T) {
  },
  })
 
- params := component.ExporterCreateParams{Logger: zap.NewNop()}
- te, err := factory.CreateTracesExporter(context.Background(), params, e1)
+ set := component.ExporterCreateSettings{Logger: zap.NewNop()}
+ te, err := factory.CreateTracesExporter(context.Background(), set, e1)
  require.NoError(t, err)
  require.NotNil(t, te)
 }

exporter/jaegerexporter/exporter_test.go

@@ -223,7 +223,7 @@ func TestMutualTLS(t *testing.T) {
  ServerName: "localhost",
  },
  }
- exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, cfg)
+ exporter, err := factory.CreateTracesExporter(context.Background(), component.ExporterCreateSettings{Logger: zap.NewNop()}, cfg)
  require.NoError(t, err)
  err = exporter.Start(context.Background(), componenttest.NewNopHost())
  require.NoError(t, err)

exporter/jaegerexporter/factory.go

@@ -52,7 +52,7 @@ func createDefaultConfig() config.Exporter {
 
 func createTracesExporter(
  _ context.Context,
- params component.ExporterCreateParams,
+ set component.ExporterCreateSettings,
  config config.Exporter,
 ) (component.TracesExporter, error) {
 
@@ -64,5 +64,5 @@ func createTracesExporter(
  expCfg.ID().String())
  }
 
- return newTracesExporter(expCfg, params.Logger)
+ return newTracesExporter(expCfg, set.Logger)
 }

exporter/jaegerexporter/factory_test.go

@@ -37,8 +37,8 @@ func TestCreateMetricsExporter(t *testing.T) {
  factory := NewFactory()
  cfg := factory.CreateDefaultConfig()
 
- params := component.ExporterCreateParams{Logger: zap.NewNop()}
- _, err := factory.CreateMetricsExporter(context.Background(), params, cfg)
+ set := component.ExporterCreateSettings{Logger: zap.NewNop()}
+ _, err := factory.CreateMetricsExporter(context.Background(), set, cfg)
  assert.Error(t, err, componenterror.ErrDataTypeIsNotSupported)
 }
 
@@ -49,16 +49,16 @@ func TestCreateInstanceViaFactory(t *testing.T) {
 
  // Default config doesn't have default endpoint so creating from it should
  // fail.
- params := component.ExporterCreateParams{Logger: zap.NewNop()}
- exp, err := factory.CreateTracesExporter(context.Background(), params, cfg)
+ set := component.ExporterCreateSettings{Logger: zap.NewNop()}
+ exp, err := factory.CreateTracesExporter(context.Background(), set, cfg)
  assert.NotNil(t, err)
  assert.Equal(t, "\"jaeger\" config requires a non-empty \"endpoint\"", err.Error())
  assert.Nil(t, exp)
 
  // Endpoint doesn't have a default value so set it directly.
  expCfg := cfg.(*Config)
  expCfg.Endpoint = "some.target.org:12345"
- exp, err = factory.CreateTracesExporter(context.Background(), params, cfg)
+ exp, err = factory.CreateTracesExporter(context.Background(), set, cfg)
  assert.NoError(t, err)
  assert.NotNil(t, exp)