added some more expvar stats tracking

Author: costela

README.md

@@ -52,4 +52,11 @@ The following options are available:
 
 Currently `innovazammad` uses innovaphone's [v10 SOAP API](http://wiki.innovaphone.com/index.php?title=Reference10:SOAP_API) (see `innovaphone/pbx10_00.{go,wsdl}`). Older PBX might not work.
 
-On the Zammad side, it has been tested against the `2.9.x` branch.
+On the Zammad side, it has been tested against the `2.9.x` branch.
+
+## Monitoring
+
+Internal state can be monitored by querying the metrics endpoint:
+```
+curl -s localhost:8080/debug/vars
+```

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/regiohelden/innovazammad/config"
 	"github.com/regiohelden/innovazammad/innovaphone"
@@ -62,19 +63,29 @@ func main() {
 
 	logrus.Infof("starting innovaphone-zammad bridge")
 
+	connectionStats := expvar.NewMap("connection_stats")
+
 	zammadSession := zammad.NewSession()
 	for {
 		innovaphoneSession := innovaphone.NewSession()
+		connectionStats.Set("on_since", timeString(time.Now().Format(time.RFC3339)))
 		calls, errs := innovaphoneSession.PollForever()
 	handling:
 		for {
 			select {
 			case call := <-calls:
-				go zammadSession.Submit(call)
+				zammadSession.Submit(call)
 			case err := <-errs:
 				logrus.Errorf("error while polling: %s", err)
 				break handling
 			}
 		}
+		connectionStats.Add("errors", 1)
 	}
 }
+
+type timeString string
+
+func (ts timeString) String() string {
+	return fmt.Sprintf("\"%s\"", string(ts))
+}

zammad/zammad.go

@@ -67,6 +67,7 @@ func (cs callMap) String() string {
 // Session keeps track of the states successfully submitted to Zammad
 type Session struct {
 	callMap callMap
+	stats   *expvar.Map
 	sync.Mutex
 }
 
@@ -80,6 +81,7 @@ type stateTransition struct {
 func NewSession() *Session {
 	calls := &Session{
 		callMap: callMap{},
+		stats:   expvar.NewMap("stats"),
 	}
 	expvar.Publish("calls", calls.callMap)
 	return calls
@@ -110,12 +112,15 @@ func (zs *Session) setOrUpdate(callID int, newEntry *callEntry) {
 	} else if curEntry, ok := zs.callMap[callID]; ok {
 		curEntry.State = newEntry.State
 	} else {
+		zs.stats.Add("calls_total", 1)
 		zs.callMap[callID] = newEntry
 	}
 }
 
 // Submit sends a call to Zammad, if we are aware of it and can correctly map its state to some known Zammad state
 func (zs *Session) Submit(call *innovaphone.CallInSession) error {
+	zs.stats.Add("events_total", 1)
+
 	src, dst, err := call.GetSourceAndDestination()
 	if err != nil {
 		return err
@@ -201,6 +206,7 @@ func (zs *Session) Submit(call *innovaphone.CallInSession) error {
 	if resp.StatusCode < 200 || resp.StatusCode > 299 {
 		return fmt.Errorf("could not submit to Zammad: %s", resp.Status)
 	}
+	zs.stats.Add("events_submitted", 1)
 	zs.setOrUpdate(call.Call, entry)
 	return nil
 }