Unify the pattern of using a package-level logger (#8245)

Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com>

beacon-chain/BUILD.bazel

@@ -8,6 +8,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],

beacon-chain/cache/depositcache/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "deposits_cache.go",
+        "log.go",
         "pending_deposits.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache",

beacon-chain/cache/depositcache/deposits_cache.go

@@ -19,7 +19,7 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/trieutil"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -78,7 +78,7 @@ func (dc *DepositCache) InsertDeposit(ctx context.Context, d *ethpb.Deposit, blo
 	ctx, span := trace.StartSpan(ctx, "DepositsCache.InsertDeposit")
 	defer span.End()
 	if d == nil {
-		log.WithFields(log.Fields{
+		log.WithFields(logrus.Fields{
 			"block":        blockNum,
 			"deposit":      d,
 			"index":        index,

beacon-chain/cache/depositcache/log.go

@@ -0,0 +1,5 @@
+package depositcache
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "depositcache")

beacon-chain/cache/depositcache/pending_deposits.go

@@ -10,7 +10,7 @@ import (
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	dbpb "github.com/prysmaticlabs/prysm/proto/beacon/db"
 	"github.com/prysmaticlabs/prysm/shared/hashutil"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -33,7 +33,7 @@ func (dc *DepositCache) InsertPendingDeposit(ctx context.Context, d *ethpb.Depos
 	ctx, span := trace.StartSpan(ctx, "DepositsCache.InsertPendingDeposit")
 	defer span.End()
 	if d == nil {
-		log.WithFields(log.Fields{
+		log.WithFields(logrus.Fields{
 			"block":   blockNum,
 			"deposit": d,
 		}).Debug("Ignoring nil deposit insertion")

beacon-chain/core/state/BUILD.bazel

@@ -6,6 +6,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "skip_slot_cache.go",
         "state.go",
         "transition.go",

beacon-chain/core/state/log.go

@@ -0,0 +1,5 @@
+package state
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "state")

beacon-chain/core/state/transition.go

@@ -21,7 +21,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/mathutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/traceutil"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 
@@ -312,7 +311,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 	defer func() {
 		if err := SkipSlotCache.MarkNotInProgress(key); err != nil {
 			traceutil.AnnotateError(span, err)
-			logrus.WithError(err).Error("Failed to mark skip slot no longer in progress")
+			log.WithError(err).Error("Failed to mark skip slot no longer in progress")
 		}
 	}()
 
@@ -322,7 +321,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 			// Cache last best value.
 			if highestSlot < state.Slot() {
 				if err := SkipSlotCache.Put(ctx, key, state); err != nil {
-					logrus.WithError(err).Error("Failed to put skip slot cache value")
+					log.WithError(err).Error("Failed to put skip slot cache value")
 				}
 			}
 			return nil, ctx.Err()
@@ -347,7 +346,7 @@ func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64
 
 	if highestSlot < state.Slot() {
 		if err := SkipSlotCache.Put(ctx, key, state); err != nil {
-			logrus.WithError(err).Error("Failed to put skip slot cache value")
+			log.WithError(err).Error("Failed to put skip slot cache value")
 			traceutil.AnnotateError(span, err)
 		}
 	}

beacon-chain/db/BUILD.bazel

@@ -12,6 +12,7 @@ go_library(
     srcs = [
         "alias.go",
         "cmd.go",
+        "log.go",
         "restore.go",
     ] + select({
         ":kafka_disabled": [

beacon-chain/db/cmd.go

@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},

beacon-chain/db/kafka/BUILD.bazel

@@ -4,6 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "export_wrapper.go",
+        "log.go",
         "passthrough.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/db/kafka",

beacon-chain/db/kafka/export_wrapper.go

@@ -14,14 +14,12 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/iface"
 	"github.com/prysmaticlabs/prysm/shared/featureconfig"
 	"github.com/prysmaticlabs/prysm/shared/traceutil"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 	_ "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka/librdkafka" // Required for c++ kafka library.
 )
 
 var _ iface.Database = (*Exporter)(nil)
-var log = logrus.WithField("prefix", "exporter")
 var marshaler = &jsonpb.Marshaler{}
 
 // Exporter wraps a database interface and exports certain objects to kafka topics.

beacon-chain/db/kafka/log.go

@@ -0,0 +1,5 @@
+package kafka
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "exporter")

beacon-chain/db/kv/BUILD.bazel

@@ -12,6 +12,7 @@ go_library(
         "encoding.go",
         "finalized_block_roots.go",
         "kv.go",
+        "log.go",
         "migration.go",
         "migration_archived_index.go",
         "migration_block_slot_index.go",

beacon-chain/db/kv/backup.go

@@ -8,7 +8,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -43,7 +42,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_beacondb_at_slot_%07d.backup", head.Block.Slot))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database.")
+	log.WithField("backup", backupPath).Info("Writing backup database.")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -55,13 +54,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {

beacon-chain/db/kv/log.go

@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

beacon-chain/db/kv/state.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/state"
 	pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )

beacon-chain/db/log.go

@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

beacon-chain/db/restore.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +29,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -41,6 +40,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }

beacon-chain/flags/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
         "base.go",
         "config.go",
         "interop.go",
+        "log.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/flags",
     visibility = ["//beacon-chain:__subpackages__"],

beacon-chain/flags/config.go

@@ -2,7 +2,6 @@ package flags
 
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
-	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

beacon-chain/flags/log.go

@@ -0,0 +1,5 @@
+package flags
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "flags")

beacon-chain/gateway/server/BUILD.bazel

@@ -6,7 +6,10 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 
 go_library(
     name = "go_default_library",
-    srcs = ["main.go"],
+    srcs = [
+        "log.go",
+        "main.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/gateway/server",
     visibility = ["//visibility:private"],
     deps = [

beacon-chain/gateway/server/log.go

@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.New()

beacon-chain/gateway/server/main.go

@@ -29,8 +29,6 @@ func init() {
 	logrus.SetFormatter(joonix.NewFormatter())
 }
 
-var log = logrus.New()
-
 func main() {
 	flag.Parse()
 	if *debug {

beacon-chain/log.go

@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "main")

beacon-chain/main.go

@@ -113,7 +113,6 @@ func init() {
 }
 
 func main() {
-	log := logrus.WithField("prefix", "main")
 	app := cli.App{}
 	app.Name = "beacon-chain"
 	app.Usage = "this is a beacon chain implementation for Ethereum 2.0"

beacon-chain/node/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "helper.go",
+        "log.go",
         "node.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/node",

beacon-chain/node/log.go

@@ -0,0 +1,5 @@
+package node
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "node")

beacon-chain/node/node.go

@@ -52,8 +52,6 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-var log = logrus.WithField("prefix", "node")
-
 const testSkipPowFlag = "test-skip-pow"
 
 // BeaconNode defines a struct that handles the services running a random beacon chain

beacon-chain/p2p/info.go

@@ -9,7 +9,6 @@ import (
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/sirupsen/logrus"
 )
 
 // InfoHandler is a handler to serve /p2p page in metrics.
@@ -26,7 +25,7 @@ self=%s
 		len(s.host.Network().Peers()),
 		formatPeers(s.host), // Must be last. Writes one entry per row.
 	); err != nil {
-		logrus.WithError(err).Error("Failed to render p2p info page")
+		log.WithError(err).Error("Failed to render p2p info page")
 		return
 	}
 

beacon-chain/powchain/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
         "block_cache.go",
         "block_reader.go",
         "deposit.go",
+        "log.go",
         "log_processing.go",
         "service.go",
     ],

beacon-chain/powchain/log.go

@@ -0,0 +1,5 @@
+package powchain
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "powchain")

beacon-chain/powchain/log_processing.go

@@ -61,12 +61,12 @@ func (s *Service) ProcessETH1Block(ctx context.Context, blkNum *big.Int) error {
 	if err != nil {
 		return err
 	}
-	for _, log := range logs {
+	for _, filterLog := range logs {
 		// ignore logs that are not of the required block number
-		if log.BlockNumber != blkNum.Uint64() {
+		if filterLog.BlockNumber != blkNum.Uint64() {
 			continue
 		}
-		if err := s.ProcessLog(ctx, log); err != nil {
+		if err := s.ProcessLog(ctx, filterLog); err != nil {
 			return errors.Wrap(err, "could not process log")
 		}
 	}
@@ -331,16 +331,16 @@ func (s *Service) processPastLogs(ctx context.Context) error {
 			}
 		}
 
-		for _, log := range logs {
-			if log.BlockNumber > currentBlockNum {
-				if err := s.checkHeaderRange(currentBlockNum, log.BlockNumber-1, headersMap, requestHeaders); err != nil {
+		for _, filterLog := range logs {
+			if filterLog.BlockNumber > currentBlockNum {
+				if err := s.checkHeaderRange(currentBlockNum, filterLog.BlockNumber-1, headersMap, requestHeaders); err != nil {
 					return err
 				}
 				// set new block number after checking for chainstart for previous block.
 				s.latestEth1Data.LastRequestedBlock = currentBlockNum
-				currentBlockNum = log.BlockNumber
+				currentBlockNum = filterLog.BlockNumber
 			}
-			if err := s.ProcessLog(ctx, log); err != nil {
+			if err := s.ProcessLog(ctx, filterLog); err != nil {
 				return err
 			}
 		}

beacon-chain/powchain/service.go

@@ -40,8 +40,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var log = logrus.WithField("prefix", "powchain")
-
 var (
 	validDepositsCount = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "powchain_valid_deposits_received",

beacon-chain/rpc/BUILD.bazel

@@ -3,7 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["service.go"],
+    srcs = [
+        "log.go",
+        "service.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/rpc",
     visibility = ["//beacon-chain:__subpackages__"],
     deps = [

beacon-chain/rpc/beacon/BUILD.bazel

@@ -9,6 +9,7 @@ go_library(
         "blocks.go",
         "committees.go",
         "config.go",
+        "log.go",
         "server.go",
         "slashings.go",
         "validators.go",

beacon-chain/rpc/beacon/attestations.go

@@ -19,13 +19,10 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/pagination"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/shared/slotutil"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-var log = logrus.WithField("prefix", "rpc")
-
 // sortableAttestations implements the Sort interface to sort attestations
 // by slot as the canonical sorting attribute.
 type sortableAttestations []*ethpb.Attestation

beacon-chain/rpc/beacon/log.go

@@ -0,0 +1,5 @@
+package beacon
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")

beacon-chain/rpc/beaconv1/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "blocks.go",
         "config.go",
+        "log.go",
         "pool.go",
         "server.go",
         "state.go",

beacon-chain/rpc/beaconv1/blocks.go

@@ -14,7 +14,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
 	"github.com/prysmaticlabs/prysm/proto/migration"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

beacon-chain/rpc/beaconv1/log.go

@@ -0,0 +1,5 @@
+package beaconv1
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc/beaconv1")

beacon-chain/rpc/log.go

@@ -0,0 +1,5 @@
+package rpc
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")

beacon-chain/rpc/service.go

@@ -52,12 +52,6 @@ import (
 
 const attestationBufferSize = 100
 
-var log logrus.FieldLogger
-
-func init() {
-	log = logrus.WithField("prefix", "rpc")
-}
-
 // Service defining an RPC server for a beacon node.
 type Service struct {
 	ctx                     context.Context

beacon-chain/rpc/validator/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "assignments.go",
         "attester.go",
         "exit.go",
+        "log.go",
         "proposer.go",
         "proposer_utils.go",
         "server.go",

beacon-chain/rpc/validator/log.go

@@ -0,0 +1,5 @@
+package validator
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc/validator")

beacon-chain/rpc/validator/server.go

@@ -29,17 +29,10 @@ import (
 	pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-var log logrus.FieldLogger
-
-func init() {
-	log = logrus.WithField("prefix", "rpc/validator")
-}
-
 // Server defines a server implementation of the gRPC Validator service,
 // providing RPC endpoints for obtaining validator assignments per epoch, the slots
 // and committees in which particular validators need to perform their responsibilities,

slasher/BUILD.bazel

@@ -7,6 +7,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],

slasher/beaconclient/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "chain_data.go",
         "historical_data_retrieval.go",
+        "log.go",
         "metrics.go",
         "receivers.go",
         "service.go",

slasher/beaconclient/log.go

@@ -0,0 +1,5 @@
+package beaconclient
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "beaconclient")

slasher/beaconclient/service.go

@@ -18,14 +18,11 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/grpcutils"
 	"github.com/prysmaticlabs/prysm/slasher/cache"
 	"github.com/prysmaticlabs/prysm/slasher/db"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
 
-var log = logrus.WithField("prefix", "beaconclient")
-
 // Notifier defines a struct which exposes event feeds regarding beacon blocks,
 // attestations, and more information received from a beacon node.
 type Notifier interface {

slasher/cache/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
         "doc.go",
         "flat_span_cache.go",
         "highest_attestation_cache.go",
+        "log.go",
         "span_cache.go",
         "validators_cache.go",
     ],

slasher/cache/flat_span_cache.go

@@ -3,7 +3,6 @@ package cache
 import (
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 )
 
 // EpochFlatSpansCache is used to store the spans needed on a per-epoch basis for slashing detection.

slasher/cache/highest_attestation_cache.go

@@ -3,7 +3,6 @@ package cache
 import (
 	lru "github.com/hashicorp/golang-lru"
 	slashpb "github.com/prysmaticlabs/prysm/proto/slashing"
-	log "github.com/sirupsen/logrus"
 )
 
 var (

slasher/cache/log.go

@@ -0,0 +1,5 @@
+package cache
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "cache")

slasher/cache/span_cache.go

@@ -5,7 +5,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 )
 
 var (

slasher/db/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
         "alias.go",
         "cmd.go",
         "db.go",
+        "log.go",
         "restore.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/slasher/db",

slasher/db/cmd.go

@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},

slasher/db/kv/BUILD.bazel

@@ -11,6 +11,7 @@ go_library(
         "highest_attestation.go",
         "indexed_attestations.go",
         "kv.go",
+        "log.go",
         "proposer_slashings.go",
         "schema.go",
         "spanner_new.go",

slasher/db/kv/backup.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -36,7 +35,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_slasherdb_%d.backup", time.Now().Unix()))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database")
+	log.WithField("backup", backupPath).Info("Writing backup database")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -48,13 +47,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {

slasher/db/kv/block_header.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -62,7 +61,7 @@ func (db *Store) HasBlockHeader(ctx context.Context, slot, validatorID uint64) b
 		hasBlockHeader = false
 		return nil
 	}); err != nil {
-		logrus.WithError(err).Error("Failed to lookup block header from DB")
+		log.WithError(err).Error("Failed to lookup block header from DB")
 	}
 
 	return hasBlockHeader

slasher/db/kv/highest_attestation.go

@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 	slashpb "github.com/prysmaticlabs/prysm/proto/slashing"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )

slasher/db/kv/log.go

@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

slasher/db/kv/spanner_new.go

@@ -9,7 +9,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/prysmaticlabs/prysm/slasher/detection/attestations/types"
-	log "github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )

slasher/db/log.go

@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

slasher/db/restore.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/slasher/db/kv"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +29,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -41,6 +40,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }

slasher/detection/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "detect.go",
         "listeners.go",
+        "log.go",
         "metrics.go",
         "service.go",
     ],

slasher/detection/log.go

@@ -0,0 +1,5 @@
+package detection
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "detection")

slasher/detection/service.go

@@ -16,8 +16,6 @@ import (
 	"go.opencensus.io/trace"
 )
 
-var log = logrus.WithField("prefix", "detection")
-
 // Status detection statuses type.
 type Status int
 

slasher/log.go

@@ -0,0 +1,5 @@
+package main
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "main")

slasher/main.go

@@ -24,8 +24,6 @@ import (
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 )
 
-var log = logrus.WithField("prefix", "main")
-
 func startSlasher(cliCtx *cli.Context) error {
 	// verify if ToS accepted
 	if err := tos.VerifyTosAcceptedOrPrompt(cliCtx); err != nil {

slasher/node/BUILD.bazel

@@ -3,7 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["node.go"],
+    srcs = [
+        "log.go",
+        "node.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/slasher/node",
     visibility = ["//slasher:__subpackages__"],
     deps = [

slasher/node/log.go

@@ -0,0 +1,5 @@
+package node
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "node")

slasher/node/node.go

@@ -34,8 +34,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var log = logrus.WithField("prefix", "node")
-
 // SlasherNode defines a struct that handles the services running a slashing detector
 // for eth2. It handles the lifecycle of the entire system and registers
 // services to a service registry.

slasher/rpc/BUILD.bazel

@@ -4,6 +4,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "server.go",
         "service.go",
     ],

slasher/rpc/log.go

@@ -0,0 +1,5 @@
+package rpc
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "rpc")

slasher/rpc/service.go

@@ -17,7 +17,6 @@ import (
 	"github.com/prysmaticlabs/prysm/slasher/beaconclient"
 	"github.com/prysmaticlabs/prysm/slasher/db"
 	"github.com/prysmaticlabs/prysm/slasher/detection"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -52,8 +51,6 @@ type Config struct {
 	BeaconClient *beaconclient.Service
 }
 
-var log = logrus.WithField("prefix", "rpc")
-
 // NewService instantiates a new RPC service instance that will
 // be registered into a running beacon node.
 func NewService(ctx context.Context, cfg *Config) *Service {

validator/BUILD.bazel

@@ -8,6 +8,7 @@ load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
 go_library(
     name = "go_default_library",
     srcs = [
+        "log.go",
         "main.go",
         "usage.go",
     ],

validator/accounts/BUILD.bazel

@@ -15,6 +15,7 @@ go_library(
         "cmd_accounts.go",
         "cmd_wallet.go",
         "doc.go",
+        "log.go",
         "wallet_create.go",
         "wallet_edit.go",
         "wallet_recover.go",

validator/accounts/accounts.go

@@ -3,11 +3,8 @@ package accounts
 import (
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
-	"github.com/sirupsen/logrus"
 )
 
-var log = logrus.WithField("prefix", "accounts")
-
 var msgKeymanagerNotSupported = "keymanager kind not supported: %s"
 
 // AccountsConfig specifies parameters to run to delete, enable, disable accounts.

validator/accounts/log.go

@@ -0,0 +1,5 @@
+package accounts
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "accounts")

validator/accounts/prompt/BUILD.bazel

@@ -2,7 +2,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["prompt.go"],
+    srcs = [
+        "log.go",
+        "prompt.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/accounts/prompt",
     visibility = ["//validator:__subpackages__"],
     deps = [

validator/accounts/prompt/log.go

@@ -0,0 +1,5 @@
+package prompt
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "prompt")

validator/accounts/prompt/prompt.go

@@ -12,7 +12,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/validator/flags"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/remote"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -33,10 +32,7 @@ const (
 	SelectAccountsEnablePromptText = "Select the account(s) you would like to enable"
 )
 
-var (
-	au  = aurora.NewAurora(true)
-	log = logrus.WithField("prefix", "prompt")
-)
+var au = aurora.NewAurora(true)
 
 // InputDirectory from the cli.
 func InputDirectory(cliCtx *cli.Context, promptText string, flag *cli.StringFlag) (string, error) {

validator/accounts/wallet/BUILD.bazel

@@ -3,7 +3,10 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["wallet.go"],
+    srcs = [
+        "log.go",
+        "wallet.go",
+    ],
     importpath = "github.com/prysmaticlabs/prysm/validator/accounts/wallet",
     visibility = ["//validator:__subpackages__"],
     deps = [

validator/accounts/wallet/log.go

@@ -0,0 +1,5 @@
+package wallet
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "wallet")

validator/accounts/wallet/wallet.go

@@ -22,8 +22,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var log = logrus.WithField("prefix", "wallet")
-
 const (
 	// KeymanagerConfigFileName for the keymanager used by the wallet: imported, derived, or remote.
 	KeymanagerConfigFileName = "keymanageropts.json"

validator/client/log.go

@@ -12,6 +12,8 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+var log = logrus.WithField("prefix", "validator")
+
 type attSubmitted struct {
 	data              *ethpb.AttestationData
 	attesterIndices   []uint64

validator/client/service.go

@@ -25,15 +25,12 @@ import (
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
 	slashingprotection "github.com/prysmaticlabs/prysm/validator/slashing-protection"
-	"github.com/sirupsen/logrus"
 	"go.opencensus.io/plugin/ocgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/metadata"
 )
 
-var log = logrus.WithField("prefix", "validator")
-
 // SyncChecker is able to determine if a beacon node is currently
 // going through chain synchronization.
 type SyncChecker interface {

validator/db/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     srcs = [
         "alias.go",
         "cmd.go",
+        "log.go",
         "restore.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/db",

validator/db/cmd.go

@@ -3,7 +3,6 @@ package db
 import (
 	"github.com/prysmaticlabs/prysm/shared/cmd"
 	"github.com/prysmaticlabs/prysm/shared/tos"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,7 +22,7 @@ var DatabaseCommands = &cli.Command{
 			Before: tos.VerifyTosAcceptedOrPrompt,
 			Action: func(cliCtx *cli.Context) error {
 				if err := restore(cliCtx); err != nil {
-					logrus.Fatalf("Could not restore database: %v", err)
+					log.Fatalf("Could not restore database: %v", err)
 				}
 				return nil
 			},

validator/db/kv/BUILD.bazel

@@ -10,6 +10,7 @@ go_library(
         "db.go",
         "genesis.go",
         "historical_attestations.go",
+        "log.go",
         "migration.go",
         "proposal_history_v2.go",
         "prune_attester_protection.go",

validator/db/kv/backup.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 	"go.opencensus.io/trace"
 )
@@ -36,7 +35,7 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 		return err
 	}
 	backupPath := path.Join(backupsDir, fmt.Sprintf("prysm_validatordb_%d.backup", time.Now().Unix()))
-	logrus.WithField("prefix", "db").WithField("backup", backupPath).Info("Writing backup database")
+	log.WithField("backup", backupPath).Info("Writing backup database")
 
 	copyDB, err := bolt.Open(
 		backupPath,
@@ -48,13 +47,13 @@ func (s *Store) Backup(ctx context.Context, outputDir string) error {
 	}
 	defer func() {
 		if err := copyDB.Close(); err != nil {
-			logrus.WithError(err).Error("Failed to close backup database")
+			log.WithError(err).Error("Failed to close backup database")
 		}
 	}()
 
 	return s.db.View(func(tx *bolt.Tx) error {
 		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			logrus.Debugf("Copying bucket %s\n", name)
+			log.Debugf("Copying bucket %s\n", name)
 			return copyDB.Update(func(tx2 *bolt.Tx) error {
 				b2, err := tx2.CreateBucketIfNotExists(name)
 				if err != nil {

validator/db/kv/historical_attestations.go

@@ -7,7 +7,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/params"
-	log "github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 )
 

validator/db/kv/log.go

@@ -0,0 +1,5 @@
+package kv
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

validator/db/log.go

@@ -0,0 +1,5 @@
+package db
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "db")

validator/db/restore.go

@@ -10,7 +10,6 @@ import (
 	"github.com/prysmaticlabs/prysm/shared/fileutil"
 	"github.com/prysmaticlabs/prysm/shared/promptutil"
 	"github.com/prysmaticlabs/prysm/validator/db/kv"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -29,7 +28,7 @@ func restore(cliCtx *cli.Context) error {
 			return errors.Wrap(err, "could not validate choice")
 		}
 		if strings.EqualFold(resp, "n") {
-			logrus.Info("Restore aborted")
+			log.Info("Restore aborted")
 			return nil
 		}
 	}
@@ -40,6 +39,6 @@ func restore(cliCtx *cli.Context) error {
 		return err
 	}
 
-	logrus.Info("Restore completed successfully")
+	log.Info("Restore completed successfully")
 	return nil
 }

validator/keymanager/derived/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "keymanager.go",
+        "log.go",
         "mnemonic.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/keymanager/derived",

validator/keymanager/derived/keymanager.go

@@ -10,14 +10,9 @@ import (
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
 	"github.com/prysmaticlabs/prysm/validator/keymanager"
 	"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
-	"github.com/sirupsen/logrus"
 	util "github.com/wealdtech/go-eth2-util"
 )
 
-var (
-	log = logrus.WithField("prefix", "derived-keymanager")
-)
-
 const (
 	// DerivationPathFormat describes the structure of how keys are derived from a master key.
 	DerivationPathFormat = "m / purpose / coin_type / account_index / withdrawal_key / validating_key"

validator/keymanager/derived/log.go

@@ -0,0 +1,5 @@
+package derived
+
+import "github.com/sirupsen/logrus"
+
+var log = logrus.WithField("prefix", "derived-keymanager")