helper method to convert to batcher config

Author: VihasMakwana

exporter/elasticsearchexporter/config.go

@@ -274,14 +274,8 @@ func (cfg *Config) Validate() error {
 	if cfg.Retry.MaxRetries < 0 {
 		return errors.New("retry::max_retries should be non-negative")
 	}
-	if cfg.Batcher.Enabled != nil {
-		batcherConfig := exporterbatcher.Config{
-			Enabled:       *cfg.Batcher.Enabled,
-			FlushTimeout:  cfg.Batcher.FlushTimeout,
-			MinSizeConfig: cfg.Batcher.MinSizeConfig,
-			MaxSizeConfig: cfg.Batcher.MaxSizeConfig,
-		}
-		if err := batcherConfig.Validate(); err != nil {
+	if batcherCfg, ok := cfg.exporterbatcherConfig(); ok {
+		if err := batcherCfg.Validate(); err != nil {
 			return fmt.Errorf("invalid batcher config: %w", err)
 		}
 	}
@@ -325,6 +319,18 @@ func (cfg *Config) endpoints() ([]string, error) {
 	return endpoints, nil
 }
 
+func (cfg *Config) exporterbatcherConfig() (exporterbatcher.Config, bool) {
+	if cfg.Batcher.Enabled == nil {
+		return exporterbatcher.Config{}, false
+	}
+	return exporterbatcher.Config{
+		Enabled:       *cfg.Batcher.Enabled,
+		FlushTimeout:  cfg.Batcher.FlushTimeout,
+		MinSizeConfig: cfg.Batcher.MinSizeConfig,
+		MaxSizeConfig: cfg.Batcher.MaxSizeConfig,
+	}, true
+}
+
 func validateEndpoint(endpoint string) error {
 	if endpoint == "" {
 		return errConfigEmptyEndpoint

exporter/elasticsearchexporter/factory.go

@@ -201,14 +201,8 @@ func exporterhelperOptions(
 		exporterhelper.WithShutdown(shutdown),
 		exporterhelper.WithQueue(cfg.QueueSettings),
 	}
-	if cfg.Batcher.Enabled != nil {
-		batcherConfig := exporterbatcher.Config{
-			Enabled:       *cfg.Batcher.Enabled,
-			FlushTimeout:  cfg.Batcher.FlushTimeout,
-			MinSizeConfig: cfg.Batcher.MinSizeConfig,
-			MaxSizeConfig: cfg.Batcher.MaxSizeConfig,
-		}
-		opts = append(opts, exporterhelper.WithBatcher(batcherConfig))
+	if batcherCfg, ok := cfg.exporterbatcherConfig(); ok {
+		opts = append(opts, exporterhelper.WithBatcher(batcherCfg))
 
 		// Effectively disable timeout_sender because timeout is enforced in bulk indexer.
 		//