address more CI failures

Author: dmitryax

exporter/elasticsearchexporter/config_test.go

@@ -118,11 +118,11 @@ func TestConfig(t *testing.T) {
 				},
 				Batcher: BatcherConfig{
 					FlushTimeout: 30 * time.Second,
-					MinSizeConfig: exporterbatcher.MinSizeConfig{
-						MinSizeItems: &defaultBatcherMinSizeItems,
+					MinSizeConfig: exporterbatcher.MinSizeConfig{ //nolint:SA1019
+						MinSizeItems: &defaultBatcherMinSizeItems, //nolint:SA1019
 					},
-					MaxSizeConfig: exporterbatcher.MaxSizeConfig{
-						MaxSizeItems: nil,
+					MaxSizeConfig: exporterbatcher.MaxSizeConfig{ //nolint:SA1019
+						MaxSizeItems: nil, //nolint:SA1019
 					},
 				},
 			},
@@ -192,11 +192,11 @@ func TestConfig(t *testing.T) {
 				},
 				Batcher: BatcherConfig{
 					FlushTimeout: 30 * time.Second,
-					MinSizeConfig: exporterbatcher.MinSizeConfig{
-						MinSizeItems: &defaultBatcherMinSizeItems,
+					MinSizeConfig: exporterbatcher.MinSizeConfig{ //nolint:SA1019
+						MinSizeItems: &defaultBatcherMinSizeItems, //nolint:SA1019
 					},
-					MaxSizeConfig: exporterbatcher.MaxSizeConfig{
-						MaxSizeItems: nil,
+					MaxSizeConfig: exporterbatcher.MaxSizeConfig{ //nolint:SA1019
+						MaxSizeItems: nil, //nolint:SA1019
 					},
 				},
 			},

exporter/elasticsearchexporter/factory.go

@@ -95,11 +95,11 @@ func createDefaultConfig() component.Config {
 		},
 		Batcher: BatcherConfig{
 			FlushTimeout: 30 * time.Second,
-			MinSizeConfig: exporterbatcher.MinSizeConfig{
-				MinSizeItems: &defaultBatcherMinSizeItems,
+			MinSizeConfig: exporterbatcher.MinSizeConfig{ //nolint:SA1019
+				MinSizeItems: &defaultBatcherMinSizeItems, //nolint:SA1019
 			},
-			MaxSizeConfig: exporterbatcher.MaxSizeConfig{
-				MaxSizeItems: nil,
+			MaxSizeConfig: exporterbatcher.MaxSizeConfig{ //nolint:SA1019
+				MaxSizeItems: nil, //nolint:SA1019
 			},
 		},
 		Flush: FlushSettings{

exporter/splunkhecexporter/config_test.go

@@ -96,11 +96,10 @@ func TestLoadConfig(t *testing.T) {
 				BatcherConfig: exporterbatcher.Config{
 					Enabled:      true,
 					FlushTimeout: time.Second,
-					MinSizeConfig: exporterbatcher.MinSizeConfig{
-						MinSizeItems: 1,
-					},
-					MaxSizeConfig: exporterbatcher.MaxSizeConfig{
-						MaxSizeItems: 10,
+					SizeConfig: exporterbatcher.SizeConfig{
+						Sizer:   exporterbatcher.SizerTypeItems,
+						MinSize: 1,
+						MaxSize: 10,
 					},
 				},
 				OtelAttrsToHec: splunk.HecToOtelAttrs{

exporter/splunkhecexporter/testdata/config.yaml

@@ -29,8 +29,8 @@ splunk_hec/allsettings:
   batcher:
     enabled: true
     flush_timeout: 1s
-    min_size_items: 1
-    max_size_items: 10
+    min_size: 1
+    max_size: 10
   splunk_app_name: "OpenTelemetry-Collector Splunk Exporter"
   splunk_app_version: "v0.0.1"
   otel_attrs_to_hec_metadata: