ETH2 APIs: Add spans and remove unused Server fields (#8916)

* Add spans and remove unused Server fields * Remove more
2026-01-09 15:37:56 -05:00 · 2021-05-20 15:56:53 -04:00
parent 213369f5d0
commit f4d6e91e72
8 changed files with 47 additions and 67 deletions
--- a/beacon-chain/rpc/beaconv1/BUILD.bazel
+++ b/beacon-chain/rpc/beaconv1/BUILD.bazel
@@ -16,12 +16,9 @@ go_library(
    visibility = ["//beacon-chain:__subpackages__"],
    deps = [
        "//beacon-chain/blockchain:go_default_library",
-        "//beacon-chain/cache/depositcache:go_default_library",
        "//beacon-chain/core/blocks:go_default_library",
        "//beacon-chain/core/feed:go_default_library",
        "//beacon-chain/core/feed/block:go_default_library",
-        "//beacon-chain/core/feed/operation:go_default_library",
-        "//beacon-chain/core/feed/state:go_default_library",
        "//beacon-chain/core/helpers:go_default_library",
        "//beacon-chain/db:go_default_library",
        "//beacon-chain/db/filters:go_default_library",
@@ -29,12 +26,9 @@ go_library(
        "//beacon-chain/operations/slashings:go_default_library",
        "//beacon-chain/operations/voluntaryexits:go_default_library",
        "//beacon-chain/p2p:go_default_library",
-        "//beacon-chain/powchain:go_default_library",
        "//beacon-chain/rpc/statefetcher:go_default_library",
        "//beacon-chain/state/interface:go_default_library",
        "//beacon-chain/state/stategen:go_default_library",
-        "//beacon-chain/sync:go_default_library",
-        "//proto/beacon/p2p/v1:go_default_library",
        "//proto/migration:go_default_library",
        "//shared/bytesutil:go_default_library",
        "//shared/featureconfig:go_default_library",
@@ -74,7 +68,6 @@ go_test(
        "//beacon-chain/operations/slashings:go_default_library",
        "//beacon-chain/operations/voluntaryexits:go_default_library",
        "//beacon-chain/p2p/testing:go_default_library",
-        "//beacon-chain/powchain/testing:go_default_library",
        "//beacon-chain/rpc/statefetcher:go_default_library",
        "//beacon-chain/state/interface:go_default_library",
        "//beacon-chain/state/stategen:go_default_library",
--- a/beacon-chain/rpc/beaconv1/blocks.go
+++ b/beacon-chain/rpc/beaconv1/blocks.go
@@ -14,6 +14,7 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
 	"github.com/prysmaticlabs/prysm/proto/migration"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
+	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
@@ -21,6 +22,9 @@ import (

 // GetBlockHeader retrieves block header for given block id.
 func (bs *Server) GetBlockHeader(ctx context.Context, req *ethpb.BlockRequest) (*ethpb.BlockHeaderResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.GetBlockHeader")
+	defer span.End()
+
 	blk, err := bs.blockFromBlockID(ctx, req.BlockId)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Could not get block from block ID: %v", err)
@@ -61,6 +65,9 @@ func (bs *Server) GetBlockHeader(ctx context.Context, req *ethpb.BlockRequest) (

 // ListBlockHeaders retrieves block headers matching given query. By default it will fetch current head slot blocks.
 func (bs *Server) ListBlockHeaders(ctx context.Context, req *ethpb.BlockHeadersRequest) (*ethpb.BlockHeadersResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.ListBlockHeaders")
+	defer span.End()
+
 	var err error
 	var blks []*ethpb_alpha.SignedBeaconBlock
 	var blkRoots [][32]byte
@@ -120,8 +127,10 @@ func (bs *Server) ListBlockHeaders(ctx context.Context, req *ethpb.BlockHeadersR
 // new block into its state, and therefore validate the block internally, however blocks which fail the validation are
 // still broadcast but a different status code is returned (202).
 func (bs *Server) SubmitBlock(ctx context.Context, req *ethpb.BeaconBlockContainer) (*emptypb.Empty, error) {
-	blk := req.Message
+	ctx, span := trace.StartSpan(ctx, "beaconv1.SubmitBlock")
+	defer span.End()

+	blk := req.Message
 	v1alpha1Block, err := migration.V1ToV1Alpha1Block(&ethpb.SignedBeaconBlock{Block: blk, Signature: req.Signature})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Could not convert block to v1")
@@ -156,6 +165,9 @@ func (bs *Server) SubmitBlock(ctx context.Context, req *ethpb.BeaconBlockContain

 // GetBlock retrieves block details for given block id.
 func (bs *Server) GetBlock(ctx context.Context, req *ethpb.BlockRequest) (*ethpb.BlockResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.GetBlock")
+	defer span.End()
+
 	blk, err := bs.blockFromBlockID(ctx, req.BlockId)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Could not get block from block ID: %v", err)
@@ -179,6 +191,9 @@ func (bs *Server) GetBlock(ctx context.Context, req *ethpb.BlockRequest) (*ethpb

 // GetBlockRoot retrieves hashTreeRoot of BeaconBlock/BeaconBlockHeader.
 func (bs *Server) GetBlockRoot(ctx context.Context, req *ethpb.BlockRequest) (*ethpb.BlockRootResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.GetBlockRoot")
+	defer span.End()
+
 	var root []byte
 	var err error
 	switch string(req.BlockId) {
@@ -256,6 +271,9 @@ func (bs *Server) GetBlockRoot(ctx context.Context, req *ethpb.BlockRequest) (*e

 // ListBlockAttestations retrieves attestation included in requested block.
 func (bs *Server) ListBlockAttestations(ctx context.Context, req *ethpb.BlockRequest) (*ethpb.BlockAttestationsResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.ListBlockAttestations")
+	defer span.End()
+
 	blk, err := bs.blockFromBlockID(ctx, req.BlockId)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Could not get block from block ID: %v", err)
--- a/beacon-chain/rpc/beaconv1/blocks_test.go
+++ b/beacon-chain/rpc/beaconv1/blocks_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/prysmaticlabs/prysm/beacon-chain/db"
 	dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing"
 	mockp2p "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
-	mockPOW "github.com/prysmaticlabs/prysm/beacon-chain/powchain/testing"
 	p2ppb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 	"github.com/prysmaticlabs/prysm/proto/migration"
 	"github.com/prysmaticlabs/prysm/shared/bytesutil"
@@ -258,12 +257,11 @@ func TestServer_ProposeBlock_OK(t *testing.T) {

 	c := &mock.ChainService{Root: bsRoot[:], State: beaconState}
 	beaconChainServer := &Server{
-		BeaconDB:          beaconDB,
-		ChainStartFetcher: &mockPOW.POWChain{},
-		BlockReceiver:     c,
-		ChainInfoFetcher:  c,
-		BlockNotifier:     c.BlockNotifier(),
-		Broadcaster:       mockp2p.NewTestP2P(t),
+		BeaconDB:         beaconDB,
+		BlockReceiver:    c,
+		ChainInfoFetcher: c,
+		BlockNotifier:    c.BlockNotifier(),
+		Broadcaster:      mockp2p.NewTestP2P(t),
 	}
 	req := testutil.NewBeaconBlock()
 	req.Block.Slot = 5
--- a/beacon-chain/rpc/beaconv1/server.go
+++ b/beacon-chain/rpc/beaconv1/server.go
@@ -4,48 +4,30 @@
 package beaconv1

 import (
-	"context"
-	"time"
-
 	"github.com/prysmaticlabs/prysm/beacon-chain/blockchain"
-	"github.com/prysmaticlabs/prysm/beacon-chain/cache/depositcache"
 	blockfeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/block"
-	"github.com/prysmaticlabs/prysm/beacon-chain/core/feed/operation"
-	statefeed "github.com/prysmaticlabs/prysm/beacon-chain/core/feed/state"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db"
 	"github.com/prysmaticlabs/prysm/beacon-chain/operations/attestations"
 	"github.com/prysmaticlabs/prysm/beacon-chain/operations/slashings"
 	"github.com/prysmaticlabs/prysm/beacon-chain/operations/voluntaryexits"
 	"github.com/prysmaticlabs/prysm/beacon-chain/p2p"
-	"github.com/prysmaticlabs/prysm/beacon-chain/powchain"
 	"github.com/prysmaticlabs/prysm/beacon-chain/rpc/statefetcher"
 	"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
-	"github.com/prysmaticlabs/prysm/beacon-chain/sync"
-	pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
 )

 // Server defines a server implementation of the gRPC Beacon Chain service,
 // providing RPC endpoints to access data relevant to the Ethereum 2.0 phase 0
 // beacon chain.
 type Server struct {
-	BeaconDB            db.ReadOnlyDatabase
-	Ctx                 context.Context
-	ChainStartFetcher   powchain.ChainStartFetcher
-	ChainInfoFetcher    blockchain.ChainInfoFetcher
-	DepositFetcher      depositcache.DepositFetcher
-	BlockFetcher        powchain.POWBlockFetcher
-	GenesisTimeFetcher  blockchain.TimeFetcher
-	BlockReceiver       blockchain.BlockReceiver
-	StateNotifier       statefeed.Notifier
-	BlockNotifier       blockfeed.Notifier
-	AttestationNotifier operation.Notifier
-	Broadcaster         p2p.Broadcaster
-	AttestationsPool    attestations.Pool
-	SlashingsPool       slashings.PoolManager
-	VoluntaryExitsPool  voluntaryexits.PoolManager
-	CanonicalStateChan  chan *pbp2p.BeaconState
-	ChainStartChan      chan time.Time
-	StateGenService     stategen.StateManager
-	SyncChecker         sync.Checker
-	StateFetcher        statefetcher.StateProvider
+	BeaconDB           db.ReadOnlyDatabase
+	ChainInfoFetcher   blockchain.ChainInfoFetcher
+	GenesisTimeFetcher blockchain.TimeFetcher
+	BlockReceiver      blockchain.BlockReceiver
+	BlockNotifier      blockfeed.Notifier
+	Broadcaster        p2p.Broadcaster
+	AttestationsPool   attestations.Pool
+	SlashingsPool      slashings.PoolManager
+	VoluntaryExitsPool voluntaryexits.PoolManager
+	StateGenService    stategen.StateManager
+	StateFetcher       statefetcher.StateProvider
 }
--- a/beacon-chain/rpc/debugv1/debug.go
+++ b/beacon-chain/rpc/debugv1/debug.go
@@ -12,6 +12,9 @@ import (

 // GetBeaconState returns the full beacon state for a given state id.
 func (ds *Server) GetBeaconState(ctx context.Context, req *ethpb.StateRequest) (*ethpb.BeaconStateResponse, error) {
+	ctx, span := trace.StartSpan(ctx, "beaconv1.GetBeaconState")
+	defer span.End()
+
 	state, err := ds.StateFetcher.State(ctx, req.StateId)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "could not get state: %v", err)
--- a/beacon-chain/rpc/debugv1/server.go
+++ b/beacon-chain/rpc/debugv1/server.go
@@ -4,8 +4,6 @@
 package debugv1

 import (
-	"context"
-
 	"github.com/prysmaticlabs/prysm/beacon-chain/blockchain"
 	"github.com/prysmaticlabs/prysm/beacon-chain/db"
 	"github.com/prysmaticlabs/prysm/beacon-chain/rpc/statefetcher"
@@ -15,7 +13,6 @@ import (
 // providing RPC endpoints to access data relevant to the Ethereum 2.0 phase 0
 // beacon chain.
 type Server struct {
-	Ctx          context.Context
 	BeaconDB     db.ReadOnlyDatabase
 	HeadFetcher  blockchain.HeadFetcher
 	StateFetcher statefetcher.Fetcher
--- a/beacon-chain/rpc/nodev1/server.go
+++ b/beacon-chain/rpc/nodev1/server.go
@@ -22,6 +22,5 @@ type Server struct {
 	PeerManager        p2p.PeerManager
 	MetadataProvider   p2p.MetadataProvider
 	GenesisTimeFetcher blockchain.TimeFetcher
-	GenesisFetcher     blockchain.GenesisFetcher
 	HeadFetcher        blockchain.HeadFetcher
 }
--- a/beacon-chain/rpc/service.go
+++ b/beacon-chain/rpc/service.go
@@ -211,7 +211,6 @@ func (s *Service) Start() {
 		GenesisTimeFetcher: s.cfg.GenesisTimeFetcher,
 		PeersFetcher:       s.cfg.PeersFetcher,
 		PeerManager:        s.cfg.PeerManager,
-		GenesisFetcher:     s.cfg.GenesisFetcher,
 		MetadataProvider:   s.cfg.MetadataProvider,
 		HeadFetcher:        s.cfg.HeadFetcher,
 	}
@@ -239,23 +238,15 @@ func (s *Service) Start() {
 		CollectedAttestationsBuffer: make(chan []*ethpb.Attestation, attestationBufferSize),
 	}
 	beaconChainServerV1 := &beaconv1.Server{
-		Ctx:                 s.ctx,
-		BeaconDB:            s.cfg.BeaconDB,
-		AttestationsPool:    s.cfg.AttestationsPool,
-		SlashingsPool:       s.cfg.SlashingsPool,
-		ChainInfoFetcher:    s.cfg.ChainInfoFetcher,
-		ChainStartFetcher:   s.cfg.ChainStartFetcher,
-		DepositFetcher:      s.cfg.DepositFetcher,
-		BlockFetcher:        s.cfg.POWChainService,
-		CanonicalStateChan:  s.canonicalStateChan,
-		GenesisTimeFetcher:  s.cfg.GenesisTimeFetcher,
-		StateNotifier:       s.cfg.StateNotifier,
-		BlockNotifier:       s.cfg.BlockNotifier,
-		AttestationNotifier: s.cfg.OperationNotifier,
-		Broadcaster:         s.cfg.Broadcaster,
-		BlockReceiver:       s.cfg.BlockReceiver,
-		StateGenService:     s.cfg.StateGen,
-		SyncChecker:         s.cfg.SyncService,
+		BeaconDB:           s.cfg.BeaconDB,
+		AttestationsPool:   s.cfg.AttestationsPool,
+		SlashingsPool:      s.cfg.SlashingsPool,
+		ChainInfoFetcher:   s.cfg.ChainInfoFetcher,
+		GenesisTimeFetcher: s.cfg.GenesisTimeFetcher,
+		BlockNotifier:      s.cfg.BlockNotifier,
+		Broadcaster:        s.cfg.Broadcaster,
+		BlockReceiver:      s.cfg.BlockReceiver,
+		StateGenService:    s.cfg.StateGen,
 		StateFetcher: statefetcher.StateProvider{
 			BeaconDB:           s.cfg.BeaconDB,
 			ChainInfoFetcher:   s.cfg.ChainInfoFetcher,
@@ -280,7 +271,6 @@ func (s *Service) Start() {
 			PeersFetcher:       s.cfg.PeersFetcher,
 		}
 		debugServerV1 := &debugv1.Server{
-			Ctx:         s.ctx,
 			BeaconDB:    s.cfg.BeaconDB,
 			HeadFetcher: s.cfg.HeadFetcher,
 			StateFetcher: &statefetcher.StateProvider{