diff --git a/.chloggen/exporterhelper-remove-deprecated.yaml b/.chloggen/exporterhelper-remove-deprecated.yaml new file mode 100644 index 0000000000..a025ed3fab --- /dev/null +++ b/.chloggen/exporterhelper-remove-deprecated.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: exporterhelper + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Removed deprecated `QueueTimeout`/`TimeoutSettings` aliases in favor of `QueueConfig`/`TimeoutConfig`. + +# One or more tracking issues or pull requests related to the change +issues: [11264, 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: "`NewDefaultQueueSettings` and `NewDefaultTimeoutSettings` have been similarly renamed." + +# 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] diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index f3e9f06b2e..de9822ee6a 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -27,8 +27,8 @@ func WithShutdown(shutdown component.ShutdownFunc) Option { return internal.WithShutdown(shutdown) } -// WithTimeout overrides the default TimeoutSettings for an exporter. -// The default TimeoutSettings is 5 seconds. +// WithTimeout overrides the default TimeoutConfig for an exporter. +// The default TimeoutConfig is 5 seconds. func WithTimeout(timeoutConfig TimeoutConfig) Option { return internal.WithTimeout(timeoutConfig) } diff --git a/exporter/exporterhelper/internal/queue_sender.go b/exporter/exporterhelper/internal/queue_sender.go index 99f63c022d..4e78b670b5 100644 --- a/exporter/exporterhelper/internal/queue_sender.go +++ b/exporter/exporterhelper/internal/queue_sender.go @@ -22,9 +22,6 @@ import ( const defaultQueueSize = 1000 -// Deprecated: [v0.110.0] Use QueueConfig instead. -type QueueSettings = 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. @@ -40,11 +37,6 @@ type QueueConfig struct { StorageID *component.ID `mapstructure:"storage"` } -// Deprecated: [v0.110.0] Use NewDefaultQueueConfig instead. -func NewDefaultQueueSettings() QueueSettings { - return NewDefaultQueueConfig() -} - // NewDefaultQueueConfig returns the default config for QueueConfig. func NewDefaultQueueConfig() QueueConfig { return QueueConfig{ diff --git a/exporter/exporterhelper/queue_sender.go b/exporter/exporterhelper/queue_sender.go index b81e2036fa..f09932c5b8 100644 --- a/exporter/exporterhelper/queue_sender.go +++ b/exporter/exporterhelper/queue_sender.go @@ -5,17 +5,9 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte import "go.opentelemetry.io/collector/exporter/exporterhelper/internal" -// Deprecated: [v0.110.0] Use QueueConfig instead. -type QueueSettings = internal.QueueConfig - // QueueConfig defines configuration for queueing batches before sending to the consumerSender. type QueueConfig = internal.QueueConfig -// Deprecated: [v0.110.0] Use NewDefaultQueueConfig instead. -func NewDefaultQueueSettings() QueueSettings { - return internal.NewDefaultQueueConfig() -} - // NewDefaultQueueConfig returns the default config for QueueConfig. func NewDefaultQueueConfig() QueueConfig { return internal.NewDefaultQueueConfig() diff --git a/exporter/exporterhelper/timeout_sender.go b/exporter/exporterhelper/timeout_sender.go index 9788397b7d..090caf2d7d 100644 --- a/exporter/exporterhelper/timeout_sender.go +++ b/exporter/exporterhelper/timeout_sender.go @@ -7,16 +7,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal" ) -// Deprecated: [v0.110.0] Use TimeoutConfig instead. -type TimeoutSettings = TimeoutConfig - type TimeoutConfig = internal.TimeoutConfig -// Deprecated: [v0.110.0] Use NewDefaultTimeoutConfig instead. -func NewDefaultTimeoutSettings() TimeoutSettings { - return internal.NewDefaultTimeoutConfig() -} - // NewDefaultTimeoutConfig returns the default config for TimeoutConfig. func NewDefaultTimeoutConfig() TimeoutConfig { return internal.NewDefaultTimeoutConfig()