Feat metrics (#59)

* add metrics option

* fix t.Fatal in a goroutine

README-ZH.md

@@ -678,7 +678,7 @@ import (
 	"github.com/Allenxuxu/gev/connection"
 	pb "github.com/Allenxuxu/gev/example/protobuf/proto"
 	"github.com/Allenxuxu/gev/plugins/protobuf"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 type example struct{}
@@ -749,7 +749,7 @@ import (
 
 	pb "github.com/Allenxuxu/gev/example/protobuf/proto"
 	"github.com/Allenxuxu/gev/plugins/protobuf"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func main() {

README.md

@@ -679,7 +679,7 @@ import (
 	"github.com/Allenxuxu/gev/connection"
 	pb "github.com/Allenxuxu/gev/example/protobuf/proto"
 	"github.com/Allenxuxu/gev/plugins/protobuf"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 type example struct{}
@@ -750,7 +750,7 @@ import (
 
 	pb "github.com/Allenxuxu/gev/example/protobuf/proto"
 	"github.com/Allenxuxu/gev/plugins/protobuf"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func main() {

benchmarks/test.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+echo ""
+echo "--- BENCH PING PONG START ---"
+echo ""
+
+cd $(dirname "${BASH_SOURCE[0]}")
+function cleanup {
+    echo "--- BENCH PING PONG DONE ---"
+    kill -9 $(jobs -rp)
+    wait $(jobs -rp) 2>/dev/null
+}
+trap cleanup EXIT
+
+mkdir -p bin
+$(pkill -9 gev-echo-server || printf "")
+
+function gobench {
+    echo "--- $1 ---"
+    if [ "$3" != "" ]; then
+        go build -o $2 $3
+    fi
+    GOMAXPROCS=4 $2 --port $4 --loops 4 &
+
+    sleep 1
+    echo "*** 1000 connections, 10 seconds, 4096 byte packets"
+    GOMAXPROCS=4 go run client/main.go -c 1000 -t 100 -m 4096 -a 127.0.0.1:$4
+    echo "--- DONE ---"
+    echo ""
+}
+
+gobench "GEV"  bin/gev-echo-server ../example/echo/echo.go 5000
+

connection/connection.go

@@ -7,6 +7,8 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/Allenxuxu/gev/metrics"
+
 	"github.com/Allenxuxu/gev/eventloop"
 	"github.com/Allenxuxu/gev/log"
 	"github.com/Allenxuxu/gev/poller"
@@ -143,8 +145,9 @@ func (c *Connection) WriteBufferLength() int64 {
 
 // HandleEvent 内部使用，event loop 回调
 func (c *Connection) HandleEvent(fd int, events poller.Event) {
+	now := time.Now()
 	if c.idleTime > 0 {
-		_ = c.activeTime.Swap(time.Now().Unix())
+		_ = c.activeTime.Swap(now.Unix())
 	}
 
 	if events&poller.EventErr != 0 {
@@ -162,6 +165,24 @@ func (c *Connection) HandleEvent(fd int, events poller.Event) {
 
 	c.inBufferLen.Swap(int64(c.inBuffer.Length()))
 	c.outBufferLen.Swap(int64(c.outBuffer.Length()))
+
+	if metrics.Enable.Get() {
+		metrics.ConnBufferCap.WithLabelValues("in", c.PeerAddr()).Set(float64(c.inBuffer.Capacity()))
+		metrics.ConnBufferLen.WithLabelValues("in", c.PeerAddr()).Set(float64(c.inBuffer.Length()))
+
+		metrics.ConnBufferCap.WithLabelValues("out", c.PeerAddr()).Set(float64(c.outBuffer.Capacity()))
+		metrics.ConnBufferLen.WithLabelValues("out", c.PeerAddr()).Set(float64(c.outBuffer.Length()))
+
+		var action string
+		if events&poller.EventWrite != 0 {
+			action = "write"
+		} else if events&poller.EventRead != 0 {
+			action = "read"
+		}
+		if len(action) > 0 {
+			metrics.ConnHandlerDuration.WithLabelValues(action).Set(float64(time.Since(now).Microseconds()))
+		}
+	}
 }
 
 func (c *Connection) handlerProtocol(buffer *ringbuffer.RingBuffer) []byte {

eventloop/eventloop.go

@@ -2,6 +2,9 @@ package eventloop
 
 import (
 	"sync"
+	"time"
+
+	"github.com/Allenxuxu/gev/metrics"
 
 	"github.com/Allenxuxu/gev/log"
 	"github.com/Allenxuxu/gev/poller"
@@ -131,6 +134,13 @@ func (l *EventLoop) doPendingFunc() {
 	l.mu.Unlock()
 
 	length := len(pf)
+	if metrics.Enable.Get() && length > 0 {
+		now := time.Now()
+		defer func() {
+			metrics.DoPendingFuncDuration.Set(float64(time.Since(now).Microseconds()))
+		}()
+	}
+
 	for i := 0; i < length; i++ {
 		pf[i]()
 	}

example/echo/echo.go

@@ -50,7 +50,9 @@ func main() {
 	s, err := gev.NewServer(handler,
 		gev.Network("tcp"),
 		gev.Address(":"+strconv.Itoa(port)),
-		gev.NumLoops(loops))
+		gev.NumLoops(loops),
+		gev.MetricsServer("", ":9091"),
+	)
 	if err != nil {
 		panic(err)
 	}

example/idleconnection/echo.go

@@ -47,7 +47,9 @@ func main() {
 		gev.Network("tcp"),
 		gev.Address(":"+strconv.Itoa(port)),
 		gev.NumLoops(loops),
-		gev.IdleTime(5*time.Second))
+		gev.IdleTime(5*time.Second),
+		gev.MetricsServer("", ":9091"),
+	)
 	if err != nil {
 		panic(err)
 	}

example/protobuf/client/main.go

@@ -10,7 +10,7 @@ import (
 
 	pb "github.com/Allenxuxu/gev/example/protobuf/proto"
 	"github.com/Allenxuxu/gev/plugins/protobuf"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func main() {