Skip to content

Commit

Permalink
Merge branch 'main' into node-memory-limits
Browse files Browse the repository at this point in the history
  • Loading branch information
blumamir authored Nov 23, 2024
2 parents 0ed0290 + dc56a0b commit 0b1e6b8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common/config/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func getBasicConfig(memoryLimiterConfig GenericMap) (*Config, []string) {
"protocols": GenericMap{
"grpc": GenericMap{
// setting it to a large value to avoid dropping batches.
"max_recv_msg_size_mib": 128 * 1024 * 1024,
"max_recv_msg_size_mib": 128,
"endpoint": "0.0.0.0:4317",
},
// Node collectors send in gRPC, so this is probably not needed
Expand Down
2 changes: 1 addition & 1 deletion common/config/testdata/debugexporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ receivers:
protocols:
grpc:
endpoint: 0.0.0.0:4317
max_recv_msg_size_mib: 134217728
max_recv_msg_size_mib: 128
http:
endpoint: 0.0.0.0:4318
exporters:
Expand Down
2 changes: 1 addition & 1 deletion common/config/testdata/minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ receivers:
protocols:
grpc:
endpoint: 0.0.0.0:4317
max_recv_msg_size_mib: 134217728
max_recv_msg_size_mib: 128
http:
endpoint: 0.0.0.0:4318
exporters: {}
Expand Down

0 comments on commit 0b1e6b8

Please sign in to comment.