diff --git a/.chloggen/queuesettings_queueconfig.yaml b/.chloggen/queuesettings_queueconfig.yaml new file mode 100755 index 000000000000..e9d952901ea3 --- /dev/null +++ b/.chloggen/queuesettings_queueconfig.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate QueueSettings, use QueueConfig instead + +# One or more tracking issues or pull requests related to the change +issues: [6767] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] \ No newline at end of file diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index b5e7aa39a338..ec2b81806dc7 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -79,10 +79,10 @@ func WithRetry(config configretry.BackOffConfig) Option { } } -// WithQueue overrides the default QueueSettings for an exporter. -// The default QueueSettings is to disable queueing. +// WithQueue overrides the default QueueConfig for an exporter. +// The default QueueConfig is to disable queueing. // This option cannot be used with the new exporter helpers New[Traces|Metrics|Logs]RequestExporter. -func WithQueue(config QueueSettings) Option { +func WithQueue(config QueueConfig) Option { return func(o *baseExporter) { if o.requestExporter { panic("queueing is not available for the new request exporters yet") diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index bbc009fb7ae8..c8f73f1402cd 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -74,7 +74,7 @@ func TestQueueRetryOptionsWithRequestExporter(t *testing.T) { require.True(t, bs.requestExporter) require.Panics(t, func() { _, _ = newBaseExporter(exportertest.NewNopCreateSettings(), "", true, nil, nil, newNoopObsrepSender, - WithRetry(configretry.NewDefaultBackOffConfig()), WithQueue(NewDefaultQueueSettings())) + WithRetry(configretry.NewDefaultBackOffConfig()), WithQueue(NewDefaultQueueConfig())) }) } diff --git a/exporter/exporterhelper/logs_test.go b/exporter/exporterhelper/logs_test.go index 92bbd48edac7..2566ffdd35c5 100644 --- a/exporter/exporterhelper/logs_test.go +++ b/exporter/exporterhelper/logs_test.go @@ -156,7 +156,7 @@ func TestLogsRequestExporter_Default_ExportError(t *testing.T) { } func TestLogsExporter_WithPersistentQueue(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() @@ -238,7 +238,7 @@ func TestLogsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) rCfg := configretry.NewDefaultBackOffConfig() - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") diff --git a/exporter/exporterhelper/metrics_test.go b/exporter/exporterhelper/metrics_test.go index 770ea801e48a..f23a145ff441 100644 --- a/exporter/exporterhelper/metrics_test.go +++ b/exporter/exporterhelper/metrics_test.go @@ -157,7 +157,7 @@ func TestMetricsRequestExporter_Default_ExportError(t *testing.T) { } func TestMetricsExporter_WithPersistentQueue(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() @@ -240,7 +240,7 @@ func TestMetricsExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) rCfg := configretry.NewDefaultBackOffConfig() - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index 8a2e71e0b05c..bbcaf7d27646 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -28,7 +28,13 @@ var ( ) // QueueSettings defines configuration for queueing batches before sending to the consumerSender. +// Deprecated: [v0.94.0] Use QueueConfig instead type QueueSettings struct { + QueueConfig +} + +// QueueConfig defines configuration for queueing batches before sending to the consumerSender. +type QueueConfig struct { // Enabled indicates whether to not enqueue batches before sending to the consumerSender. Enabled bool `mapstructure:"enabled"` // NumConsumers is the number of consumers from the queue. @@ -40,9 +46,17 @@ type QueueSettings struct { StorageID *component.ID `mapstructure:"storage"` } -// NewDefaultQueueSettings returns the default settings for QueueSettings. +// NewDefaultQueueSettings returns the default settings for QueueConfig. +// Deprecated: [v0.94.0] Use NewDefaultQueueConfig instead func NewDefaultQueueSettings() QueueSettings { return QueueSettings{ + NewDefaultQueueConfig(), + } +} + +// NewDefaultQueueConfig returns the default settings for QueueConfig. +func NewDefaultQueueConfig() QueueConfig { + return QueueConfig{ Enabled: true, NumConsumers: 10, // By default, batches are 8192 spans, for a total of up to 8 million spans in the queue @@ -52,8 +66,8 @@ func NewDefaultQueueSettings() QueueSettings { } } -// Validate checks if the QueueSettings configuration is valid -func (qCfg *QueueSettings) Validate() error { +// Validate checks if the QueueConfig configuration is valid +func (qCfg *QueueConfig) Validate() error { if !qCfg.Enabled { return nil } @@ -82,7 +96,7 @@ type queueSender struct { metricSize otelmetric.Int64ObservableGauge } -func newQueueSender(config QueueSettings, set exporter.CreateSettings, signal component.DataType, +func newQueueSender(config QueueConfig, set exporter.CreateSettings, signal component.DataType, marshaler RequestMarshaler, unmarshaler RequestUnmarshaler, consumeErrHandler func(error, Request)) *queueSender { isPersistent := config.StorageID != nil diff --git a/exporter/exporterhelper/queue_sender_test.go b/exporter/exporterhelper/queue_sender_test.go index d56ec6d78b1c..88b725634f4b 100644 --- a/exporter/exporterhelper/queue_sender_test.go +++ b/exporter/exporterhelper/queue_sender_test.go @@ -23,7 +23,7 @@ import ( ) func TestQueuedRetry_StopWhileWaiting(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 rCfg := configretry.NewDefaultBackOffConfig() be, err := newBaseExporter(defaultSettings, "", false, nil, nil, newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) @@ -55,7 +55,7 @@ func TestQueuedRetry_StopWhileWaiting(t *testing.T) { } func TestQueuedRetry_DoNotPreserveCancellation(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 rCfg := configretry.NewDefaultBackOffConfig() be, err := newBaseExporter(defaultSettings, "", false, nil, nil, newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) @@ -82,7 +82,7 @@ func TestQueuedRetry_DoNotPreserveCancellation(t *testing.T) { } func TestQueuedRetry_RejectOnFull(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.QueueSize = 0 qCfg.NumConsumers = 0 set := exportertest.NewNopCreateSettings() @@ -105,7 +105,7 @@ func TestQueuedRetryHappyPath(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() rCfg := configretry.NewDefaultBackOffConfig() set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} be, err := newBaseExporter(set, "", false, nil, nil, newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) @@ -141,7 +141,7 @@ func TestQueuedRetry_QueueMetricsReported(t *testing.T) { tt, err := componenttest.SetupTelemetry(defaultID) require.NoError(t, err) - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 0 // to make every request go straight to the queue rCfg := configretry.NewDefaultBackOffConfig() set := exporter.CreateSettings{ID: defaultID, TelemetrySettings: tt.TelemetrySettings(), BuildInfo: component.NewDefaultBuildInfo()} @@ -176,13 +176,13 @@ func TestNoCancellationContext(t *testing.T) { } func TestQueueSettings_Validate(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() assert.NoError(t, qCfg.Validate()) qCfg.QueueSize = 0 assert.EqualError(t, qCfg.Validate(), "queue size must be positive") - qCfg = NewDefaultQueueSettings() + qCfg = NewDefaultQueueConfig() qCfg.NumConsumers = 0 assert.EqualError(t, qCfg.Validate(), "number of queue consumers must be positive") @@ -193,7 +193,7 @@ func TestQueueSettings_Validate(t *testing.T) { } func TestQueueRetryWithDisabledQueue(t *testing.T) { - qs := NewDefaultQueueSettings() + qs := NewDefaultQueueConfig() qs.Enabled = false set := exportertest.NewNopCreateSettings() logger, observed := observer.New(zap.ErrorLevel) @@ -220,7 +220,7 @@ func TestQueueFailedRequestDropped(t *testing.T) { set := exportertest.NewNopCreateSettings() logger, observed := observer.New(zap.ErrorLevel) set.Logger = zap.New(logger) - be, err := newBaseExporter(set, component.DataTypeLogs, false, nil, nil, newNoopObsrepSender, WithQueue(NewDefaultQueueSettings())) + be, err := newBaseExporter(set, component.DataTypeLogs, false, nil, nil, newNoopObsrepSender, WithQueue(NewDefaultQueueConfig())) require.NoError(t, err) require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost())) mockR := newMockRequest(2, errors.New("some error")) @@ -236,7 +236,7 @@ func TestQueuedRetryPersistenceEnabled(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID // enable persistence rCfg := configretry.NewDefaultBackOffConfig() @@ -260,7 +260,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID // enable persistence rCfg := configretry.NewDefaultBackOffConfig() @@ -278,7 +278,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) { } func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID // enable persistence to ensure data is re-queued on shutdown @@ -323,7 +323,7 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) { } func TestQueueSenderNoStartShutdown(t *testing.T) { - qs := newQueueSender(NewDefaultQueueSettings(), exportertest.NewNopCreateSettings(), "", nil, nil, nil) + qs := newQueueSender(NewDefaultQueueConfig(), exportertest.NewNopCreateSettings(), "", nil, nil, nil) assert.NoError(t, qs.Shutdown(context.Background())) } diff --git a/exporter/exporterhelper/retry_sender_test.go b/exporter/exporterhelper/retry_sender_test.go index 55089e9677cb..5b3a5af8e952 100644 --- a/exporter/exporterhelper/retry_sender_test.go +++ b/exporter/exporterhelper/retry_sender_test.go @@ -35,7 +35,7 @@ func mockRequestMarshaler(_ Request) ([]byte, error) { } func TestQueuedRetry_DropOnPermanentError(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() rCfg := configretry.NewDefaultBackOffConfig() mockR := newMockRequest(2, consumererror.NewPermanent(errors.New("bad data"))) be, err := newBaseExporter(defaultSettings, "", false, nil, nil, newObservabilityConsumerSender, WithRetry(rCfg), WithQueue(qCfg)) @@ -58,7 +58,7 @@ func TestQueuedRetry_DropOnPermanentError(t *testing.T) { } func TestQueuedRetry_DropOnNoRetry(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() rCfg := configretry.NewDefaultBackOffConfig() rCfg.Enabled = false be, err := newBaseExporter(defaultSettings, "", false, mockRequestMarshaler, @@ -84,7 +84,7 @@ func TestQueuedRetry_DropOnNoRetry(t *testing.T) { } func TestQueuedRetry_OnError(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 rCfg := configretry.NewDefaultBackOffConfig() rCfg.InitialInterval = 0 @@ -111,7 +111,7 @@ func TestQueuedRetry_OnError(t *testing.T) { } func TestQueuedRetry_MaxElapsedTime(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 rCfg := configretry.NewDefaultBackOffConfig() rCfg.InitialInterval = time.Millisecond @@ -158,7 +158,7 @@ func (e wrappedError) Unwrap() error { } func TestQueuedRetry_ThrottleError(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 rCfg := configretry.NewDefaultBackOffConfig() rCfg.InitialInterval = 10 * time.Millisecond @@ -189,7 +189,7 @@ func TestQueuedRetry_ThrottleError(t *testing.T) { } func TestQueuedRetry_RetryOnError(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 qCfg.QueueSize = 1 rCfg := configretry.NewDefaultBackOffConfig() diff --git a/exporter/exporterhelper/traces_test.go b/exporter/exporterhelper/traces_test.go index d99b9025c91a..106eb1dccf2b 100644 --- a/exporter/exporterhelper/traces_test.go +++ b/exporter/exporterhelper/traces_test.go @@ -154,7 +154,7 @@ func TestTracesRequestExporter_Default_ExportError(t *testing.T) { } func TestTracesExporter_WithPersistentQueue(t *testing.T) { - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() storageID := component.NewIDWithName("file_storage", "storage") qCfg.StorageID = &storageID rCfg := configretry.NewDefaultBackOffConfig() @@ -237,7 +237,7 @@ func TestTracesExporter_WithRecordEnqueueFailedMetrics(t *testing.T) { t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) }) rCfg := configretry.NewDefaultBackOffConfig() - qCfg := NewDefaultQueueSettings() + qCfg := NewDefaultQueueConfig() qCfg.NumConsumers = 1 qCfg.QueueSize = 2 wantErr := errors.New("some-error") diff --git a/exporter/otlpexporter/cfg-schema.yaml b/exporter/otlpexporter/cfg-schema.yaml index 073ec5707eea..a79fdfb40c46 100644 --- a/exporter/otlpexporter/cfg-schema.yaml +++ b/exporter/otlpexporter/cfg-schema.yaml @@ -7,7 +7,7 @@ fields: doc: | Timeout is the timeout for every attempt to send data to the backend. - name: sending_queue - type: exporterhelper.QueueSettings + type: exporterhelper.QueueConfig kind: struct fields: - name: enabled diff --git a/exporter/otlpexporter/config.go b/exporter/otlpexporter/config.go index 7c9106ddad45..06ba8bb6e515 100644 --- a/exporter/otlpexporter/config.go +++ b/exporter/otlpexporter/config.go @@ -12,9 +12,9 @@ import ( // Config defines configuration for OTLP exporter. type Config struct { - exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - QueueConfig exporterhelper.QueueSettings `mapstructure:"sending_queue"` - RetryConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` + exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + QueueConfig exporterhelper.QueueConfig `mapstructure:"sending_queue"` + RetryConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } diff --git a/exporter/otlpexporter/config_test.go b/exporter/otlpexporter/config_test.go index 78870e34b22a..a72258a62eae 100644 --- a/exporter/otlpexporter/config_test.go +++ b/exporter/otlpexporter/config_test.go @@ -48,7 +48,7 @@ func TestUnmarshalConfig(t *testing.T) { MaxInterval: 1 * time.Minute, MaxElapsedTime: 10 * time.Minute, }, - QueueConfig: exporterhelper.QueueSettings{ + QueueConfig: exporterhelper.QueueConfig{ Enabled: true, NumConsumers: 2, QueueSize: 10, diff --git a/exporter/otlpexporter/factory.go b/exporter/otlpexporter/factory.go index 95685eae5a9e..415bfa3ef34a 100644 --- a/exporter/otlpexporter/factory.go +++ b/exporter/otlpexporter/factory.go @@ -32,7 +32,7 @@ func createDefaultConfig() component.Config { return &Config{ TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetryConfig: configretry.NewDefaultBackOffConfig(), - QueueConfig: exporterhelper.NewDefaultQueueSettings(), + QueueConfig: exporterhelper.NewDefaultQueueConfig(), GRPCClientSettings: configgrpc.GRPCClientSettings{ Headers: map[string]configopaque.String{}, // Default to gzip compression diff --git a/exporter/otlpexporter/factory_test.go b/exporter/otlpexporter/factory_test.go index c9fabc13b930..4bafa28ed46a 100644 --- a/exporter/otlpexporter/factory_test.go +++ b/exporter/otlpexporter/factory_test.go @@ -31,7 +31,7 @@ func TestCreateDefaultConfig(t *testing.T) { ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) assert.Equal(t, ocfg.RetryConfig, configretry.NewDefaultBackOffConfig()) - assert.Equal(t, ocfg.QueueConfig, exporterhelper.NewDefaultQueueSettings()) + assert.Equal(t, ocfg.QueueConfig, exporterhelper.NewDefaultQueueConfig()) assert.Equal(t, ocfg.TimeoutSettings, exporterhelper.NewDefaultTimeoutSettings()) assert.Equal(t, ocfg.Compression, configcompression.Gzip) } diff --git a/exporter/otlphttpexporter/config.go b/exporter/otlphttpexporter/config.go index 3fb9d2bdec46..5cd33a6de346 100644 --- a/exporter/otlphttpexporter/config.go +++ b/exporter/otlphttpexporter/config.go @@ -14,9 +14,9 @@ import ( // Config defines configuration for OTLP/HTTP exporter. type Config struct { - confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - QueueConfig exporterhelper.QueueSettings `mapstructure:"sending_queue"` - RetryConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` + confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + QueueConfig exporterhelper.QueueConfig `mapstructure:"sending_queue"` + RetryConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` // The URL to send traces to. If omitted the Endpoint + "/v1/traces" will be used. TracesEndpoint string `mapstructure:"traces_endpoint"` diff --git a/exporter/otlphttpexporter/config_test.go b/exporter/otlphttpexporter/config_test.go index 0089e13b719b..ad90001a7742 100644 --- a/exporter/otlphttpexporter/config_test.go +++ b/exporter/otlphttpexporter/config_test.go @@ -46,7 +46,7 @@ func TestUnmarshalConfig(t *testing.T) { MaxInterval: 1 * time.Minute, MaxElapsedTime: 10 * time.Minute, }, - QueueConfig: exporterhelper.QueueSettings{ + QueueConfig: exporterhelper.QueueConfig{ Enabled: true, NumConsumers: 2, QueueSize: 10, diff --git a/exporter/otlphttpexporter/factory.go b/exporter/otlphttpexporter/factory.go index 3ed71d626d02..f3190c3dbf4b 100644 --- a/exporter/otlphttpexporter/factory.go +++ b/exporter/otlphttpexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ RetryConfig: configretry.NewDefaultBackOffConfig(), - QueueConfig: exporterhelper.NewDefaultQueueSettings(), + QueueConfig: exporterhelper.NewDefaultQueueConfig(), HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "", Timeout: 30 * time.Second, diff --git a/exporter/otlphttpexporter/otlp_test.go b/exporter/otlphttpexporter/otlp_test.go index 578e6af3acea..e8ad67ed207c 100644 --- a/exporter/otlphttpexporter/otlp_test.go +++ b/exporter/otlphttpexporter/otlp_test.go @@ -177,7 +177,7 @@ func TestErrorResponses(t *testing.T) { cfg := &Config{ TracesEndpoint: fmt.Sprintf("%s/v1/traces", srv.URL), - // Create without QueueSettings and RetryConfig so that ConsumeTraces + // Create without QueueConfig and RetryConfig so that ConsumeTraces // returns the errors that we want to check immediately. } exp, err := createTracesExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) diff --git a/internal/e2e/consume_contract_test.go b/internal/e2e/consume_contract_test.go index ad0ac750975b..f39ec04bbd7c 100644 --- a/internal/e2e/consume_contract_test.go +++ b/internal/e2e/consume_contract_test.go @@ -22,7 +22,7 @@ func testExporterConfig(endpoint string) component.Config { retryConfig := configretry.NewDefaultBackOffConfig() retryConfig.InitialInterval = time.Millisecond // interval is short for the test purposes return &otlpexporter.Config{ - QueueConfig: exporterhelper.QueueSettings{Enabled: false}, + QueueConfig: exporterhelper.QueueConfig{Enabled: false}, RetryConfig: retryConfig, GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint,