Skip to content

Commit d4539dd

Browse files
authored
[chore] update references to batch processor (#13406)
This updates some of the documentation to remove the reference to the batch processor. --------- Signed-off-by: alex boten <223565+codeboten@users.noreply.github.com>
1 parent 3529707 commit d4539dd

File tree

14 files changed

+19
-37
lines changed

14 files changed

+19
-37
lines changed

cmd/builder/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ receivers:
3636
grpc:
3737
endpoint: localhost:4317
3838

39-
processors:
40-
batch:
41-
4239
exporters:
4340
debug:
4441

@@ -47,8 +44,6 @@ service:
4744
traces:
4845
receivers:
4946
- otlp
50-
processors:
51-
- batch
5247
exporters:
5348
- debug
5449
EOF

confmap/README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,13 @@ service:
129129
130130
```yaml
131131
# extra_extension.yaml
132-
processors:
133-
batch:
134132
extensions:
135133
healthcheckv2:
136134

137135
service:
138136
extensions: [ healthcheckv2 ]
139137
pipelines:
140138
traces:
141-
processors: [ batch ]
142139
```
143140
144141
If you run the Collector with following command,
@@ -157,7 +154,6 @@ processors:
157154
- key: key
158155
value: "value"
159156
action: upsert
160-
batch:
161157
exporters:
162158
otlp/out:
163159
extensions:
@@ -168,7 +164,7 @@ service:
168164
pipelines:
169165
traces:
170166
receivers: [ otlp/in ]
171-
processors: [ attributes/example, batch ]
167+
processors: [ attributes/example ]
172168
exporters: [ otlp/out ]
173169
extensions: [ file_storage, healthcheckv2 ]
174170
```

confmap/internal/e2e/testdata/issue-10787-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ receivers:
66
http:
77
endpoint: 0.0.0.0:4318
88
processors:
9-
batch:
9+
memory_limiter:
1010

1111
exporters:
1212
${file:testdata/issue-10787-snippet.yaml}
@@ -18,5 +18,5 @@ service:
1818
pipelines:
1919
traces:
2020
receivers: [otlp]
21-
processors: [batch]
21+
processors: [memory_limiter]
2222
exporters: [debug]

confmap/internal/e2e/types_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ func TestIssue10787(t *testing.T) {
437437
},
438438
},
439439
"processors": map[string]any{
440-
"batch": nil,
440+
"memory_limiter": nil,
441441
},
442442
"receivers": map[string]any{
443443
"otlp": map[string]any{
@@ -455,7 +455,7 @@ func TestIssue10787(t *testing.T) {
455455
"pipelines": map[string]any{
456456
"traces": map[string]any{
457457
"exporters": []any{"debug"},
458-
"processors": []any{"batch"},
458+
"processors": []any{"memory_limiter"},
459459
"receivers": []any{"otlp"},
460460
},
461461
},

confmap/provider/envprovider/provider_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const envSchemePrefix = schemeName + ":"
2222

2323
const validYAML = `
2424
processors:
25-
batch:
25+
testprocessor:
2626
exporters:
2727
otlp:
2828
endpoint: "localhost:4317"
@@ -68,7 +68,7 @@ func TestEnv(t *testing.T) {
6868
retMap, err := ret.AsConf()
6969
require.NoError(t, err)
7070
expectedMap := confmap.NewFromStringMap(map[string]any{
71-
"processors::batch": nil,
71+
"processors::testprocessor": nil,
7272
"exporters::otlp::endpoint": "localhost:4317",
7373
})
7474
assert.Equal(t, expectedMap.ToStringMap(), retMap.ToStringMap())
@@ -88,7 +88,7 @@ func TestEnvWithLogger(t *testing.T) {
8888
retMap, err := ret.AsConf()
8989
require.NoError(t, err)
9090
expectedMap := confmap.NewFromStringMap(map[string]any{
91-
"processors::batch": nil,
91+
"processors::testprocessor": nil,
9292
"exporters::otlp::endpoint": "localhost:4317",
9393
})
9494
assert.Equal(t, expectedMap.ToStringMap(), retMap.ToStringMap())

confmap/provider/fileprovider/provider_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestRelativePath(t *testing.T) {
6969
retMap, err := ret.AsConf()
7070
require.NoError(t, err)
7171
expectedMap := confmap.NewFromStringMap(map[string]any{
72-
"processors::batch": nil,
72+
"processors::testprocessor": nil,
7373
"exporters::otlp::endpoint": "localhost:4317",
7474
})
7575
assert.Equal(t, expectedMap, retMap)
@@ -83,7 +83,7 @@ func TestAbsolutePath(t *testing.T) {
8383
retMap, err := ret.AsConf()
8484
require.NoError(t, err)
8585
expectedMap := confmap.NewFromStringMap(map[string]any{
86-
"processors::batch": nil,
86+
"processors::testprocessor": nil,
8787
"exporters::otlp::endpoint": "localhost:4317",
8888
})
8989
assert.Equal(t, expectedMap, retMap)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
processors:
2-
batch:
2+
testprocessor:
33
exporters:
44
otlp:
55
endpoint: "localhost:4317"

confmap/provider/internal/configurablehttpprovider/testdata/otel-config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ receivers:
99
http:
1010

1111
processors:
12-
batch:
1312
memory_limiter:
1413
# 75% of maximum memory up to 2G
1514
limit_mib: 1536
@@ -25,11 +24,11 @@ service:
2524
pipelines:
2625
traces:
2726
receivers: [otlp]
28-
processors: [memory_limiter, batch]
27+
processors: [memory_limiter]
2928
exporters: [debug]
3029
metrics:
3130
receivers: [otlp]
32-
processors: [memory_limiter, batch]
31+
processors: [memory_limiter]
3332
exporters: [debug]
3433

3534
extensions: [zpages]

confmap/provider/yamlprovider/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ The YAML Provider takes a literal YAML string as Collector configuration.
2222
The scheme for this provider is `yaml`. Usage looks like the following passed to the Collector's command line invocation:
2323

2424
```text
25-
--config=yaml:processors::batch::timeout: 2s
25+
--config="yaml:exporters::otlphttp::sending_queue::batch::flush_timeout: 2s"
2626
```

confmap/provider/yamlprovider/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ type provider struct{}
2424
// bytes-uri = "yaml:" yaml-bytes
2525
//
2626
// Examples:
27-
// `yaml:processors::batch::timeout: 2s`
28-
// `yaml:processors::batch/foo::timeout: 3s`
27+
// `yaml:exporters::otlphttp::sending_queue::batch::flush_timeout: 2s`
28+
// `yaml:exporters::otlphttp/foo::sending_queue::batch::flush_timeout: 2s`
2929
func NewFactory() confmap.ProviderFactory {
3030
return confmap.NewProviderFactory(newProvider)
3131
}

0 commit comments

Comments
 (0)