cmd/geth, rpc/api: extend metrics API, add a basic monitor command

4 files changed, 148 insertions, 32 deletions

diff --git a/rpc/api/debug.go b/rpc/api/debug.go
index 871786c6f..45c99f295 100644
--- a/rpc/api/debug.go
+++ b/rpc/api/debug.go
@@ -177,6 +177,10 @@ func (self *debugApi) SeedHash(req *shared.Request) (interface{}, error) {
 }
 
 func (self *debugApi) Metrics(req *shared.Request) (interface{}, error) {
+	args := new(MetricsArgs)
+	if err := self.codec.Decode(req.Params, &args); err != nil {
+		return nil, shared.NewDecodeParamError(err.Error())
+	}
 	// Create a rate formatter
 	units := []string{"", "K", "M", "G", "T", "E", "P"}
 	round := func(value float64, prec int) string {
@@ -202,35 +206,69 @@ func (self *debugApi) Metrics(req *shared.Request) (interface{}, error) {
 		}
 		name = parts[len(parts)-1]
 
-		// Fill the counter with the metric details
-		switch metric := metric.(type) {
-		case metrics.Meter:
-			root[name] = map[string]interface{}{
-				"Avg01Min": format(metric.Rate1()*60, metric.Rate1()),
-				"Avg05Min": format(metric.Rate5()*300, metric.Rate5()),
-				"Avg15Min": format(metric.Rate15()*900, metric.Rate15()),
-				"Total":    format(float64(metric.Count()), metric.RateMean()),
+		// Fill the counter with the metric details, formatting if requested
+		if args.Raw {
+			switch metric := metric.(type) {
+			case metrics.Meter:
+				root[name] = map[string]interface{}{
+					"Avg01Min": metric.Rate1(),
+					"Avg05Min": metric.Rate5(),
+					"Avg15Min": metric.Rate15(),
+					"AvgTotal": metric.RateMean(),
+					"Total":    float64(metric.Count()),
+				}
+
+			case metrics.Timer:
+				root[name] = map[string]interface{}{
+					"Avg01Min": metric.Rate1(),
+					"Avg05Min": metric.Rate5(),
+					"Avg15Min": metric.Rate15(),
+					"AvgTotal": metric.RateMean(),
+					"Total":    float64(metric.Count()),
+					"Maximum":  metric.Max(),
+					"Minimum":  metric.Min(),
+					"Percentile": map[string]interface{}{
+						"20": metric.Percentile(0.2),
+						"50": metric.Percentile(0.5),
+						"80": metric.Percentile(0.8),
+						"95": metric.Percentile(0.95),
+						"99": metric.Percentile(0.99),
+					},
+				}
+
+			default:
+				root[name] = "Unknown metric type"
 			}
-
-		case metrics.Timer:
-			root[name] = map[string]interface{}{
-				"Avg01Min": format(metric.Rate1()*60, metric.Rate1()),
-				"Avg05Min": format(metric.Rate5()*300, metric.Rate5()),
-				"Avg15Min": format(metric.Rate15()*900, metric.Rate15()),
-				"Count":    format(float64(metric.Count()), metric.RateMean()),
-				"Maximum":  time.Duration(metric.Max()).String(),
-				"Minimum":  time.Duration(metric.Min()).String(),
-				"Percentile": map[string]interface{}{
-					"20": time.Duration(metric.Percentile(0.2)).String(),
-					"50": time.Duration(metric.Percentile(0.5)).String(),
-					"80": time.Duration(metric.Percentile(0.8)).String(),
-					"95": time.Duration(metric.Percentile(0.95)).String(),
-					"99": time.Duration(metric.Percentile(0.99)).String(),
-				},
+		} else {
+			switch metric := metric.(type) {
+			case metrics.Meter:
+				root[name] = map[string]interface{}{
+					"Avg01Min": format(metric.Rate1()*60, metric.Rate1()),
+					"Avg05Min": format(metric.Rate5()*300, metric.Rate5()),
+					"Avg15Min": format(metric.Rate15()*900, metric.Rate15()),
+					"Total":    format(float64(metric.Count()), metric.RateMean()),
+				}
+
+			case metrics.Timer:
+				root[name] = map[string]interface{}{
+					"Avg01Min": format(metric.Rate1()*60, metric.Rate1()),
+					"Avg05Min": format(metric.Rate5()*300, metric.Rate5()),
+					"Avg15Min": format(metric.Rate15()*900, metric.Rate15()),
+					"Count":    format(float64(metric.Count()), metric.RateMean()),
+					"Maximum":  time.Duration(metric.Max()).String(),
+					"Minimum":  time.Duration(metric.Min()).String(),
+					"Percentile": map[string]interface{}{
+						"20": time.Duration(metric.Percentile(0.2)).String(),
+						"50": time.Duration(metric.Percentile(0.5)).String(),
+						"80": time.Duration(metric.Percentile(0.8)).String(),
+						"95": time.Duration(metric.Percentile(0.95)).String(),
+						"99": time.Duration(metric.Percentile(0.99)).String(),
+					},
+				}
+
+			default:
+				root[name] = "Unknown metric type"
 			}
-
-		default:
-			root[name] = "Unknown metric type"
 		}
 	})
 	return counters, nil
diff --git a/rpc/api/debug_args.go b/rpc/api/debug_args.go
index b9b5aa27e..b72fb03ae 100644
--- a/rpc/api/debug_args.go
+++ b/rpc/api/debug_args.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
+	"reflect"
 
 	"github.com/ethereum/go-ethereum/rpc/shared"
 )
@@ -45,3 +46,26 @@ func (args *WaitForBlockArgs) UnmarshalJSON(b []byte) (err error) {
 
 	return nil
 }
+
+type MetricsArgs struct {
+	Raw bool
+}
+
+func (args *MetricsArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+	if len(obj) > 1 {
+		return fmt.Errorf("metricsArgs needs 0, 1 arguments")
+	}
+	// default values when not provided
+	if len(obj) >= 1 && obj[0] != nil {
+		if value, ok := obj[0].(bool); !ok {
+			return fmt.Errorf("invalid argument %v", reflect.TypeOf(obj[0]))
+		} else {
+			args.Raw = value
+		}
+	}
+	return nil
+}
diff --git a/rpc/api/debug_js.go b/rpc/api/debug_js.go
index e48e4df06..bd3a6dfb2 100644
--- a/rpc/api/debug_js.go
+++ b/rpc/api/debug_js.go
@@ -46,15 +46,17 @@ web3._extend({
 			params: 1,
 			inputFormatter: [web3._extend.formatters.formatInputInt],
 			outputFormatter: function(obj) { return obj; }
+		}),
+		new web3._extend.Method({
+			name: 'metrics',
+			call: 'debug_metrics',
+			params: 1,
+			inputFormatter: [web3._extend.formatters.formatInputBool],
+			outputFormatter: function(obj) { return obj; }
 		})
 	],
 	properties:
 	[
-		new web3._extend.Property({
-			name: 'metrics',
-			getter: 'debug_metrics',
-			outputFormatter: function(obj) { return obj; }
-		})
 	]
 });
 `
diff --git a/rpc/xeth.go b/rpc/xeth.go
new file mode 100644
index 000000000..b3e844380
--- /dev/null
+++ b/rpc/xeth.go
@@ -0,0 +1,52 @@
+package rpc
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"sync/atomic"
+
+	"github.com/ethereum/go-ethereum/rpc/comms"
+	"github.com/ethereum/go-ethereum/rpc/shared"
+)
+
+// Xeth is a native API interface to a remote node.
+type Xeth struct {
+	client comms.EthereumClient
+	reqId  uint32
+}
+
+// NewXeth constructs a new native API interface to a remote node.
+func NewXeth(client comms.EthereumClient) *Xeth {
+	return &Xeth{
+		client: client,
+	}
+}
+
+// Call invokes a method with the given parameters are the remote node.
+func (self *Xeth) Call(method string, params []interface{}) (map[string]interface{}, error) {
+	// Assemble the json RPC request
+	data, err := json.Marshal(params)
+	if err != nil {
+		return nil, err
+	}
+	req := &shared.Request{
+		Id:      atomic.AddUint32(&self.reqId, 1),
+		Jsonrpc: "2.0",
+		Method:  method,
+		Params:  data,
+	}
+	// Send the request over and process the response
+	if err := self.client.Send(req); err != nil {
+		return nil, err
+	}
+	res, err := self.client.Recv()
+	if err != nil {
+		return nil, err
+	}
+	value, ok := res.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("Invalid response type: have %v, want %v", reflect.TypeOf(res), reflect.TypeOf(make(map[string]interface{})))
+	}
+	return value, nil
+}