Skip to content

Commit 765ed69

Browse files
authored
Revert "[exporter/elasticsearch] use validation for batcher" (#38254)
Reverts #38072 breaks mainline http://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/13571662124/job/37938103918
1 parent f036dd9 commit 765ed69

File tree

4 files changed

+8
-56
lines changed

4 files changed

+8
-56
lines changed

.chloggen/elasticexporte-batcher.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

exporter/elasticsearchexporter/config.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,6 @@ func (cfg *Config) Validate() error {
274274
if cfg.Retry.MaxRetries < 0 {
275275
return errors.New("retry::max_retries should be non-negative")
276276
}
277-
if batcherCfg, ok := cfg.exporterbatcherConfig(); ok {
278-
if err := batcherCfg.Validate(); err != nil {
279-
return fmt.Errorf("invalid batcher config: %w", err)
280-
}
281-
}
282277

283278
return nil
284279
}
@@ -319,18 +314,6 @@ func (cfg *Config) endpoints() ([]string, error) {
319314
return endpoints, nil
320315
}
321316

322-
func (cfg *Config) exporterbatcherConfig() (exporterbatcher.Config, bool) {
323-
if cfg.Batcher.Enabled == nil {
324-
return exporterbatcher.Config{}, false
325-
}
326-
return exporterbatcher.Config{
327-
Enabled: *cfg.Batcher.Enabled,
328-
FlushTimeout: cfg.Batcher.FlushTimeout,
329-
MinSizeConfig: cfg.Batcher.MinSizeConfig,
330-
MaxSizeConfig: cfg.Batcher.MaxSizeConfig,
331-
}, true
332-
}
333-
334317
func validateEndpoint(endpoint string) error {
335318
if endpoint == "" {
336319
return errConfigEmptyEndpoint

exporter/elasticsearchexporter/config_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,16 +425,6 @@ func TestConfig_Validate(t *testing.T) {
425425
}),
426426
err: `must not specify both retry::max_requests and retry::max_retries`,
427427
},
428-
"batcher max_size_items less than min_size_items": {
429-
config: withDefaultConfig(func(cfg *Config) {
430-
cfg.Endpoints = []string{"http://test:9200"}
431-
cfg.Batcher.MaxSizeItems = 1000
432-
cfg.Batcher.MinSizeItems = 2000
433-
enableBatcher := true
434-
cfg.Batcher.Enabled = &enableBatcher
435-
}),
436-
err: `max_size_items must be greater than or equal to min_size_items`,
437-
},
438428
}
439429

440430
for name, tt := range tests {

exporter/elasticsearchexporter/factory.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,14 @@ func exporterhelperOptions(
203203
exporterhelper.WithShutdown(shutdown),
204204
exporterhelper.WithQueue(cfg.QueueSettings),
205205
}
206-
if batcherCfg, ok := cfg.exporterbatcherConfig(); ok {
207-
opts = append(opts, exporterhelper.WithBatcher(batcherCfg))
206+
if cfg.Batcher.Enabled != nil {
207+
batcherConfig := exporterbatcher.Config{
208+
Enabled: *cfg.Batcher.Enabled,
209+
FlushTimeout: cfg.Batcher.FlushTimeout,
210+
MinSizeConfig: cfg.Batcher.MinSizeConfig,
211+
MaxSizeConfig: cfg.Batcher.MaxSizeConfig,
212+
}
213+
opts = append(opts, exporterhelper.WithBatcher(batcherConfig))
208214

209215
// Effectively disable timeout_sender because timeout is enforced in bulk indexer.
210216
//

0 commit comments

Comments
 (0)