diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml index 892a2a9767..37a619306f 100644 --- a/deploy/helm/sumologic/conf/events/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/events/otelcol/config.yaml @@ -34,10 +34,6 @@ extensions: pprof: {} processors: - batch: - send_batch_max_size: 2_048 - send_batch_size: 1024 - timeout: 1s resource/add_cluster: attributes: - action: upsert @@ -159,7 +155,6 @@ service: - source - sumologic - transform/add_timestamp - - batch receivers: - k8sobjects/configmaps {{- end }} @@ -182,7 +177,6 @@ service: - source - sumologic - transform/add_timestamp - - batch receivers: {{- if .Values.otelevents.useSumoK8sEventReceiver }} - raw_k8s_events diff --git a/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml index 75bf2a8d5d..696cc3d242 100644 --- a/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml +++ b/deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml @@ -214,14 +214,6 @@ processors: ## Maximum spike expected between the measurements of memory usage, in %. spike_limit_percentage: 20 - ## The batch processor accepts spans and places them into batches grouped by node and resource - batch: - ## Number of spans after which a batch will be sent regardless of time - send_batch_size: 256 - ## Never more than this many spans are being sent in a batch - send_batch_max_size: 512 - ## Time duration after which a batch will be sent regardless of size - timeout: 5s extensions: health_check: endpoint: {{ template "sumologic.healthEndpoint" . }} @@ -231,7 +223,7 @@ service: pipelines: traces: receivers: [jaeger, otlp, otlp/deprecated, zipkin] - processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch] + processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource] exporters: {{- if eq .Values.tracesGateway.enabled true }} - otlphttp/traces @@ -243,7 +235,7 @@ service: {{- end }} metrics: receivers: [otlp, otlp/deprecated] - processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource, batch] + processors: [memory_limiter, {{ if .Values.otelcolInstrumentation.useSumoK8sProcessor }}k8s_tagger{{ else }}k8sattributes{{ end }}, source, resource] exporters: - sumologic/metrics {{- if eq .Values.debug.instrumentation.otelcolInstrumentation.print true }} diff --git a/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml index c3445fcf78..7ed516fdf1 100644 --- a/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml +++ b/deploy/helm/sumologic/conf/instrumentation/traces.gateway.conf.yaml @@ -44,16 +44,6 @@ processors: ## Maximum spike expected between the measurements of memory usage, in %. spike_limit_percentage: 20 - ## The batch processor accepts spans and places them into batches grouped by node and resource - batch: - ## Number of spans after which a batch will be sent regardless of time - send_batch_size: 256 - ## Maximum number of spans sent at once - send_batch_max_size: 512 - ## Time duration after which a batch will be sent regardless of size - timeout: 5s - ## Never more than this many spans are being sent in a batch - # send_batch_max_size: 512 extensions: health_check: endpoint: {{ template "sumologic.healthEndpoint" . }} @@ -64,7 +54,7 @@ service: pipelines: traces: receivers: [otlp] - processors: [memory_limiter, batch] + processors: [memory_limiter] exporters: - loadbalancing {{- if eq .Values.debug.instrumentation.tracesGateway.print true }} diff --git a/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml b/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml index b5646f8ebf..de7b3ae335 100644 --- a/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml +++ b/deploy/helm/sumologic/conf/instrumentation/traces.sampler.conf.yaml @@ -60,15 +60,6 @@ processors: ## Max number of traces for which decisions are kept in memory num_traces: 200000 - ## The batch processor accepts spans and places them into batches grouped by node and resource - batch: - ## Number of spans after which a batch will be sent regardless of time - send_batch_size: 256 - ## Never more than this many spans are being sent in a batch - send_batch_max_size: 512 - ## Time duration after which a batch will be sent regardless of size - timeout: 5s - extensions: health_check: endpoint: {{ template "sumologic.healthEndpoint" . }} @@ -92,7 +83,7 @@ service: pipelines: traces: receivers: [otlp] - processors: [memory_limiter, cascading_filter, batch] + processors: [memory_limiter, cascading_filter] exporters: - otlphttp {{- if eq (include "sumologic-mock.forward-instrumentation" .) "true" }} diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml index 753fa6eb1d..def887f39c 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml @@ -20,10 +20,6 @@ extensions: pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s transform/set_source_identifier: error_mode: ignore log_statements: @@ -97,7 +93,6 @@ service: - transform/parsejson - logstransform/cloudwatch - transform/metadata - - batch exporters: - otlphttp telemetry: diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index 36b51b5da4..d3dd86c225 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -22,11 +22,6 @@ extensions: pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s - {{- if .Values.sumologic.logs.systemd.enabled }} ## copy _SYSTEMD_UNIT, SYSLOG_FACILITY, _HOSTNAME and PRIORITY from body to attributes ## so they can be used by metadata processors same way like for fluentd @@ -132,8 +127,6 @@ service: {{- if eq .Values.debug.logs.collector.print true }} - debug {{- end }} - processors: - - batch receivers: - filelog/containers {{- end }} @@ -146,7 +139,6 @@ service: {{- end }} processors: - logstransform/systemd - - batch receivers: - journald {{- end }} diff --git a/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml index dc9ad5a532..750d3794ff 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otellogswindows/config.yaml @@ -21,12 +21,6 @@ extensions: endpoint: {{ template "sumologic.healthEndpoint" . }} pprof: {} -processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s - receivers: {{- if .Values.sumologic.logs.container.enabled }} {{ tpl (.Files.Get "conf/logs/collector/common/filelog_receiver.yaml") . | nindent 2 }} @@ -45,8 +39,6 @@ service: {{- if eq .Values.debug.logs.collector.print true }} - debug {{- end }} - processors: - - batch receivers: - filelog/containers {{- end }} diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 9a9dd72380..a0741ec2e4 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -125,15 +125,6 @@ processors: - action: delete key: fluent.tag - ## The batch processor accepts spans and places them into batches grouped by node and resource - batch: - ## Maximum number of spans sent at once - send_batch_max_size: 2_048 - ## Number of spans after which a batch will be sent regardless of time - send_batch_size: 1_024 - ## Time duration after which a batch will be sent regardless of size - timeout: 1s - {{ if .Values.sumologic.logs.systemd.enabled }} filter/exclude_kubelet: logs: @@ -638,7 +629,6 @@ service: {{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }} - transform/add_default_pipeline_tag {{- end }} - - batch receivers: - otlp {{ end }} @@ -675,7 +665,6 @@ service: {{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }} - transform/add_default_pipeline_tag {{- end }} - - batch receivers: - otlp @@ -711,7 +700,6 @@ service: {{- if and .Values.sumologic.logs.otelcol.routing.table (not .Values.sumologic.logs.otelcol.useDefaultExporters) }} - transform/add_default_pipeline_tag {{- end }} - - batch receivers: - otlp {{ end }} diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml index ab36bb54ee..0308191b19 100644 --- a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml @@ -27,11 +27,6 @@ extensions: processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s - # staleness markers may simply indicate targets being moved between collector Pods, so they do more harm than good filter/drop_stale_datapoints: metrics: @@ -89,7 +84,6 @@ service: {{- end }} - otlphttp processors: - - batch - filter/drop_stale_datapoints {{- if .Values.sumologic.metrics.dropHistogramBuckets }} - transform/extract_sum_count_from_histograms diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml index 2fc44e1205..da8c7424c0 100644 --- a/deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml +++ b/deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml @@ -49,7 +49,6 @@ processors: {{- if .Values.sumologic.metrics.enableDefaultFilters }} - filter/app_metrics {{- end }} - - batch receivers: - telegraf - otlp diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml index 5cedbcdd1d..8131ef8d7f 100644 --- a/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml +++ b/deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml @@ -1,13 +1,3 @@ -## Configuration for Batch Processor -## The batch processor accepts spans and places them into batches grouped by node and resource -batch: - ## Maximum number of spans sent at once - send_batch_max_size: 2_048 - ## Number of spans after which a batch will be sent regardless of time - send_batch_size: 1_024 - ## Time duration after which a batch will be sent regardless of size - timeout: 1s - filter/drop_unnecessary_metrics: error_mode: ignore metrics: diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index ecaee58a38..fdf7dc89e9 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -621,10 +621,11 @@ sumologic: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter. ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -1573,10 +1574,11 @@ otelcolInstrumentation: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -1644,10 +1646,11 @@ tracesSampler: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -1745,10 +1748,11 @@ metadata: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -1863,10 +1867,11 @@ metadata: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -2044,10 +2049,11 @@ tracesGateway: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -2085,10 +2091,11 @@ otelevents: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -2240,10 +2247,11 @@ otellogs: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. @@ -2392,10 +2400,11 @@ otellogswindows: ## be directly merged with the generated configuration, overriding existing values. ## For example: # override: - # processors: - # batch: - # send_batch_size: 512 - ## will change the batch size of the pipeline. + # exporters: + # otlphttp: + # sending_queue: + # queue_size: 8 + ## will change the queue size of the otlphttp exporter ## ## WARNING: This field is not subject to backwards-compatibility guarantees offered by the rest ## of this chart. It involves implementation details that may change even in minor versions. diff --git a/tests/helm/events_test.go b/tests/helm/events_test.go index 1736f3256b..4f02711732 100644 --- a/tests/helm/events_test.go +++ b/tests/helm/events_test.go @@ -15,22 +15,22 @@ otelevents: config: merge: processors: - batch: - send_batch_size: 7 + source: + source_category_prefix: "prefix" ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) var otelConfig struct { Processors struct { - Batch struct { - SendBatchSize int `yaml:"send_batch_size"` + Source struct { + SourceCategoryPrefix string `yaml:"source_category_prefix"` } } } err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig) require.NoError(t, err) - require.Equal(t, 7, otelConfig.Processors.Batch.SendBatchSize) + require.Equal(t, "prefix", otelConfig.Processors.Source.SourceCategoryPrefix) } func TestEventOtelConfigOverride(t *testing.T) { diff --git a/tests/helm/logs_test.go b/tests/helm/logs_test.go index 4fb3401728..49229f1eea 100644 --- a/tests/helm/logs_test.go +++ b/tests/helm/logs_test.go @@ -19,22 +19,22 @@ metadata: config: merge: processors: - batch: - send_batch_size: 7 + transform/flatten: + error_mode: silent ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) var otelConfig struct { Processors struct { - Batch struct { - SendBatchSize int `yaml:"send_batch_size"` - } + TransformFlatten struct { + ErrorMode string `yaml:"error_mode"` + } `yaml:"transform/flatten"` } } err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig) require.NoError(t, err) - require.Equal(t, 7, otelConfig.Processors.Batch.SendBatchSize) + require.Equal(t, "silent", otelConfig.Processors.TransformFlatten.ErrorMode) } func TestMetadataOtelConfigOverride(t *testing.T) { @@ -288,23 +288,26 @@ func TestCollectorOtelConfigMerge(t *testing.T) { otellogs: config: merge: - processors: - batch: - send_batch_size: 7 + exporters: + otlphttp: + sending_queue: + queue_size: 8 ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) var otelConfig struct { - Processors struct { - Batch struct { - SendBatchSize int `yaml:"send_batch_size"` - } - } + Exporters struct { + OtlpHttp struct { + SendingQueue struct { + QueueSize int `yaml:"queue_size"` + } `yaml:"sending_queue"` + } `yaml:"otlphttp"` + } `yaml:"exporters"` } err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig) require.NoError(t, err) - require.Equal(t, 7, otelConfig.Processors.Batch.SendBatchSize) + require.Equal(t, 8, otelConfig.Exporters.OtlpHttp.SendingQueue.QueueSize) } func TestCollectorOtelConfigOverride(t *testing.T) { diff --git a/tests/helm/metrics_test.go b/tests/helm/metrics_test.go index 66a4b7072a..58a3f4d821 100644 --- a/tests/helm/metrics_test.go +++ b/tests/helm/metrics_test.go @@ -18,22 +18,22 @@ metadata: config: merge: processors: - batch: - send_batch_size: 7 + filter/drop_unnecessary_metrics: + error_mode: silent ` otelConfigYaml := GetOtelConfigYaml(t, valuesYaml, templatePath) var otelConfig struct { Processors struct { - Batch struct { - SendBatchSize int `yaml:"send_batch_size"` - } + FilterDropUnnecessaryMetrics struct { + ErrorMode string `yaml:"error_mode"` + } `yaml:"filter/drop_unnecessary_metrics"` } } err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig) require.NoError(t, err) - require.Equal(t, 7, otelConfig.Processors.Batch.SendBatchSize) + require.Equal(t, "silent", otelConfig.Processors.FilterDropUnnecessaryMetrics.ErrorMode) } func TestMetadataMetricsOtelConfigOverride(t *testing.T) { @@ -136,7 +136,6 @@ func TestMetadataMetricsOtelConfigExtraProcessors(t *testing.T) { "groupbyattrs/group_by_name", "transform/remove_name", "filter/drop_unnecessary_metrics", - "batch", } require.Equal(t, expectedPipelineValue, otelConfig.Service.Pipelines.Metrics.Processors) diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index 0d6c6de94d..637580fa91 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -28,10 +28,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/sumologic_configmaps: logs: include: @@ -92,7 +88,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - k8sobjects/configmaps logs/events: @@ -103,7 +98,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - raw_k8s_events telemetry: diff --git a/tests/helm/testdata/goldenfile/events_otc/k8sobjects-events.output.yaml b/tests/helm/testdata/goldenfile/events_otc/k8sobjects-events.output.yaml index 69c47fa8c2..8b7010c289 100644 --- a/tests/helm/testdata/goldenfile/events_otc/k8sobjects-events.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/k8sobjects-events.output.yaml @@ -28,10 +28,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/watch_types: logs: log_record: @@ -93,7 +89,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - k8sobjects/events telemetry: diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index f26c203178..f68a0a4cea 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -24,10 +24,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s resource/add_cluster: attributes: - action: upsert @@ -62,7 +58,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - raw_k8s_events telemetry: diff --git a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml index 2403d0f49d..fcf89ba164 100644 --- a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml @@ -36,10 +36,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/sumologic_configmaps: logs: include: @@ -102,7 +98,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - k8sobjects/configmaps logs/events: @@ -115,7 +110,6 @@ data: - source - sumologic - transform/add_timestamp - - batch receivers: - raw_k8s_events telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index 33a4f7dfa2..573e49c2e7 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -29,10 +29,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s logstransform/systemd: operators: - from: body._SYSTEMD_UNIT @@ -223,8 +219,6 @@ data: logs/containers: exporters: - otlphttp - processors: - - batch receivers: - filelog/containers logs/systemd: @@ -232,7 +226,6 @@ data: - otlphttp processors: - logstransform/systemd - - batch receivers: - journald telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml index 2834e0caca..83375c5c2c 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml @@ -31,10 +31,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s logstransform/systemd: operators: - from: body._SYSTEMD_UNIT @@ -234,8 +230,6 @@ data: exporters: - otlphttp - debug - processors: - - batch receivers: - filelog/containers logs/systemd: @@ -244,7 +238,6 @@ data: - debug processors: - logstransform/systemd - - batch receivers: - journald telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index 9547cf8c02..5d67b9d5de 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -29,10 +29,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s logstransform/systemd: operators: - from: body._SYSTEMD_UNIT @@ -117,7 +113,6 @@ data: - otlphttp processors: - logstransform/systemd - - batch receivers: - journald telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 70c729370f..40f674228e 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -29,10 +29,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s logstransform/systemd: operators: - from: body._SYSTEMD_UNIT @@ -256,8 +252,6 @@ data: logs/containers: exporters: - otlphttp - processors: - - batch receivers: - filelog/containers logs/systemd: @@ -265,7 +259,6 @@ data: - otlphttp processors: - logstransform/systemd - - batch receivers: - journald telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml index 28083c8f09..fa720397cb 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml @@ -28,11 +28,6 @@ data: health_check: endpoint: ${env:MY_POD_IP}:13133 pprof: {} - processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s receivers: filelog/containers: exclude: @@ -151,8 +146,6 @@ data: logs/containers: exporters: - otlphttp - processors: - - batch receivers: - filelog/containers telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml index 77a6492c13..b3fc28a83f 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml @@ -30,11 +30,6 @@ data: health_check: endpoint: ${env:MY_POD_IP}:13133 pprof: {} - processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s receivers: filelog/containers: exclude: @@ -162,8 +157,6 @@ data: logs/containers: exporters: - otlphttp - processors: - - batch receivers: - filelog/containers telemetry: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml index 312d092bce..793f94777b 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/options.output.yaml @@ -28,11 +28,6 @@ data: health_check: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} - processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s receivers: null service: extensions: diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml index 75620fb57d..986f46e83b 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml @@ -28,11 +28,6 @@ data: health_check: endpoint: ${env:MY_POD_IP}:13133 pprof: {} - processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s receivers: filelog/containers: exclude: @@ -184,8 +179,6 @@ data: logs/containers: exporters: - otlphttp - processors: - - batch receivers: - filelog/containers telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml index 636637b3ba..ff31db6199 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml @@ -47,10 +47,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -327,7 +323,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -350,7 +345,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -374,7 +368,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml index 56042ee0d4..61c12a6d40 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml @@ -56,10 +56,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -337,7 +333,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -361,7 +356,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -386,7 +380,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml index 4da9b60e6b..3867ad14bc 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml @@ -70,10 +70,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -351,7 +347,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -375,7 +370,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -400,7 +394,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml index 56932d3407..0406311909 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/extra_exporter.output.yaml @@ -49,10 +49,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -330,7 +326,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -354,7 +349,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -379,7 +373,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml index 645c5f3585..10f206f848 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml @@ -45,10 +45,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -324,7 +320,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -346,7 +341,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -369,7 +363,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index a1e4bef25c..8d27943527 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -45,10 +45,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -324,7 +320,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -346,7 +341,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -369,7 +363,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector.output.yaml index cde8e76a52..0a802d041b 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector.output.yaml @@ -74,10 +74,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -357,7 +353,6 @@ data: - resource/drop_annotations - transform/add_timestamp - transform/add_default_pipeline_tag - - batch receivers: - otlp logs/otlp/containers/routing/debug: @@ -396,7 +391,6 @@ data: - transform/flatten - transform/add_timestamp - transform/add_default_pipeline_tag - - batch receivers: - otlp logs/otlp/systemd: @@ -420,7 +414,6 @@ data: - transform/flatten - transform/add_timestamp - transform/add_default_pipeline_tag - - batch receivers: - otlp logs/otlp/systemd/routing/debug: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults.output.yaml index 8f657d1e73..047d3b6be7 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults.output.yaml @@ -68,10 +68,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -347,7 +343,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/containers/routing/default: @@ -379,7 +374,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -402,7 +396,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd/routing/default: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults_http.output.yaml index 993398b706..e3efd0f588 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/routing_connector_with_defaults_http.output.yaml @@ -75,10 +75,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -354,7 +350,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/containers/routing/default: @@ -386,7 +381,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd: @@ -409,7 +403,6 @@ data: - transform/remove_attributes - transform/flatten - transform/add_timestamp - - batch receivers: - otlp logs/otlp/systemd/routing/default: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index 5edc7ea927..02fea56d5f 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -45,10 +45,6 @@ data: actions: - action: delete key: fluent.tag - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/exclude_kubelet: logs: exclude: @@ -353,7 +349,6 @@ data: - resource/remove_pod_name - resource/drop_annotations - transform/add_timestamp - - batch receivers: - otlp logs/otlp/kubelet: @@ -377,7 +372,6 @@ data: - transform/add_timestamp - resource/add-resource-attribute-kubelet - resource/remove-kubelet - - batch receivers: - otlp logs/otlp/systemd: @@ -402,7 +396,6 @@ data: - transform/add_timestamp - resource/add-resource-attribute-systemd - resource/remove-systemd - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml index 11bc46b82d..918b956c58 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -210,7 +206,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml index cb8b7cfe65..552fe6763a 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/allow_histograms.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -208,7 +204,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml index ba77f6e4ab..765a735b70 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -208,7 +204,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom_routing_connector.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom_routing_connector.output.yaml index 6189bbeeaf..ab81fc5fb9 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom_routing_connector.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom_routing_connector.output.yaml @@ -154,10 +154,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -325,7 +321,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml index b9710cef77..f65b7b581e 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml @@ -39,10 +39,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -211,7 +207,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml index a8ce55b123..79763ed6df 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml @@ -63,10 +63,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -236,7 +232,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml index 79e722a7b9..1597481b63 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml @@ -187,10 +187,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -358,7 +354,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http_routing_connector.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http_routing_connector.output.yaml index 79e722a7b9..1597481b63 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http_routing_connector.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http_routing_connector.output.yaml @@ -187,10 +187,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/drop_unnecessary_metrics: error_mode: ignore metrics: @@ -358,7 +354,6 @@ data: - groupbyattrs/group_by_name - transform/remove_name - filter/drop_unnecessary_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml index 87e795f32e..fec394f566 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2048 - send_batch_size: 1024 - timeout: 1s filter/app_metrics: error_mode: ignore metrics: @@ -233,7 +229,6 @@ data: - transform/remove_name - filter/drop_unnecessary_metrics - filter/app_metrics - - batch receivers: - telegraf - otlp diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index 9368c1e808..3e7b60df24 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -102,10 +102,6 @@ spec: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s filter/drop_stale_datapoints: metrics: datapoint: @@ -263,7 +259,6 @@ spec: exporters: - otlphttp processors: - - batch - filter/drop_stale_datapoints - transform/extract_sum_count_from_histograms - transform/drop_unnecessary_attributes diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml index a44a5ca0bc..301046daed 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml @@ -69,11 +69,6 @@ sumologic: annotatedPods: enabled: false allocationStrategy: consistent-hashing - config: - merge: - processors: - batch: - send_batch_size: 5000 targetAllocator: resources: limits: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index e2471535b6..c5ee2c3b3a 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -141,10 +141,6 @@ spec: endpoint: "[${env:MY_POD_IP}]:13133" pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 5000 - timeout: 1s filter/drop_stale_datapoints: metrics: datapoint: @@ -175,7 +171,6 @@ spec: exporters: - otlphttp processors: - - batch - filter/drop_stale_datapoints - transform/drop_unnecessary_attributes receivers: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml index 2c3f7c2a08..9f1f5d2a5f 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml @@ -43,19 +43,18 @@ spec: targetCPUUtilization: 70 targetMemoryUtilization: 70 behavior: - scaleUp: - stabilizationWindowSeconds: 60 + scaleDown: policies: - - type: Percent + - periodSeconds: 60 + type: Percent value: 100 - periodSeconds: 60 - scaleDown: stabilizationWindowSeconds: 60 + scaleUp: policies: - - type: Percent + - periodSeconds: 60 + type: Percent value: 100 - periodSeconds: 60 - + stabilizationWindowSeconds: 60 env: - name: METADATA_METRICS_SVC valueFrom: @@ -118,10 +117,6 @@ spec: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s filter/drop_stale_datapoints: metrics: datapoint: @@ -280,7 +275,6 @@ spec: - debug - otlphttp processors: - - batch - filter/drop_stale_datapoints - transform/extract_sum_count_from_histograms - transform/drop_unnecessary_attributes diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml index ada297d224..2b9f142e14 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml @@ -102,10 +102,6 @@ spec: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 2000 - send_batch_size: 1000 - timeout: 1s filter/drop_stale_datapoints: metrics: datapoint: @@ -263,7 +259,6 @@ spec: exporters: - otlphttp processors: - - batch - filter/drop_stale_datapoints - transform/extract_sum_count_from_histograms - transform/drop_unnecessary_attributes diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.input.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.input.yaml index ca225af746..c7a34265e8 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.input.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.input.yaml @@ -1,6 +1,7 @@ otelcolInstrumentation: config: merge: - processors: - batch: - timeout: 10s + exporters: + sumologic/metrics: + sending_queue: + num_consumers: 8 diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml index e33ae08efd..d135d53638 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-merge.output.yaml @@ -29,7 +29,7 @@ data: max_interval: 30s sending_queue: enabled: false - num_consumers: 10 + num_consumers: 8 queue_size: 5000 timeout: 5s extensions: @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 10s k8sattributes: auth_type: serviceAccount extract: @@ -148,7 +144,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -160,7 +155,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml index 2e97b4d178..79eba8bf85 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-from-values-backward-compatibility.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -148,7 +144,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -160,7 +155,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-ipv6.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-ipv6.output.yaml index 0e52d226b0..de1a2541b0 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-ipv6.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/config-ipv6.output.yaml @@ -37,10 +37,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -148,7 +144,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -160,7 +155,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml index b2b9ddea42..c3f5c5606d 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.output.yaml @@ -49,10 +49,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -160,7 +156,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -172,7 +167,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml index c88522e9f1..97d5bab491 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-disabled.sumologic-mock.output.yaml @@ -51,10 +51,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -163,7 +159,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -176,7 +171,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml index cd2caccb99..75e2724424 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.output.yaml @@ -37,10 +37,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -148,7 +144,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -160,7 +155,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml index c88522e9f1..97d5bab491 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-config/traces-gateway-enabled.sumologic-mock.output.yaml @@ -51,10 +51,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s k8sattributes: auth_type: serviceAccount extract: @@ -163,7 +159,6 @@ data: - k8sattributes - source - resource - - batch receivers: - otlp - otlp/deprecated @@ -176,7 +171,6 @@ data: - k8sattributes - source - resource - - batch receivers: - jaeger - otlp diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml index ebd79e691c..7c394db7e4 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-merge.output.yaml @@ -34,10 +34,6 @@ data: size_mib: 256 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s memory_limiter: check_interval: 5s limit_percentage: 90 @@ -59,7 +55,6 @@ data: - loadbalancing processors: - memory_limiter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml index e7d125b1a5..60e3ab1ee4 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-from-values-backward-compatibility.output.yaml @@ -32,10 +32,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s memory_limiter: check_interval: 5s limit_percentage: 90 @@ -57,7 +53,6 @@ data: - loadbalancing processors: - memory_limiter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-ipv6.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-ipv6.output.yaml index 362614ec66..a27cc556eb 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-ipv6.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/config-ipv6.output.yaml @@ -32,10 +32,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s memory_limiter: check_interval: 5s limit_percentage: 90 @@ -57,7 +53,6 @@ data: - loadbalancing processors: - memory_limiter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml index ba57b61d07..66b3bbd539 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/sumologic-mock.output.yaml @@ -34,10 +34,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s memory_limiter: check_interval: 5s limit_percentage: 90 @@ -60,7 +56,6 @@ data: - debug processors: - memory_limiter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml index 49a536a85f..07ef998d89 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-loadbalancing/traces-gateway-true.output.yaml @@ -32,10 +32,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s memory_limiter: check_interval: 5s limit_percentage: 90 @@ -57,7 +53,6 @@ data: - loadbalancing processors: - memory_limiter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml index 071ac463d3..119ce9214e 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/config-from-merge.output.yaml @@ -27,10 +27,6 @@ data: size_mib: 512 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -55,7 +51,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml index 58f5b6cd1a..1b44a3a76d 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/config-from-values-backward-compatibility.output.yaml @@ -25,10 +25,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 10 memory_limiter: @@ -53,7 +49,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/config-ipv6.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/config-ipv6.output.yaml index b4deb12a7a..e0d05d8ee5 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/config-ipv6.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/config-ipv6.output.yaml @@ -25,10 +25,6 @@ data: endpoint: '[${env:MY_POD_IP}]:13133' pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -53,7 +49,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml index f37b5d3426..fe2c779a13 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/httpendpoint.output.yaml @@ -25,10 +25,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -53,7 +49,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml index 98f3616ec3..c305cf1245 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/persistence-enabled.output.yaml @@ -32,10 +32,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -61,7 +57,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml index 8a6f3d32f2..1e2a86887a 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/simple.output.yaml @@ -25,10 +25,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -53,7 +49,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml index 88136c431f..8d82ddb73f 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler/sumologic-mock.output.yaml @@ -30,10 +30,6 @@ data: endpoint: ${env:MY_POD_IP}:13133 pprof: {} processors: - batch: - send_batch_max_size: 512 - send_batch_size: 256 - timeout: 5s cascading_filter: num_traces: 200000 memory_limiter: @@ -60,7 +56,6 @@ data: processors: - memory_limiter - cascading_filter - - batch receivers: - otlp telemetry: diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go index 5f8566e525..ef63442b4f 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -239,15 +239,15 @@ var ( "otelcol_exporter_requests_sent", "otelcol_exporter_sent_metric_points", "otelcol_processor_accepted_metric_points", - "otelcol_processor_batch_batch_send_size_count", - "otelcol_processor_batch_batch_send_size_sum", - "otelcol_processor_batch_timeout_trigger_send", + // "otelcol_processor_batch_batch_send_size_count", // Deprecated + // "otelcol_processor_batch_batch_send_size_sum", // Deprecated + // "otelcol_processor_batch_timeout_trigger_send", // Deprecated "otelcol_processor_groupbyattrs_metric_groups_count", "otelcol_processor_groupbyattrs_metric_groups_sum", "otelcol_processor_groupbyattrs_num_non_grouped_metrics", "otelcol_processor_outgoing_items", "otelcol_processor_incoming_items", - "otelcol_processor_batch_metadata_cardinality", + // "otelcol_processor_batch_metadata_cardinality", // Deprecated } LogsOtelcolMetrics = []string{ "otelcol_exporter_sent_log_records", diff --git a/vagrant/opentelemetry-collector.yaml b/vagrant/opentelemetry-collector.yaml index 702c698433..3a6b960f89 100644 --- a/vagrant/opentelemetry-collector.yaml +++ b/vagrant/opentelemetry-collector.yaml @@ -31,9 +31,6 @@ spec: check_interval: 1s limit_percentage: 75 spike_limit_percentage: 15 - batch: - send_batch_size: 10000 - timeout: 10s exporters: debug: