Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88cc907
Beholder config: bump EmitterExportTimeout to 30s (OTel default)
pkcll Nov 21, 2024
00e6c9c
Fix unit test
cll-gg Nov 21, 2024
f9504fd
Add changeset
cll-gg Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/selfish-cups-happen.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Update config: EmitterExportTimeout to 30s (OTel default)
2 changes: 1 addition & 1 deletion core/config/docs/core.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion core/services/chainlink/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand Down
2 changes: 1 addition & 1 deletion core/services/chainlink/testdata/config-empty-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,4 +293,4 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'
2 changes: 1 addition & 1 deletion core/services/chainlink/testdata/config-full.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Endpoint = 'example.com/collector'
InsecureConnection = true
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[Telemetry.ResourceAttributes]
Baz = 'test'
Expand Down
2 changes: 1 addition & 1 deletion core/services/chainlink/testdata/config-multi-chain-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion core/web/resolver/testdata/config-empty-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,4 +293,4 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'
2 changes: 1 addition & 1 deletion core/web/resolver/testdata/config-full.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Endpoint = 'example.com/collector'
InsecureConnection = true
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[Telemetry.ResourceAttributes]
Baz = 'test'
Expand Down
2 changes: 1 addition & 1 deletion core/web/resolver/testdata/config-multi-chain-effective.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
4 changes: 2 additions & 2 deletions docs/CONFIG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/config/merge_raw_configs.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[Aptos]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/default.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/defaults-override.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/disk-based-logging-disabled.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/disk-based-logging.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/invalid-ocr-p2p.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/invalid.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/valid.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Endpoint = ''
InsecureConnection = false
TraceSampleRatio = 0.01
EmitterBatchProcessor = true
EmitterExportTimeout = '1s'
EmitterExportTimeout = '30s'

[[EVM]]
ChainID = '1'
Expand Down
2 changes: 1 addition & 1 deletion testdata/scripts/node/validate/warnings.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading