Remove deprecated fields from batch config

Signed-off-by: Bogdan Drutu <[email protected]>

Author: bogdandrutu

.chloggen/rm-old-size.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: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: exporterbatch
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated fields `min_size_items` and `max_size_items` from batch config.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12684]
+
+# (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, user]

exporter/exporterbatcher/config.go

@@ -7,8 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"time"
-
-	"go.opentelemetry.io/collector/confmap"
 )
 
 // Config defines a configuration for batching requests based on a timeout and a minimum number of items.
@@ -23,11 +21,6 @@ type Config struct {
 
 	// SizeConfig sets the size limits for a batch.
 	SizeConfig `mapstructure:",squash"`
-
-	// Deprecated: [v0.121.0] Ignored if SizeConfig is set.
-	MinSizeConfig `mapstructure:",squash"`
-	// Deprecated: [v0.121.0] Ignored if SizeConfig is set.
-	MaxSizeConfig `mapstructure:",squash"`
 }
 
 // SizeConfig sets the size limits for a batch.
@@ -40,34 +33,6 @@ type SizeConfig struct {
 	MaxSize int `mapstructure:"max_size"`
 }
 
-// Deprecated: [v0.121.0] use SizeConfig.
-type MinSizeConfig struct {
-	// Deprecated: [v0.121.0] use SizeConfig.MinSize.
-	MinSizeItems *int `mapstructure:"min_size_items"`
-}
-
-// Deprecated: [v0.121.0] use SizeConfig.
-type MaxSizeConfig struct {
-	// Deprecated: [v0.121.0] use SizeConfig.MaxSize.
-	MaxSizeItems *int `mapstructure:"max_size_items"`
-}
-
-func (c *Config) Unmarshal(conf *confmap.Conf) error {
-	if err := conf.Unmarshal(c); err != nil {
-		return err
-	}
-
-	if c.MinSizeItems != nil && !conf.IsSet("min_size") {
-		c.SizeConfig.MinSize = *c.MinSizeItems
-	}
-
-	if c.MaxSizeItems != nil && !conf.IsSet("max_size") {
-		c.SizeConfig.MaxSize = *c.MaxSizeItems
-	}
-
-	return nil
-}
-
 func (c *Config) Validate() error {
 	if c.FlushTimeout <= 0 {
 		return errors.New("`flush_timeout` must be greater than zero")

exporter/exporterbatcher/config_test.go

@@ -7,8 +7,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-
-	"go.opentelemetry.io/collector/confmap"
 )
 
 func TestValidateConfig(t *testing.T) {
@@ -49,72 +47,3 @@ func TestValidateSizeConfig(t *testing.T) {
 	}
 	require.EqualError(t, cfg.Validate(), "`max_size` must be greater than or equal to mix_size")
 }
-
-func TestUnmarshalDeprecatedFields(t *testing.T) {
-	p111 := 111
-	p222 := 222
-	tests := []struct {
-		name     string
-		input    map[string]any
-		expected Config
-	}{
-		{
-			name: "only_deprecated_fields_used",
-			input: map[string]any{
-				"enabled":        true,
-				"flush_timeout":  200,
-				"min_size_items": 111,
-				"max_size_items": 222,
-			},
-			expected: Config{
-				Enabled:      true,
-				FlushTimeout: 200,
-				SizeConfig: SizeConfig{
-					Sizer:   SizerTypeItems,
-					MinSize: 111,
-					MaxSize: 222,
-				},
-				MinSizeConfig: MinSizeConfig{
-					MinSizeItems: &p111,
-				},
-				MaxSizeConfig: MaxSizeConfig{
-					MaxSizeItems: &p222,
-				},
-			},
-		},
-		{
-			name: "both_new_and_deprecated_fields_used",
-			input: map[string]any{
-				"enabled":        true,
-				"flush_timeout":  200,
-				"min_size_items": 111,
-				"max_size_items": 222,
-				"min_size":       11,
-				"max_size":       22,
-			},
-			expected: Config{
-				Enabled:      true,
-				FlushTimeout: 200,
-				SizeConfig: SizeConfig{
-					Sizer:   SizerTypeItems,
-					MinSize: 11,
-					MaxSize: 22,
-				},
-				MinSizeConfig: MinSizeConfig{
-					MinSizeItems: &p111,
-				},
-				MaxSizeConfig: MaxSizeConfig{
-					MaxSizeItems: &p222,
-				},
-			},
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			cfg := NewDefaultConfig()
-			require.NoError(t, cfg.Unmarshal(confmap.NewFromStringMap(test.input)))
-			require.Equal(t, test.expected, cfg)
-			require.NoError(t, cfg.Validate())
-		})
-	}
-}

exporter/exporterhelper/internal/base_exporter.go

@@ -63,11 +63,6 @@ func NewBaseExporter(set exporter.Settings, signal pipeline.Signal, pusher func(
 		}
 	}
 
-	//nolint:staticcheck
-	if be.batcherCfg.MinSizeItems != nil || be.batcherCfg.MaxSizeItems != nil {
-		set.Logger.Warn("Using of deprecated fields `min_size_items` and `max_size_items`")
-	}
-
 	// Consumer Sender is always initialized.
 	be.firstSender = newSender(pusher)