mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-08 21:08:10 -05:00
#### This PR sets the foundation for the new logging features. --- The goal of this big PR is the following: 1. Adding a log.go file to every package: [_commit_](54f6396d4c) - Writing a bash script that adds the log.go file to every package that imports logrus, except the excluded packages, configured at the top of the bash script. - the log.go file creates a log variable and sets a field called `package` to the full path of that package. - I have tried to fix every error/problem that came from mass generation of this file. (duplicate declarations, different prefix names, etc...) - some packages had the log.go file from before, and had some helper functions in there as well. I've moved all of them to a `log_helpers.go` file within each package. 2. Create a CI rule which verifies that: [_commit_](b799c3a0ef) - every package which imports logrus, also has a log.go file, except the excluded packages. - the `package` field of each log.go variable, has the correct path. (to detect when we move a package or change it's name) - I pushed a commit with a manually changed log.go file to trigger the ci check failure and it worked. 3. Alter the logging system to read the prefix from this `package` field for every log while outputing: [_commit_](b0c7f1146c) - some packages have/want/need a different log prefix than their package name (like `kv`). This can be solved by keeping a map of package paths to prefix names somewhere. --- **Some notes:** - Please review everything carefully. - I created the `prefixReplacement` map and populated the data that I deemed necessary. Please check it and complain if something doesn't make sense or is missing. I attached at the bottom, the list of all the packages that used to use a different name than their package name as their prefix. - I have chosen to mark some packages to be excluded from this whole process. They will either not log anything, or log without a prefix, or log using their previously defined prefix. See the list of exclusions in the bottom. - I fixed all the tests that failed because of this change. These were failing because they were expecting the old prefix to be in the generated logs. I have changed those to expect the new `package` field instead. This might not be a great solution. Ideally we might want to remove this from the tests so they only test for relevant fields in the logs. but this is a problem for another day. - Please run the node with this config, and mention if you see something weird in the logs. (use different verbosities) - The CI workflow uses a script that basically runs the `hack/gen-logs.sh` and checks that the git diff is zero. that script is `hack/check-logs.sh`. This means that if one runs this script locally, it will not actually _check_ anything, rather than just regenerate the log.go files and fix any mistake. This might be confusing. Please suggest solutions if you think it's a problem. --- **A list of packages that used a different prefix than their package names for their logs:** - beacon-chain/cache/depositsnapshot/ package depositsnapshot, prefix "cache" - beacon-chain/core/transition/log.go — package transition, prefix "state" - beacon-chain/db/kv/log.go — package kv, prefix "db" - beacon-chain/db/slasherkv/log.go — package slasherkv, prefix "slasherdb" - beacon-chain/db/pruner/pruner.go — package pruner, prefix "db-pruner" - beacon-chain/light-client/log.go — package light_client, prefix "light-client" - beacon-chain/operations/attestations/log.go — package attestations, prefix "pool/attestations" - beacon-chain/operations/slashings/log.go — package slashings, prefix "pool/slashings" - beacon-chain/rpc/core/log.go — package core, prefix "rpc/core" - beacon-chain/rpc/eth/beacon/log.go — package beacon, prefix "rpc/beaconv1" - beacon-chain/rpc/eth/validator/log.go — package validator, prefix "beacon-api" - beacon-chain/rpc/prysm/v1alpha1/beacon/log.go — package beacon, prefix "rpc" - beacon-chain/rpc/prysm/v1alpha1/validator/log.go — package validator, prefix "rpc/validator" - beacon-chain/state/stategen/log.go — package stategen, prefix "state-gen" - beacon-chain/sync/checkpoint/log.go — package checkpoint, prefix "checkpoint-sync" - beacon-chain/sync/initial-sync/log.go — package initialsync, prefix "initial-sync" - cmd/prysmctl/p2p/log.go — package p2p, prefix "prysmctl-p2p" - config/features/log.go -- package features, prefix "flags" - io/file/log.go — package file, prefix "fileutil" - proto/prysm/v1alpha1/log.go — package eth, prefix "protobuf" - validator/client/beacon-api/log.go — package beacon_api, prefix "beacon-api" - validator/db/kv/log.go — package kv, prefix "db" - validator/db/filesystem/db.go — package filesystem, prefix "db" - validator/keymanager/derived/log.go — package derived, prefix "derived-keymanager" - validator/keymanager/local/log.go — package local, prefix "local-keymanager" - validator/keymanager/remote-web3signer/log.go — package remote_web3signer, prefix "remote-keymanager" - validator/keymanager/remote-web3signer/internal/log.go — package internal, prefix "remote-web3signer- internal" - beacon-chain/forkchoice/doubly... prefix is "forkchoice-doublylinkedtree" **List of excluded directories (their subdirectories are also excluded):** ``` EXCLUDED_PATH_PREFIXES=( "testing" "validator/client/testutil" "beacon-chain/p2p/testing" "beacon-chain/rpc/eth/config" "beacon-chain/rpc/prysm/v1alpha1/debug" "tools" "runtime" "monitoring" "io" "cmd" ".well-known" "changelog" "hack" "specrefs" "third_party" "bazel-out" "bazel-bin" "bazel-prysm" "bazel-testlogs" "build" ".github" ".jj" ".idea" ".vscode" ) ```
163 lines
5.7 KiB
Go
163 lines
5.7 KiB
Go
package blockchain
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/core/blocks"
|
|
"github.com/OffchainLabs/prysm/v7/config/params"
|
|
consensus_types "github.com/OffchainLabs/prysm/v7/consensus-types"
|
|
"github.com/OffchainLabs/prysm/v7/consensus-types/interfaces"
|
|
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
|
|
ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
|
|
"github.com/OffchainLabs/prysm/v7/runtime/version"
|
|
prysmTime "github.com/OffchainLabs/prysm/v7/time"
|
|
"github.com/OffchainLabs/prysm/v7/time/slots"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// logs state transition related data every slot.
|
|
func logStateTransitionData(b interfaces.ReadOnlyBeaconBlock) error {
|
|
log := log.WithField("slot", b.Slot())
|
|
if len(b.Body().Attestations()) > 0 {
|
|
log = log.WithField("attestations", len(b.Body().Attestations()))
|
|
}
|
|
if len(b.Body().AttesterSlashings()) > 0 {
|
|
log = log.WithField("attesterSlashings", len(b.Body().AttesterSlashings()))
|
|
}
|
|
if len(b.Body().ProposerSlashings()) > 0 {
|
|
log = log.WithField("proposerSlashings", len(b.Body().ProposerSlashings()))
|
|
}
|
|
if len(b.Body().VoluntaryExits()) > 0 {
|
|
log = log.WithField("voluntaryExits", len(b.Body().VoluntaryExits()))
|
|
}
|
|
if b.Version() >= version.Altair {
|
|
agg, err := b.Body().SyncAggregate()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log = log.WithField("syncBitsCount", agg.SyncCommitteeBits.Count())
|
|
}
|
|
if b.Version() >= version.Bellatrix {
|
|
p, err := b.Body().Execution()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log = log.WithField("payloadHash", fmt.Sprintf("%#x", bytesutil.Trunc(p.BlockHash())))
|
|
txs, err := p.Transactions()
|
|
switch {
|
|
case errors.Is(err, consensus_types.ErrUnsupportedField):
|
|
case err != nil:
|
|
return err
|
|
default:
|
|
log = log.WithField("txCount", len(txs))
|
|
txsPerSlotCount.Set(float64(len(txs)))
|
|
}
|
|
}
|
|
if b.Version() >= version.Deneb {
|
|
kzgs, err := b.Body().BlobKzgCommitments()
|
|
if err != nil {
|
|
log.WithError(err).Error("Failed to get blob KZG commitments")
|
|
} else if len(kzgs) > 0 {
|
|
log = log.WithField("kzgCommitmentCount", len(kzgs))
|
|
}
|
|
}
|
|
if b.Version() >= version.Electra {
|
|
eReqs, err := b.Body().ExecutionRequests()
|
|
if err != nil {
|
|
log.WithError(err).Error("Failed to get execution requests")
|
|
} else {
|
|
if len(eReqs.Deposits) > 0 {
|
|
log = log.WithField("depositRequestCount", len(eReqs.Deposits))
|
|
}
|
|
if len(eReqs.Consolidations) > 0 {
|
|
log = log.WithField("consolidationRequestCount", len(eReqs.Consolidations))
|
|
}
|
|
if len(eReqs.Withdrawals) > 0 {
|
|
log = log.WithField("withdrawalRequestCount", len(eReqs.Withdrawals))
|
|
}
|
|
}
|
|
}
|
|
log.Info("Finished applying state transition")
|
|
return nil
|
|
}
|
|
|
|
func logBlockSyncStatus(block interfaces.ReadOnlyBeaconBlock, blockRoot [32]byte, justified, finalized *ethpb.Checkpoint, receivedTime time.Time, genesis time.Time, daWaitedTime time.Duration) error {
|
|
startTime, err := slots.StartTime(genesis, block.Slot())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
level := log.Logger.GetLevel()
|
|
if level >= logrus.DebugLevel {
|
|
parentRoot := block.ParentRoot()
|
|
lf := logrus.Fields{
|
|
"slot": block.Slot(),
|
|
"slotInEpoch": block.Slot() % params.BeaconConfig().SlotsPerEpoch,
|
|
"block": fmt.Sprintf("0x%s...", hex.EncodeToString(blockRoot[:])[:8]),
|
|
"epoch": slots.ToEpoch(block.Slot()),
|
|
"justifiedEpoch": justified.Epoch,
|
|
"justifiedRoot": fmt.Sprintf("0x%s...", hex.EncodeToString(justified.Root)[:8]),
|
|
"finalizedEpoch": finalized.Epoch,
|
|
"finalizedRoot": fmt.Sprintf("0x%s...", hex.EncodeToString(finalized.Root)[:8]),
|
|
"parentRoot": fmt.Sprintf("0x%s...", hex.EncodeToString(parentRoot[:])[:8]),
|
|
"version": version.String(block.Version()),
|
|
"sinceSlotStartTime": prysmTime.Now().Sub(startTime),
|
|
"chainServiceProcessedTime": prysmTime.Now().Sub(receivedTime) - daWaitedTime,
|
|
"dataAvailabilityWaitedTime": daWaitedTime,
|
|
}
|
|
log.WithFields(lf).Debug("Synced new block")
|
|
} else {
|
|
log.WithFields(logrus.Fields{
|
|
"slot": block.Slot(),
|
|
"block": fmt.Sprintf("0x%s...", hex.EncodeToString(blockRoot[:])[:8]),
|
|
"finalizedEpoch": finalized.Epoch,
|
|
"finalizedRoot": fmt.Sprintf("0x%s...", hex.EncodeToString(finalized.Root)[:8]),
|
|
"epoch": slots.ToEpoch(block.Slot()),
|
|
}).Info("Synced new block")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// logs payload related data every slot.
|
|
func logPayload(block interfaces.ReadOnlyBeaconBlock) error {
|
|
isExecutionBlk, err := blocks.IsExecutionBlock(block.Body())
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not determine if block is execution block")
|
|
}
|
|
if !isExecutionBlk {
|
|
return nil
|
|
}
|
|
payload, err := block.Body().Execution()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if payload.GasLimit() == 0 {
|
|
return errors.New("gas limit should not be 0")
|
|
}
|
|
gasUtilized := float64(payload.GasUsed()) / float64(payload.GasLimit())
|
|
fields := logrus.Fields{
|
|
"blockHash": fmt.Sprintf("%#x", bytesutil.Trunc(payload.BlockHash())),
|
|
"parentHash": fmt.Sprintf("%#x", bytesutil.Trunc(payload.ParentHash())),
|
|
"blockNumber": payload.BlockNumber(),
|
|
"gasUtilized": fmt.Sprintf("%.2f", gasUtilized),
|
|
}
|
|
if block.Version() >= version.Capella {
|
|
withdrawals, err := payload.Withdrawals()
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not get withdrawals")
|
|
}
|
|
fields["withdrawals"] = len(withdrawals)
|
|
changes, err := block.Body().BLSToExecutionChanges()
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not get BLSToExecutionChanges")
|
|
}
|
|
if len(changes) > 0 {
|
|
fields["blsToExecutionChanges"] = len(changes)
|
|
}
|
|
}
|
|
log.WithFields(fields).Debug("Synced new payload")
|
|
return nil
|
|
}
|