Skip to content

Commit

Permalink
Remove batch processor from traces pipeline (#22757)
Browse files Browse the repository at this point in the history 
Remove batch processor from traces pipeline

Co-authored-by: ahmed-mez <38987709+ahmed-mez@users.noreply.github.com>
  • Loading branch information
@dineshg13 @ahmed-mez
dineshg13 and ahmed-mez authored Feb 21, 2024
1 parent e89df0b commit 9379574
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 56 deletions.
5 changes: 0 additions & 5 deletions comp/otelcol/otlp/map_provider_config_not_serverless.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ const defaultTracesConfig string = `
receivers:
otlp:
processors:
batch:
timeout: 10s
exporters:
otlp:
tls:
Expand All @@ -32,7 +28,6 @@ service:
pipelines:
traces:
receivers: [otlp]
processors: [batch]
exporters: [otlp]
`

Expand Down
75 changes: 24 additions & 51 deletions comp/otelcol/otlp/map_provider_not_serverless_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,12 @@ func TestNewMap(t *testing.T) {
"endpoint": "localhost:5003",
},
},
"processors": map[string]interface{}{
"batch": map[string]interface{}{
"timeout": "10s",
},
},
"service": map[string]interface{}{
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
},
},
Expand Down Expand Up @@ -135,9 +129,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -209,9 +202,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -245,11 +237,6 @@ func TestNewMap(t *testing.T) {
},
},
},
"processors": map[string]interface{}{
"batch": map[string]interface{}{
"timeout": "10s",
},
},
"exporters": map[string]interface{}{
"otlp": map[string]interface{}{
"tls": map[string]interface{}{
Expand All @@ -263,9 +250,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
},
},
Expand Down Expand Up @@ -352,11 +338,6 @@ func TestNewMap(t *testing.T) {
},
},
},
"processors": map[string]interface{}{
"batch": map[string]interface{}{
"timeout": "10s",
},
},
"exporters": map[string]interface{}{
"otlp": map[string]interface{}{
"tls": map[string]interface{}{
Expand All @@ -373,9 +354,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp", "logging"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp", "logging"},
},
},
},
Expand Down Expand Up @@ -505,9 +485,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp", "logging"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp", "logging"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -558,9 +537,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"logs": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -634,9 +612,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -715,9 +692,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -776,9 +752,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp"},
},
"logs": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -900,9 +875,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp", "logging"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp", "logging"},
},
"logs": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down Expand Up @@ -1046,9 +1020,8 @@ func TestNewMap(t *testing.T) {
"telemetry": map[string]interface{}{"metrics": map[string]interface{}{"level": "none"}},
"pipelines": map[string]interface{}{
"traces": map[string]interface{}{
"receivers": []interface{}{"otlp"},
"processors": []interface{}{"batch"},
"exporters": []interface{}{"otlp", "logging"},
"receivers": []interface{}{"otlp"},
"exporters": []interface{}{"otlp", "logging"},
},
"metrics": map[string]interface{}{
"receivers": []interface{}{"otlp"},
Expand Down

0 comments on commit 9379574

Please sign in to comment.