From 88cc90762023069e1c5ef3523d190a68e761537e Mon Sep 17 00:00:00 2001 From: Pavel <177363085+pkcll@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:41:56 -0500 Subject: [PATCH 1/3] Beholder config: bump EmitterExportTimeout to 30s (OTel default) --- core/config/docs/core.toml | 2 +- core/services/chainlink/testdata/config-empty-effective.toml | 2 +- core/services/chainlink/testdata/config-full.toml | 2 +- .../chainlink/testdata/config-multi-chain-effective.toml | 2 +- core/web/resolver/testdata/config-empty-effective.toml | 2 +- core/web/resolver/testdata/config-full.toml | 2 +- core/web/resolver/testdata/config-multi-chain-effective.toml | 2 +- docs/CONFIG.md | 4 ++-- testdata/scripts/config/merge_raw_configs.txtar | 2 +- testdata/scripts/node/validate/default.txtar | 2 +- testdata/scripts/node/validate/defaults-override.txtar | 2 +- .../scripts/node/validate/disk-based-logging-disabled.txtar | 2 +- .../scripts/node/validate/disk-based-logging-no-dir.txtar | 2 +- testdata/scripts/node/validate/disk-based-logging.txtar | 2 +- testdata/scripts/node/validate/invalid-ocr-p2p.txtar | 2 +- testdata/scripts/node/validate/invalid.txtar | 2 +- testdata/scripts/node/validate/valid.txtar | 2 +- testdata/scripts/node/validate/warnings.txtar | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index 20c519e81a1..61fad239d57 100644 --- 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 index a2052c04a8e..96c44cd4a69 100644 --- 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 index 47193f80184..8ebb1263ce9 100644 --- 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 index 7e658b170db..6667a0b4e94 100644 --- 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 index a2052c04a8e..96c44cd4a69 100644 --- 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 index ef26bfea75a..8bc5ee8d102 100644 --- 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 index 7bdf50b9080..304fc8fe348 100644 --- 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 index 8911aff141f..e4249286a5d 100644 --- 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 index efac49f8ef8..5e203abf8b3 100644 --- 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 index d4e4a188d2a..874be5c71b0 100644 --- 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 index 336f170bd1b..5413f4cc6d3 100644 --- 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 index 677058e1c08..82dff72add4 100644 --- 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 index 0e5a78f4a39..1f005ec8991 100644 --- 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 index 7fc05533a47..c338265d522 100644 --- 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 index 2cc7b7afe0e..6524ff4cb36 100644 --- 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 index b048af38a3b..bcde0f76156 100644 --- 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 index bc84a9b2a37..d760e9dd407 100644 --- 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 index 85b7bc6a253..b59b95defe4 100644 --- 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' From 00e6c9c94473ef7cff8b0907cee8f922bea49c33 Mon Sep 17 00:00:00 2001 From: Geert G <117188496+cll-gg@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:02:41 +0000 Subject: [PATCH 2/3] Fix unit test --- core/services/chainlink/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index 769005feb72..a86de5e2ccb 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -568,7 +568,7 @@ func TestConfig_Marshal(t *testing.T) { ResourceAttributes: map[string]string{"Baz": "test", "Foo": "bar"}, TraceSampleRatio: ptr(0.01), EmitterBatchProcessor: ptr(true), - EmitterExportTimeout: commoncfg.MustNewDuration(1 * time.Second), + EmitterExportTimeout: commoncfg.MustNewDuration(30 * time.Second), } full.EVM = []*evmcfg.EVMConfig{ { From f9504fd6e49594891214c0ec6726681dfeba3cba Mon Sep 17 00:00:00 2001 From: Geert G <117188496+cll-gg@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:18:59 +0000 Subject: [PATCH 3/3] Add changeset --- .changeset/selfish-cups-happen.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/selfish-cups-happen.md diff --git a/.changeset/selfish-cups-happen.md b/.changeset/selfish-cups-happen.md new file mode 100644 index 00000000000..0df04af457c --- /dev/null +++ b/.changeset/selfish-cups-happen.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +Update config: EmitterExportTimeout to 30s (OTel default)