AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 05:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move blockchain service metrics package (#4959)

Browse Source 
* Moved metrics package
This commit is contained in:
terence tsao
2020-02-27 11:38:22 -08:00
committed by GitHub
parent 14b3181e67
commit 2fef9d3e5e
6 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon-chain/blockchain/BUILD.bazel
View File

@@ -8,6 +8,7 @@ go_library(
"info.go",
"init_sync_process_block.go",
"log.go",
"metrics.go",
"process_attestation.go",
"process_attestation_helpers.go",
"process_block.go",
@@ -19,7 +20,6 @@ go_library(
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/blockchain",
visibility = ["//beacon-chain:__subpackages__"],
deps = [
"//beacon-chain/blockchain/metrics:go_default_library",
"//beacon-chain/cache:go_default_library",
"//beacon-chain/cache/depositcache:go_default_library",
"//beacon-chain/core/blocks:go_default_library",
@@ -49,6 +49,8 @@ go_library(
"//shared/traceutil:go_default_library",
"@com_github_emicklei_dot//:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
"@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
"@com_github_prysmaticlabs_go_ssz//:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",

13
beacon-chain/blockchain/metrics/metrics.go → beacon-chain/blockchain/metrics.go
View File

@@ -1,4 +1,4 @@
package metrics
package blockchain
import (
"github.com/prometheus/client_golang/prometheus"
@@ -19,8 +19,7 @@ var (
Name: "beacon_head_slot",
Help: "Slot of the head block of the beacon chain",
})
// CompetingBlks is the number of the competing blocks happened over time.
CompetingBlks = promauto.NewCounter(prometheus.CounterOpts{
competingBlks = promauto.NewCounter(prometheus.CounterOpts{
Name: "competing_blocks",
Help: "The # of blocks received and processed from a competing chain",
})
@@ -82,8 +81,8 @@ var (
})
)
// ReportSlotMetrics reports slot related metrics.
func ReportSlotMetrics(currentSlot uint64, headSlot uint64, finalizedCheckpoint *ethpb.Checkpoint) {
// reportSlotMetrics reports slot related metrics.
func reportSlotMetrics(currentSlot uint64, headSlot uint64, finalizedCheckpoint *ethpb.Checkpoint) {
beaconSlot.Set(float64(currentSlot))
beaconHeadSlot.Set(float64(headSlot))
if finalizedCheckpoint != nil {
@@ -92,8 +91,8 @@ func ReportSlotMetrics(currentSlot uint64, headSlot uint64, finalizedCheckpoint
}
}
// ReportEpochMetrics reports epoch related metrics.
func ReportEpochMetrics(state *stateTrie.BeaconState) {
// reportEpochMetrics reports epoch related metrics.
func reportEpochMetrics(state *stateTrie.BeaconState) {
currentEpoch := state.Slot() / params.BeaconConfig().SlotsPerEpoch
// Validator instances

17
beacon-chain/blockchain/metrics/BUILD.bazel
View File

@@ -1,17 +0,0 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["metrics.go"],
importpath = "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/metrics",
visibility = ["//beacon-chain:__subpackages__"],
deps = [
"//beacon-chain/core/epoch/precompute:go_default_library",
"//beacon-chain/state:go_default_library",
"//shared/bytesutil:go_default_library",
"//shared/params:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
"@com_github_prysmaticlabs_ethereumapis//eth/v1alpha1:go_default_library",
],
)

5
beacon-chain/blockchain/process_block.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/pkg/errors"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/go-ssz"
"github.com/prysmaticlabs/prysm/beacon-chain/blockchain/metrics"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/core/state"
"github.com/prysmaticlabs/prysm/beacon-chain/flags"
@@ -135,7 +134,7 @@ func (s *Service) onBlock(ctx context.Context, signed *ethpb.SignedBeaconBlock)
// Epoch boundary bookkeeping such as logging epoch summaries.
if postState.Slot() >= s.nextEpochBoundarySlot {
logEpochData(postState)
metrics.ReportEpochMetrics(postState)
reportEpochMetrics(postState)
// Update committees cache at epoch boundary slot.
if err := helpers.UpdateCommitteeCache(postState, helpers.CurrentEpoch(postState)); err != nil {
@@ -269,7 +268,7 @@ func (s *Service) onBlockInitialSyncStateTransition(ctx context.Context, signed
// Epoch boundary bookkeeping such as logging epoch summaries.
if postState.Slot() >= s.nextEpochBoundarySlot {
metrics.ReportEpochMetrics(postState)
reportEpochMetrics(postState)
s.nextEpochBoundarySlot = helpers.StartSlot(helpers.NextEpoch(postState))
// Update committees cache at epoch boundary slot.

7
beacon-chain/blockchain/receive_block.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/pkg/errors"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/go-ssz"
"github.com/prysmaticlabs/prysm/beacon-chain/blockchain/metrics"
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute"
"github.com/prysmaticlabs/prysm/beacon-chain/core/feed"
statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
@@ -115,7 +114,7 @@ func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.SignedB
})
// Reports on block and fork choice metrics.
metrics.ReportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
reportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
// Log state transition data.
logStateTransitionData(blockCopy.Block)
@@ -165,7 +164,7 @@ func (s *Service) ReceiveBlockNoPubsubForkchoice(ctx context.Context, block *eth
})
// Reports on block and fork choice metrics.
metrics.ReportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
reportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
// Log state transition data.
logStateTransitionData(blockCopy.Block)
@@ -221,7 +220,7 @@ func (s *Service) ReceiveBlockNoVerify(ctx context.Context, block *ethpb.SignedB
})
// Reports on blockCopy and fork choice metrics.
metrics.ReportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
reportSlotMetrics(blockCopy.Block.Slot, s.headSlot(), s.finalizedCheckpt)
// Log state transition data.
log.WithFields(logrus.Fields{

4
tools/cluster-pk-manager/server/keyChecker.go
View File

@@ -7,14 +7,14 @@ import (
var keyInterval = 3 * time.Minute
type keyChecker struct {
db *db
db *db
}
func newkeyChecker(db *db, beaconRPCAddr string) *keyChecker {
log.Warn("Key checker temporarily disabled during refactor.")
return &keyChecker{
db: db,
db: db,
}
}