Make pool statistics optional (#453)

client/accounting.go

@@ -8,9 +8,15 @@ import (
 	rpcapi "github.com/nspcc-dev/neofs-api-go/v2/rpc"
 	"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-sdk-go/accounting"
+	"github.com/nspcc-dev/neofs-sdk-go/stat"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
 )
 
+var (
+	// special variable for test purposes, to overwrite real RPC calls.
+	rpcAPIBalance = rpcapi.Balance
+)
+
 // PrmBalanceGet groups parameters of BalanceGet operation.
 type PrmBalanceGet struct {
 	prmCommonMeta
@@ -37,13 +43,20 @@ func (x *PrmBalanceGet) SetAccount(id user.ID) {
 //   - [ErrMissingAccount]
 //   - [ErrMissingSigner]
 func (c *Client) BalanceGet(ctx context.Context, prm PrmBalanceGet) (accounting.Decimal, error) {
+	var err error
+	defer func() {
+		c.sendStatistic(stat.MethodBalanceGet, err)()
+	}()
+
 	switch {
 	case !prm.accountSet:
-		return accounting.Decimal{}, ErrMissingAccount
+		err = ErrMissingAccount
+		return accounting.Decimal{}, err
 	}
 
 	if c.prm.signer == nil {
-		return accounting.Decimal{}, ErrMissingSigner
+		err = ErrMissingSigner
+		return accounting.Decimal{}, err
 	}
 
 	// form request body
@@ -69,7 +82,7 @@ func (c *Client) BalanceGet(ctx context.Context, prm PrmBalanceGet) (accounting.
 	cc.meta = prm.prmCommonMeta
 	cc.req = &req
 	cc.call = func() (responseV2, error) {
-		return rpcapi.Balance(&c.c, &req, client.WithContext(ctx))
+		return rpcAPIBalance(&c.c, &req, client.WithContext(ctx))
 	}
 	cc.result = func(r responseV2) {
 		resp := r.(*v2accounting.BalanceResponse)
@@ -90,6 +103,7 @@ func (c *Client) BalanceGet(ctx context.Context, prm PrmBalanceGet) (accounting.
 
 	// process call
 	if !cc.processCall() {
+		err = cc.err
 		return accounting.Decimal{}, cc.err
 	}
 

client/api.go

@@ -10,6 +10,12 @@ import (
 	"github.com/nspcc-dev/neofs-api-go/v2/session"
 )
 
+var (
+	// special variables for test purposes only, to overwrite real RPC calls.
+	rpcAPINetMapSnapshot = rpcapi.NetMapSnapshot
+	rpcAPICreateSession  = rpcapi.CreateSession
+)
+
 // interface of NeoFS API server. Exists for test purposes only.
 type neoFSAPIServer interface {
 	createSession(cli *client.Client, req *session.CreateRequest, opts ...client.CallOption) (*session.CreateResponse, error)
@@ -29,7 +35,7 @@ func rpcErr(e error) error {
 // executes NetmapService.NetmapSnapshot RPC declared in NeoFS API protocol
 // using underlying client.Client.
 func (x *coreServer) netMapSnapshot(ctx context.Context, req v2netmap.SnapshotRequest) (*v2netmap.SnapshotResponse, error) {
-	resp, err := rpcapi.NetMapSnapshot((*client.Client)(x), &req, client.WithContext(ctx))
+	resp, err := rpcAPINetMapSnapshot((*client.Client)(x), &req, client.WithContext(ctx))
 	if err != nil {
 		return nil, rpcErr(err)
 	}
@@ -38,7 +44,7 @@ func (x *coreServer) netMapSnapshot(ctx context.Context, req v2netmap.SnapshotRe
 }
 
 func (x *coreServer) createSession(cli *client.Client, req *session.CreateRequest, opts ...client.CallOption) (*session.CreateResponse, error) {
-	resp, err := rpcapi.CreateSession(cli, req, opts...)
+	resp, err := rpcAPICreateSession(cli, req, opts...)
 	if err != nil {
 		return nil, rpcErr(err)
 	}

client/client.go

@@ -3,14 +3,12 @@ package client
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"time"
 
-	v2accounting "github.com/nspcc-dev/neofs-api-go/v2/accounting"
-	"github.com/nspcc-dev/neofs-api-go/v2/rpc"
 	"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto"
+	"github.com/nspcc-dev/neofs-sdk-go/stat"
 )
 
 // Client represents virtual connection to the NeoFS network to communicate
@@ -48,6 +46,9 @@ type Client struct {
 	c client.Client
 
 	server neoFSAPIServer
+
+	endpoint string
+	nodeKey  []byte
 }
 
 var errNonNeoSigner = fmt.Errorf("%w: expected ECDSA_DETERMINISTIC_SHA256 scheme", neofscrypto.ErrIncorrectSigner)
@@ -90,6 +91,7 @@ func (c *Client) Dial(prm PrmDial) error {
 	if prm.endpoint == "" {
 		return ErrMissingServer
 	}
+	c.endpoint = prm.endpoint
 
 	if prm.timeoutDialSet {
 		if prm.timeoutDial <= 0 {
@@ -119,15 +121,13 @@ func (c *Client) Dial(prm PrmDial) error {
 		prm.parentCtx = context.Background()
 	}
 
-	// TODO: (neofs-api-go#382) perform generic dial stage of the client.Client
-	_, err := rpc.Balance(&c.c, new(v2accounting.BalanceRequest),
-		client.WithContext(prm.parentCtx),
-	)
-	// return context errors since they signal about dial problem
-	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+	endpointInfo, err := c.EndpointInfo(prm.parentCtx, PrmEndpointInfo{})
+	if err != nil {
 		return err
 	}
 
+	c.nodeKey = endpointInfo.NodeInfo().PublicKey()
+
 	return nil
 }
 
@@ -168,6 +168,17 @@ func (c *Client) Close() error {
 	return c.c.Conn().Close()
 }
 
+func (c *Client) sendStatistic(m stat.Method, err error) func() {
+	if c.prm.statisticCallback == nil {
+		return func() {}
+	}
+
+	ts := time.Now()
+	return func() {
+		c.prm.statisticCallback(c.nodeKey, c.endpoint, m, time.Since(ts), err)
+	}
+}
+
 // PrmInit groups initialization parameters of Client instances.
 //
 // See also [New].
@@ -177,6 +188,8 @@ type PrmInit struct {
 	cbRespInfo func(ResponseMetaInfo) error
 
 	netMagic uint64
+
+	statisticCallback stat.OperationCallback
 }
 
 // SetDefaultSigner sets Client private signer to be used for the protocol
@@ -196,6 +209,11 @@ func (x *PrmInit) SetResponseInfoCallback(f func(ResponseMetaInfo) error) {
 	x.cbRespInfo = f
 }
 
+// SetStatisticCallback makes the Client to pass [stat.OperationCallback] for the external statistic.
+func (x *PrmInit) SetStatisticCallback(statisticCallback stat.OperationCallback) {
+	x.statisticCallback = statisticCallback
+}
+
 // PrmDial groups connection parameters for the Client.
 //
 // See also Dial.

client/client_test.go

@@ -6,6 +6,7 @@ import (
 
 	apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status"
 	neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto"
+	"github.com/nspcc-dev/neofs-sdk-go/crypto/test"
 	"github.com/stretchr/testify/require"
 )
 
@@ -31,7 +32,11 @@ func newClient(t *testing.T, signer neofscrypto.Signer, server neoFSAPIServer) *
 }
 
 func TestClient_DialContext(t *testing.T) {
-	var c Client
+	var prmInit PrmInit
+	prmInit.SetDefaultSigner(test.RandomSignerRFC6979(t))
+
+	c, err := New(prmInit)
+	require.NoError(t, err)
 
 	// try to connect to any host
 	var prm PrmDial