From 327ef05c5c645355fffc5ed20092ffc7271800c3 Mon Sep 17 00:00:00 2001 From: Devon Bear Date: Wed, 22 May 2024 17:59:23 -0400 Subject: [PATCH 1/3] fix(engine): Possible nil ptr edge case (#1159) bet --- mod/execution/pkg/engine/engine.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/execution/pkg/engine/engine.go b/mod/execution/pkg/engine/engine.go index 6f0cd056d8..365f177495 100644 --- a/mod/execution/pkg/engine/engine.go +++ b/mod/execution/pkg/engine/engine.go @@ -112,7 +112,9 @@ func (ee *Engine[ ) (*engineprimitives.PayloadID, *common.ExecutionHash, error) { // Log the forkchoice update attempt. ee.metrics.MarkNotifyForkchoiceUpdateCalled( - req.State, !req.PayloadAttributes.IsNil(), + req.State, + req.PayloadAttributes != nil && + !req.PayloadAttributes.IsNil(), ) // Notify the execution engine of the forkchoice update. From eece62e24841fd59b01a200aded10e95c25d1579 Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Wed, 22 May 2024 18:14:27 -0400 Subject: [PATCH 2/3] fix(client): logging should use underscores --- mod/execution/pkg/client/client.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mod/execution/pkg/client/client.go b/mod/execution/pkg/client/client.go index a861c10f4e..999e50e692 100644 --- a/mod/execution/pkg/client/client.go +++ b/mod/execution/pkg/client/client.go @@ -194,8 +194,10 @@ func (s *EngineClient[ExecutionPayloadDenebT]) initializeConnection( chainID *big.Int ) for { - s.logger.Info("waiting for execution client to start πŸΊπŸ•”", - "dial-url", s.cfg.RPCDialURL) + s.logger.Info( + "waiting for execution client to start πŸΊπŸ•”", + "dial_url", s.cfg.RPCDialURL, + ) if err = s.setupExecutionClientConnection(ctx); err != nil { s.statusErrMu.Lock() s.statusErr = err @@ -215,11 +217,11 @@ func (s *EngineClient[ExecutionPayloadDenebT]) initializeConnection( // Log the chain ID. s.logger.Info( "connected to execution client πŸ”Œ", - "dial-url", + "dial_url", s.cfg.RPCDialURL.String(), - "chain-id", + "chain_id", chainID.Uint64(), - "required-chain-id", + "required_chain_id", s.eth1ChainID, ) From d9f83999dbc65a3acab23625416d82ccbd3d0654 Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Wed, 22 May 2024 18:17:26 -0400 Subject: [PATCH 3/3] fix(engine): metrics labels should only use underscores --- mod/execution/pkg/client/metrics.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/execution/pkg/client/metrics.go b/mod/execution/pkg/client/metrics.go index 1f9a040735..3e711e1507 100644 --- a/mod/execution/pkg/client/metrics.go +++ b/mod/execution/pkg/client/metrics.go @@ -55,7 +55,7 @@ func newClientMetrics( func (cm *clientMetrics) MeasureForkchoiceUpdateDuration(startTime time.Time) { // TODO: Add Labels. cm.sink.MeasureSince( - "beacon-kit.execution.client.forkchoice_update_duration", + "beacon_kit.execution.client.forkchoice_update_duration", startTime, ) } @@ -64,7 +64,7 @@ func (cm *clientMetrics) MeasureForkchoiceUpdateDuration(startTime time.Time) { func (cm *clientMetrics) MeasureNewPayloadDuration(startTime time.Time) { // TODO: Add Labels. cm.sink.MeasureSince( - "beacon-kit.execution.client.new_payload_duration", + "beacon_kit.execution.client.new_payload_duration", startTime, ) } @@ -73,7 +73,7 @@ func (cm *clientMetrics) MeasureNewPayloadDuration(startTime time.Time) { func (cm *clientMetrics) MeasureGetPayloadDuration(startTime time.Time) { // TODO: Add Labels. cm.sink.MeasureSince( - "beacon-kit.execution.client.get_payload_duration", + "beacon_kit.execution.client.get_payload_duration", startTime, ) }