Skip to content

Commit df55869

Browse files
fix: update EDOT -> mOTLP config with correct field (#10822) (#10824)
(cherry picked from commit 23ce46e) Co-authored-by: Vignesh Shanmugam <[email protected]>
1 parent 38939a4 commit df55869

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

docs/reference/edot-collector/config/default-config-standalone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ otlp/ingest:
117117
queue_size: 50000000 # 50MB uncompressed
118118
block_on_overflow: true
119119
batch:
120-
flush_interval: 1s
120+
flush_timeout: 1s
121121
min_size: 1_000_000 # 1MB uncompressed
122122
max_size: 4_000_000 # 4MB uncompressed
123123
```

internal/pkg/otel/samples/darwin/managed_otlp/logs_metrics_traces.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ exporters:
8989
queue_size: 50000000 # 50MB uncompressed
9090
block_on_overflow: true
9191
batch:
92-
flush_interval: 1s
92+
flush_timeout: 1s
9393
min_size: 1_000_000 # 1MB uncompressed
9494
max_size: 4_000_000 # 4MB uncompressed
9595
otlp/ingest_metrics_traces:
@@ -102,7 +102,7 @@ exporters:
102102
queue_size: 50000000 # 50MB uncompressed
103103
block_on_overflow: true
104104
batch:
105-
flush_interval: 1s
105+
flush_timeout: 1s
106106
min_size: 1_000_000 # 1MB uncompressed
107107
max_size: 4_000_000 # 4MB uncompressed
108108

internal/pkg/otel/samples/darwin/managed_otlp/platformlogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ exporters:
6363
queue_size: 50000000 # 50MB uncompressed
6464
block_on_overflow: true
6565
batch:
66-
flush_interval: 1s
66+
flush_timeout: 1s
6767
min_size: 1_000_000 # 1MB uncompressed
6868
max_size: 4_000_000 # 4MB uncompressed
6969

internal/pkg/otel/samples/darwin/managed_otlp/platformlogs_hostmetrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ exporters:
8484
queue_size: 50000000 # 50MB uncompressed
8585
block_on_overflow: true
8686
batch:
87-
flush_interval: 1s
87+
flush_timeout: 1s
8888
min_size: 1_000_000 # 1MB uncompressed
8989
max_size: 4_000_000 # 4MB uncompressed
9090

internal/pkg/otel/samples/linux/managed_otlp/logs_metrics_traces.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ exporters:
9696
queue_size: 50000000 # 50MB uncompressed
9797
block_on_overflow: true
9898
batch:
99-
flush_interval: 1s
99+
flush_timeout: 1s
100100
min_size: 1_000_000 # 1MB uncompressed
101101
max_size: 4_000_000 # 4MB uncompressed
102102
otlp/ingest_metrics_traces:
@@ -109,7 +109,7 @@ exporters:
109109
queue_size: 50000000 # 50MB uncompressed
110110
block_on_overflow: true
111111
batch:
112-
flush_interval: 1s
112+
flush_timeout: 1s
113113
min_size: 1_000_000 # 1MB uncompressed
114114
max_size: 4_000_000 # 4MB uncompressed
115115

internal/pkg/otel/samples/linux/managed_otlp/platformlogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ exporters:
6363
queue_size: 50000000 # 50MB uncompressed
6464
block_on_overflow: true
6565
batch:
66-
flush_interval: 1s
66+
flush_timeout: 1s
6767
min_size: 1_000_000 # 1MB uncompressed
6868
max_size: 4_000_000 # 4MB uncompressed
6969

internal/pkg/otel/samples/linux/managed_otlp/platformlogs_hostmetrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ exporters:
9191
queue_size: 50000000 # 50MB uncompressed
9292
block_on_overflow: true
9393
batch:
94-
flush_interval: 1s
94+
flush_timeout: 1s
9595
min_size: 1_000_000 # 1MB uncompressed
9696
max_size: 4_000_000 # 4MB uncompressed
9797

0 commit comments

Comments
 (0)