diff --git a/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go b/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go index 3e2ee0953eb..f9c4f16327a 100644 --- a/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go @@ -22,6 +22,7 @@ import ( "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" + collector_app "github.com/jaegertracing/jaeger/cmd/collector/app" "github.com/jaegertracing/jaeger/plugin/storage/cassandra" ) @@ -54,6 +55,10 @@ func (Factory) Type() configmodels.Type { // This function implements OTEL component.ExporterFactoryBase interface. func (f Factory) CreateDefaultConfig() configmodels.Exporter { opts := f.OptionsFactory() + queueSettings := exporterhelper.CreateDefaultQueueSettings() + queueSettings.NumConsumers = collector_app.DefaultNumWorkers + queueSettings.QueueSize = collector_app.DefaultQueueSize + return &Config{ ExporterSettings: configmodels.ExporterSettings{ TypeVal: TypeStr, @@ -61,7 +66,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { }, TimeoutSettings: exporterhelper.CreateDefaultTimeoutSettings(), RetrySettings: exporterhelper.CreateDefaultRetrySettings(), - QueueSettings: exporterhelper.CreateDefaultQueueSettings(), + QueueSettings: queueSettings, Options: *opts, } } diff --git a/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go b/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go index ebf055c4262..7e6bea83f12 100644 --- a/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go +++ b/cmd/opentelemetry/app/exporter/cassandraexporter/factory_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config/configerror" "go.opentelemetry.io/collector/config/configmodels" + collector_app "github.com/jaegertracing/jaeger/cmd/collector/app" jConfig "github.com/jaegertracing/jaeger/pkg/config" "github.com/jaegertracing/jaeger/plugin/storage/cassandra" ) @@ -44,6 +45,9 @@ func TestCreateTraceExporter(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := Factory{OptionsFactory: DefaultOptions} cfg := factory.CreateDefaultConfig() + + assert.Equal(t, collector_app.DefaultNumWorkers, cfg.(*Config).NumConsumers) + assert.Equal(t, collector_app.DefaultQueueSize, cfg.(*Config).QueueSize) assert.NotNil(t, cfg, "failed to create default config") assert.NoError(t, configcheck.ValidateConfig(cfg)) } diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go index 3529d12eb99..75b9580843f 100644 --- a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/config/configmodels" "go.opentelemetry.io/collector/exporter/exporterhelper" + collector_app "github.com/jaegertracing/jaeger/cmd/collector/app" "github.com/jaegertracing/jaeger/plugin/storage/es" ) @@ -54,6 +55,10 @@ var _ component.ExporterFactory = (*Factory)(nil) // CreateDefaultConfig returns default configuration of Factory. // This function implements OTEL component.ExporterFactoryBase interface. func (f Factory) CreateDefaultConfig() configmodels.Exporter { + queueSettings := exporterhelper.CreateDefaultQueueSettings() + queueSettings.NumConsumers = collector_app.DefaultNumWorkers + queueSettings.QueueSize = collector_app.DefaultQueueSize + opts := f.OptionsFactory() return &Config{ ExporterSettings: configmodels.ExporterSettings{ @@ -62,7 +67,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { }, TimeoutSettings: exporterhelper.CreateDefaultTimeoutSettings(), RetrySettings: exporterhelper.CreateDefaultRetrySettings(), - QueueSettings: exporterhelper.CreateDefaultQueueSettings(), + QueueSettings: queueSettings, Options: *opts, } } diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go index 3ffa169dfd4..e3dec84610a 100644 --- a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go +++ b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/config/configmodels" "go.uber.org/zap" + collector_app "github.com/jaegertracing/jaeger/cmd/collector/app" jConfig "github.com/jaegertracing/jaeger/pkg/config" "github.com/jaegertracing/jaeger/plugin/storage/es" ) @@ -61,6 +62,9 @@ func TestCreateMetricsExporter(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := Factory{OptionsFactory: DefaultOptions} cfg := factory.CreateDefaultConfig() + assert.Equal(t, collector_app.DefaultNumWorkers, cfg.(*Config).NumConsumers) + assert.Equal(t, collector_app.DefaultQueueSize, cfg.(*Config).QueueSize) + assert.NotNil(t, cfg, "failed to create default config") assert.NoError(t, configcheck.ValidateConfig(cfg)) }