addressed code review comments.

Author: vjadhav-arista

region/client.go

@@ -436,15 +436,7 @@ func (c *client) trySend(rpc hrpc.Call) (err error) {
 			c.fail(err)
 		}
 		if r := c.unregisterRPC(id); r != nil {
-			if m, ok := r.(*multi); ok {
-				for _, call := range m.calls {
-					if call != nil {
-						rpcResultCount.WithLabelValues(c.Addr(), call.Name(), "failure").Inc()
-					}
-				}
-			} else {
-				rpcResultCount.WithLabelValues(c.Addr(), r.Name(), "failure").Inc()
-			}
+			c.trackRPCResult(r, "error")
 			// we are the ones to unregister the rpc,
 			// return err to notify client of it
 			return err
@@ -473,6 +465,20 @@ func (c *client) receiveRPCs() {
 	}
 }
 
+func (c *client) trackRPCResult(rpc hrpc.Call, status string) {
+	if m, ok := rpc.(*multi); ok {
+		for _, call := range m.calls {
+			if call != nil {
+				rpcResultCount.WithLabelValues(
+					c.Addr(), call.Name(), status, "batch").Inc()
+			}
+		}
+	} else {
+		rpcResultCount.WithLabelValues(
+			c.Addr(), rpc.Name(), status, "unary").Inc()
+	}
+}
+
 func (c *client) receive(r io.Reader) (err error) {
 	var (
 		sz       [4]byte
@@ -527,19 +533,11 @@ func (c *client) receive(r io.Reader) (err error) {
 	// It's our responsibility to deliver the response or error to the
 	// caller as we unregistered the rpc.
 	defer func() {
-		status := "success"
+		status := "ok"
 		if err != nil {
-			status = "failure"
-		}
-		if m, ok := rpc.(*multi); ok {
-			for _, call := range m.calls {
-				if call != nil {
-					rpcResultCount.WithLabelValues(c.Addr(), call.Name(), status).Inc()
-				}
-			}
-		} else {
-			rpcResultCount.WithLabelValues(c.Addr(), rpc.Name(), status).Inc()
+			status = "error"
 		}
+		c.trackRPCResult(rpc, status)
 		returnResult(rpc, response, err)
 	}()
 

region/prometheus.go

@@ -48,6 +48,6 @@ var (
 			Name:      "rpc_result_count",
 			Help:      "Number of RPC operations by result status and operation type",
 		},
-		[]string{"regionserver", "operation", "status"},
+		[]string{"regionserver", "operation", "status", "type"},
 	)
 )