Skip to content

Commit 2382d89

Browse files
committed
Remove deprecated batcher config for splunkhecexporter, use sending_queue
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 65bb39e commit 2382d89

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

.chloggen/rm-batcher-splunk.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: splunkhecexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated batcher config for splunkhecexporter, use sending_queue::batch
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: []
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

exporter/splunkhecexporter/config.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ type Config struct {
6767
confighttp.ClientConfig `mapstructure:",squash"`
6868
QueueSettings exporterhelper.QueueBatchConfig `mapstructure:"sending_queue"`
6969
configretry.BackOffConfig `mapstructure:"retry_on_failure"`
70-
71-
// Experimental: This configuration is at the early stage of development and may change without backward compatibility
72-
// until https://github.com/open-telemetry/opentelemetry-collector/issues/8122 is resolved.
73-
BatcherConfig exporterhelper.BatcherConfig `mapstructure:"batcher"` //nolint:staticcheck
74-
70+
7571
// LogDataEnabled can be used to disable sending logs by the exporter.
7672
LogDataEnabled bool `mapstructure:"log_data_enabled"`
7773

exporter/splunkhecexporter/factory.go

-7
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ func NewFactory() exporter.Factory {
5858
}
5959

6060
func createDefaultConfig() component.Config {
61-
batcherCfg := exporterhelper.NewDefaultBatcherConfig() //nolint:staticcheck
62-
batcherCfg.Enabled = false
63-
6461
defaultMaxConns := defaultMaxIdleCons
6562
defaultIdleConnTimeout := defaultIdleConnTimeout
6663

@@ -79,7 +76,6 @@ func createDefaultConfig() component.Config {
7976
SplunkAppName: defaultSplunkAppName,
8077
BackOffConfig: configretry.NewDefaultBackOffConfig(),
8178
QueueSettings: exporterhelper.NewDefaultQueueConfig(),
82-
BatcherConfig: batcherCfg,
8379
DisableCompression: false,
8480
MaxContentLengthLogs: defaultContentLengthLogsLimit,
8581
MaxContentLengthMetrics: defaultContentLengthMetricsLimit,
@@ -132,7 +128,6 @@ func createTracesExporter(
132128
exporterhelper.WithQueue(cfg.QueueSettings),
133129
exporterhelper.WithStart(c.start),
134130
exporterhelper.WithShutdown(c.stop),
135-
exporterhelper.WithBatcher(cfg.BatcherConfig), //nolint:staticcheck
136131
)
137132
if err != nil {
138133
return nil, err
@@ -166,7 +161,6 @@ func createMetricsExporter(
166161
exporterhelper.WithQueue(cfg.QueueSettings),
167162
exporterhelper.WithStart(c.start),
168163
exporterhelper.WithShutdown(c.stop),
169-
exporterhelper.WithBatcher(cfg.BatcherConfig), //nolint:staticcheck
170164
)
171165
if err != nil {
172166
return nil, err
@@ -200,7 +194,6 @@ func createLogsExporter(
200194
exporterhelper.WithQueue(cfg.QueueSettings),
201195
exporterhelper.WithStart(c.start),
202196
exporterhelper.WithShutdown(c.stop),
203-
exporterhelper.WithBatcher(cfg.BatcherConfig), //nolint:staticcheck
204197
)
205198
if err != nil {
206199
return nil, err

0 commit comments

Comments
 (0)