Beholder config: bump EmitterExportTimeout to 30s (OTel default)

smartcontractkit · Nov 21, 2024 · 88cc907 · 88cc907
1 parent 9eceab5
commit 88cc907
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 deletions.
diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml
@@ -721,7 +721,7 @@ TraceSampleRatio = 0.01 # Default
 # EmitterBatchProcessor enables batching for telemetry events
 EmitterBatchProcessor = true # Default
 # EmitterExportTimeout sets timeout for exporting telemetry events
-EmitterExportTimeout = '1s' # Default
+EmitterExportTimeout = '30s' # Default
 
 # ResourceAttributes are global metadata to include with all telemetry.
 [Telemetry.ResourceAttributes]

diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml
@@ -293,4 +293,4 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
@@ -303,7 +303,7 @@ Endpoint = 'example.com/collector'
 InsecureConnection = true
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [Telemetry.ResourceAttributes]
 Baz = 'test'

diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -293,7 +293,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml
@@ -293,4 +293,4 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
@@ -303,7 +303,7 @@ Endpoint = 'example.com/collector'
 InsecureConnection = true
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [Telemetry.ResourceAttributes]
 Baz = 'test'

diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -293,7 +293,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -1942,7 +1942,7 @@ CACertFile = 'cert-file' # Example
 InsecureConnection = false # Default
 TraceSampleRatio = 0.01 # Default
 EmitterBatchProcessor = true # Default
-EmitterExportTimeout = '1s' # Default
+EmitterExportTimeout = '30s' # Default
 ```
 Telemetry holds OTEL settings.
 This data includes open telemetry metrics, traces, & logs.
@@ -1988,7 +1988,7 @@ EmitterBatchProcessor enables batching for telemetry events
 
 ### EmitterExportTimeout
 ```toml
-EmitterExportTimeout = '1s' # Default
+EmitterExportTimeout = '30s' # Default
 ```
 EmitterExportTimeout sets timeout for exporting telemetry events
 

diff --git a/testdata/scripts/config/merge_raw_configs.txtar b/testdata/scripts/config/merge_raw_configs.txtar
@@ -440,7 +440,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[Aptos]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar
@@ -305,7 +305,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 Invalid configuration: invalid secrets: 2 errors:
 	- Database.URL: empty: must be provided and non-empty

diff --git a/testdata/scripts/node/validate/defaults-override.txtar b/testdata/scripts/node/validate/defaults-override.txtar
@@ -366,7 +366,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -349,7 +349,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -349,7 +349,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -349,7 +349,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar
@@ -334,7 +334,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 Invalid configuration: invalid configuration: P2P.V2.Enabled: invalid value (false): P2P required for OCR or OCR2. Please enable P2P or disable OCR/OCR2.
 

diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
@@ -339,7 +339,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
@@ -346,7 +346,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 [[EVM]]
 ChainID = '1'

diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar
@@ -328,7 +328,7 @@ Endpoint = ''
 InsecureConnection = false
 TraceSampleRatio = 0.01
 EmitterBatchProcessor = true
-EmitterExportTimeout = '1s'
+EmitterExportTimeout = '30s'
 
 # Configuration warning:
 Tracing.TLSCertPath: invalid value (something): must be empty when Tracing.Mode is 'unencrypted'