Skip to content

Commit 39a7b17

Browse files
feat(OSC-1274) Remove Batch Processor references
1 parent ae7f217 commit 39a7b17

File tree

72 files changed

+91
-477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+91
-477
lines changed

deploy/helm/sumologic/conf/events/otelcol/config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ extensions:
3434
pprof: {}
3535

3636
processors:
37-
batch:
38-
send_batch_max_size: 2_048
39-
send_batch_size: 1024
40-
timeout: 1s
4137
resource/add_cluster:
4238
attributes:
4339
- action: upsert
@@ -159,7 +155,6 @@ service:
159155
- source
160156
- sumologic
161157
- transform/add_timestamp
162-
- batch
163158
receivers:
164159
- k8sobjects/configmaps
165160
{{- end }}
@@ -182,7 +177,6 @@ service:
182177
- source
183178
- sumologic
184179
- transform/add_timestamp
185-
- batch
186180
receivers:
187181
{{- if .Values.otelevents.useSumoK8sEventReceiver }}
188182
- raw_k8s_events

deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,6 @@ processors:
214214
## Maximum spike expected between the measurements of memory usage, in %.
215215
spike_limit_percentage: 20
216216

217-
## The batch processor accepts spans and places them into batches grouped by node and resource
218-
batch:
219-
## Number of spans after which a batch will be sent regardless of time
220-
send_batch_size: 256
221-
## Never more than this many spans are being sent in a batch
222-
send_batch_max_size: 512
223-
## Time duration after which a batch will be sent regardless of size
224-
timeout: 5s
225217
extensions:
226218
health_check:
227219
endpoint: {{ template "sumologic.healthEndpoint" . }}
@@ -231,7 +223,7 @@ service:
231223
pipelines:
232224
traces:
233225
receivers: [jaeger, otlp, otlp/deprecated, zipkin]
234-
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch]
226+
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource]
235227
exporters:
236228
{{- if eq .Values.tracesGateway.enabled true }}
237229
- otlphttp/traces
@@ -243,7 +235,7 @@ service:
243235
{{- end }}
244236
metrics:
245237
receivers: [otlp, otlp/deprecated]
246-
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch]
238+
processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource]
247239
exporters:
248240
- sumologic/metrics
249241
{{- if eq .Values.debug.instrumentation.otelcolInstrumentation.print true }}

deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@ processors:
4444
## Maximum spike expected between the measurements of memory usage, in %.
4545
spike_limit_percentage: 20
4646

47-
## The batch processor accepts spans and places them into batches grouped by node and resource
48-
batch:
49-
## Number of spans after which a batch will be sent regardless of time
50-
send_batch_size: 256
51-
## Maximum number of spans sent at once
52-
send_batch_max_size: 512
53-
## Time duration after which a batch will be sent regardless of size
54-
timeout: 5s
55-
## Never more than this many spans are being sent in a batch
56-
# send_batch_max_size: 512
5747
extensions:
5848
health_check:
5949
endpoint: {{ template "sumologic.healthEndpoint" . }}
@@ -64,7 +54,7 @@ service:
6454
pipelines:
6555
traces:
6656
receivers: [otlp]
67-
processors: [memory_limiter, batch]
57+
processors: [memory_limiter]
6858
exporters:
6959
- loadbalancing
7060
{{- if eq .Values.debug.instrumentation.tracesGateway.print true }}

deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@ processors:
6060
## Max number of traces for which decisions are kept in memory
6161
num_traces: 200000
6262

63-
## The batch processor accepts spans and places them into batches grouped by node and resource
64-
batch:
65-
## Number of spans after which a batch will be sent regardless of time
66-
send_batch_size: 256
67-
## Never more than this many spans are being sent in a batch
68-
send_batch_max_size: 512
69-
## Time duration after which a batch will be sent regardless of size
70-
timeout: 5s
71-
7263
extensions:
7364
health_check:
7465
endpoint: {{ template "sumologic.healthEndpoint" . }}
@@ -92,7 +83,7 @@ service:
9283
pipelines:
9384
traces:
9485
receivers: [otlp]
95-
processors: [memory_limiter, cascading_filter, batch]
86+
processors: [memory_limiter, cascading_filter]
9687
exporters:
9788
- otlphttp
9889
{{- if eq (include "sumologic-mock.forward-instrumentation" .) "true" }}

deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ extensions:
2020
pprof: {}
2121

2222
processors:
23-
batch:
24-
send_batch_max_size: 2000
25-
send_batch_size: 1000
26-
timeout: 1s
2723
transform/set_source_identifier:
2824
error_mode: ignore
2925
log_statements:
@@ -97,7 +93,6 @@ service:
9793
- transform/parsejson
9894
- logstransform/cloudwatch
9995
- transform/metadata
100-
- batch
10196
exporters:
10297
- otlphttp
10398
telemetry:

deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ extensions:
2222
pprof: {}
2323

2424
processors:
25-
batch:
26-
send_batch_max_size: 2000
27-
send_batch_size: 1000
28-
timeout: 1s
29-
3025
{{- if .Values.sumologic.logs.systemd.enabled }}
3126
## copy _SYSTEMD_UNIT, SYSLOG_FACILITY, _HOSTNAME and PRIORITY from body to attributes
3227
## so they can be used by metadata processors same way like for fluentd
@@ -132,8 +127,6 @@ service:
132127
{{- if eq .Values.debug.logs.collector.print true }}
133128
- debug
134129
{{- end }}
135-
processors:
136-
- batch
137130
receivers:
138131
- filelog/containers
139132
{{- end }}
@@ -146,7 +139,6 @@ service:
146139
{{- end }}
147140
processors:
148141
- logstransform/systemd
149-
- batch
150142
receivers:
151143
- journald
152144
{{- end }}

deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ extensions:
2121
endpoint: {{ template "sumologic.healthEndpoint" . }}
2222
pprof: {}
2323

24-
processors:
25-
batch:
26-
send_batch_max_size: 2000
27-
send_batch_size: 1000
28-
timeout: 1s
29-
3024
receivers:
3125
{{- if .Values.sumologic.logs.container.enabled }}
3226
{{ tpl (.Files.Get "conf/logs/collector/common/filelog_receiver.yaml") . | nindent 2 }}
@@ -45,8 +39,6 @@ service:
4539
{{- if eq .Values.debug.logs.collector.print true }}
4640
- debug
4741
{{- end }}
48-
processors:
49-
- batch
5042
receivers:
5143
- filelog/containers
5244
{{- end }}

deploy/helm/sumologic/conf/logs/otelcol/config.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,6 @@ processors:
125125
- action: delete
126126
key: fluent.tag
127127

128-
## The batch processor accepts spans and places them into batches grouped by node and resource
129-
batch:
130-
## Maximum number of spans sent at once
131-
send_batch_max_size: 2_048
132-
## Number of spans after which a batch will be sent regardless of time
133-
send_batch_size: 1_024
134-
## Time duration after which a batch will be sent regardless of size
135-
timeout: 1s
136-
137128
{{ if .Values.sumologic.logs.systemd.enabled }}
138129
filter/exclude_kubelet:
139130
logs:
@@ -638,7 +629,6 @@ service:
638629
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
639630
- transform/add_default_pipeline_tag
640631
{{- end }}
641-
- batch
642632
receivers:
643633
- otlp
644634
{{ end }}
@@ -675,7 +665,6 @@ service:
675665
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
676666
- transform/add_default_pipeline_tag
677667
{{- end }}
678-
- batch
679668
receivers:
680669
- otlp
681670

@@ -711,7 +700,6 @@ service:
711700
{{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }}
712701
- transform/add_default_pipeline_tag
713702
{{- end }}
714-
- batch
715703
receivers:
716704
- otlp
717705
{{ end }}

deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ extensions:
2727

2828

2929
processors:
30-
batch:
31-
send_batch_max_size: 2000
32-
send_batch_size: 1000
33-
timeout: 1s
34-
3530
# staleness markers may simply indicate targets being moved between collector Pods, so they do more harm than good
3631
filter/drop_stale_datapoints:
3732
metrics:
@@ -89,7 +84,6 @@ service:
8984
{{- end }}
9085
- otlphttp
9186
processors:
92-
- batch
9387
- filter/drop_stale_datapoints
9488
{{- if .Values.sumologic.metrics.dropHistogramBuckets }}
9589
- transform/extract_sum_count_from_histograms

deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ processors:
4949
{{- if .Values.sumologic.metrics.enableDefaultFilters }}
5050
- filter/app_metrics
5151
{{- end }}
52-
- batch
5352
receivers:
5453
- telegraf
5554
- otlp

0 commit comments

Comments
 (0)