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

Feature/auto 9355 testing #13880

Closed
wants to merge 20 commits into from
Closed

Feature/auto 9355 testing #13880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4b9faa4
Remove the old log buffer
ferglor Jul 11, 2024
d4937ed
Add a changeset
ferglor Jul 11, 2024
10f43de
Update integration test
ferglor Jul 11, 2024
af066a3
Lint
ferglor Jul 11, 2024
2e9e0ac
Clean up from config
ferglor Jul 11, 2024
46d10f0
Update tests
ferglor Jul 11, 2024
64fe028
Integration test lint
ferglor Jul 11, 2024
edd3c8a
Read upkeeps performed by blocks
ferglor Jul 11, 2024
8dd41a7
Add more logs
ferglor Jul 11, 2024
72e7c70
Add logs
ferglor Jul 15, 2024
abcec4b
Add logs for sync filters
ferglor Jul 15, 2024
cd3e131
Add more logs
ferglor Jul 15, 2024
d234fab
Track total dequeues
ferglor Jul 15, 2024
b469689
Update logs
ferglor Jul 15, 2024
3b43302
Track emitted
ferglor Jul 17, 2024
fa76ced
Try to collect stats on dequeued logs
ferglor Jul 18, 2024
c6065d4
Append as time series
ferglor Jul 18, 2024
26b90a8
Tie available and dequeued logs together
ferglor Jul 18, 2024
2e31006
Stringify
ferglor Jul 18, 2024
1b7e535
Track cleaned up and unvailable logs
ferglor Jul 18, 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/unlucky-lemons-learn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Use the new log buffer in automation #changed
3 changes: 1 addition & 2 deletions core/services/job/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ maxServiceWorkers = 100
cacheEvictionInterval = "1s"
mercuryCredentialName = "%s"
contractVersion = "v2.1"
useBufferV1 = %v
`
voterTurnoutDataSourceTemplate = `
// data source 1
Expand Down Expand Up @@ -277,7 +276,7 @@ func makeOCR2Keeper21JobSpec(t testing.TB, ks keystore.Master, transmitter commo
_, registry := cltest.MustInsertRandomKey(t, ks.Eth())

ocr2Keeper21Job := fmt.Sprintf(ocr2Keeper21JobSpecTemplate, registry.String(), kb.ID(), transmitter,
fmt.Sprintf("%s127.0.0.1:%d", bootstrapPeerID, bootstrapNodePort), chainID, "mercury cred", false)
fmt.Sprintf("%s127.0.0.1:%d", bootstrapPeerID, bootstrapNodePort), chainID, "mercury cred")

jobSpec := makeOCR2JobSpecFromToml(t, ocr2Keeper21Job)

Expand Down
9 changes: 0 additions & 9 deletions core/services/ocr2/delegate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import (
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21"
ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
Expand Down Expand Up @@ -1123,14 +1122,6 @@ func (d *Delegate) newServicesOCR2Keepers21(
return nil, errors.New("could not coerce PluginProvider to AutomationProvider")
}

// TODO: (AUTO-9355) remove once we remove v0
if useBufferV1 := cfg.UseBufferV1 != nil && *cfg.UseBufferV1; useBufferV1 {
logProviderFeatures, ok := keeperProvider.LogEventProvider().(logprovider.LogEventProviderFeatures)
if ok {
logProviderFeatures.WithBufferVersion("v1")
}
}

services, err := ocr2keeper.EVMDependencies21(kb)
if err != nil {
return nil, errors.Wrap(err, "could not build dependencies for ocr2 keepers")
Expand Down
3 changes: 0 additions & 3 deletions core/services/ocr2/plugins/ocr2keeper/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ type PluginConfig struct {
ContractVersion string `json:"contractVersion"`
// CaptureAutomationCustomTelemetry is a bool flag to toggle Custom Telemetry Service
CaptureAutomationCustomTelemetry *bool `json:"captureAutomationCustomTelemetry,omitempty"`
// UseBufferV1 is a bool flag to toggle the new log buffer implementation
// TODO: (AUTO-9355) remove once we have a single version
UseBufferV1 *bool `json:"useBufferV1,omitempty"`
}

func ValidatePluginConfig(cfg PluginConfig) error {
Expand Down
Loading
Loading