Merge pull request #62 from AgoraLab/dev/fix-bug

fix bug

Author: boxjan

cmd/godplugin/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"os/user"
+	"net/http"
 	"path/filepath"
 	"strings"
 
@@ -18,6 +19,7 @@ import (
 	"golang.org/x/net/http/httpproxy"
 
 	_ "github.com/netdata/go.d.plugin/modules"
+	_ "net/http/pprof"
 )
 
 var (
@@ -28,6 +30,7 @@ var (
 	varLibDir = os.Getenv("NETDATA_LIB_DIR")
 	lockDir   = os.Getenv("NETDATA_LOCK_DIR")
 	watchPath = os.Getenv("NETDATA_PLUGINS_GOD_WATCH_PATH")
+	pprofAddr = os.Getenv("NETDATA_GO_PLUGIN_PPROF_ADDRESSES")
 
 	version = "unknown"
 )
@@ -86,6 +89,11 @@ func init() {
 	if v := os.Getenv("TZ"); strings.HasPrefix(v, ":") {
 		_ = os.Unsetenv("TZ")
 	}
+
+	if pprofAddr == "" {
+		pprofAddr = "localhost:65453"
+	}
+	go http.ListenAndServe(pprofAddr, nil)
 }
 
 func main() {

config/go.d/chrony.conf

@@ -85,7 +85,7 @@
 
 jobs:
   - address: '127.0.0.1:323'
-    timeout: 1
+    timeout: 500
 
 #  - name: remote
 #    address: '203.0.113.0:323'

modules/chrony/charts.go

@@ -151,4 +151,14 @@ var charts = Charts{
 			{ID: net.IPv4zero.String(), Name: net.IPv4zero.String(), Algo: module.Absolute, Div: 1, Mul: 1},
 		},
 	},
+	{
+		ID:    "residual_frequency",
+		Title: "Residual frequency",
+		Units: "ppm",
+		Fam:   "frequency",
+		Ctx:   "chrony.residual_frequency",
+		Dims: module.Dims{
+			{ID: "residual_frequency", Div: 1},
+		},
+	},
 }

modules/chrony/chrony.go

@@ -48,7 +48,7 @@ func New() *Chrony {
 			Protocol:     chronyDefaultProtocol,
 			Address:      chronyDefaultCmdAddr,
 			SentryConfig: sentry.ClientOptions{},
-			Timeout:      1000,
+			Timeout:      500,
 		},
 		charts:       &charts,
 		latestSource: net.IPv4zero,
@@ -80,7 +80,7 @@ func (c *Chrony) Init() bool {
 	}
 
 	c.conn = conn
-	return true
+	return c.ApplyChronyVersion() == nil
 }
 
 // Check makes check
@@ -105,42 +105,25 @@ func (c *Chrony) Charts() *Charts {
 func (c *Chrony) Collect() map[string]int64 {
 	// collect all we need and sent Exception to sentry
 	res := map[string]int64{"running": 0}
+	var err error
 
-	if !c.Running() {
-		return res
-	}
-	res["running"] = 1
-
-	tra := c.collectTracking()
-	for k, v := range tra {
-		res[k] = v
+	err = c.collectTracking(res)
+	if err != nil {
+		c.Errorf("fetch tracking status failed: %s", err)
 	}
 
-	act := c.collectActivity()
-	for k, v := range act {
-		res[k] = v
+	err = c.collectActivity(res)
+	if err != nil {
+		c.Errorf("fetch activity status failed: %s", err)
 	}
 
 	return res
 }
 
-func (c *Chrony) Running() bool {
-	err := c.SubmitEmptyRequest()
-	if err != nil {
-		c.Errorf("contract chrony failed with err: %s", err)
-		return false
-	}
-	return true
-}
-
-func (c *Chrony) collectTracking() (res map[string]int64) {
-	res = make(map[string]int64)
+func (c *Chrony) collectTracking(res map[string]int64) error {
 	tracking, err := c.FetchTracking()
 	if err != nil {
-		c.Errorf("fetch tracking status failed: %s", err)
 		sentry.CaptureException((FetchingChronyError)(err.Error()))
-		res["running"] = 0
-		return
 	}
 	c.Debugf(tracking.String())
 
@@ -154,8 +137,9 @@ func (c *Chrony) collectTracking() (res map[string]int64) {
 	res["last_offset"] = (int64)(tracking.LastOffset.Int64())
 	res["rms_offset"] = (int64)(tracking.RmsOffset.Int64())
 	res["update_interval"] = (int64)(tracking.LastUpdateInterval.Int64())
-	res["current_correction"] = (int64)(tracking.LastUpdateInterval.Int64())
+	res["current_correction"] = (int64)(tracking.CurrentCorrection.Int64())
 	res["ref_timestamp"] = tracking.RefTime.Time().Unix()
+	res["residual_frequency"] = (int64)(tracking.ResidFreqPpm.Int64())
 
 	sourceIp := tracking.Ip.Ip()
 
@@ -206,18 +190,14 @@ func (c *Chrony) collectTracking() (res map[string]int64) {
 		sentry.CaptureException((OutOfSyncForTooLong)(rt))
 	}
 
-	return
+	return nil
 }
 
-func (c *Chrony) collectActivity() (res map[string]int64) {
-	res = make(map[string]int64)
+func (c *Chrony) collectActivity(res map[string]int64) error {
 	activity, err := c.FetchActivity()
 	if err != nil {
-		c.Errorf("fetch activity status failed: %s", err)
 		sentry.CaptureException((FetchingChronyError)(err.Error()))
-		return
 	}
-	c.Debug(activity.String())
 
 	res["online_sources"] = int64(activity.Online)
 	res["offline_sources"] = int64(activity.Offline)
@@ -229,5 +209,5 @@ func (c *Chrony) collectActivity() (res map[string]int64) {
 		c.Debugf("sending sentry error for NoSourceOnlineError: %g", activity.Online)
 		sentry.CaptureException((NoSourceOnlineError)(activity.Online))
 	}
-	return res
+	return nil
 }

modules/chrony/types.go

@@ -83,8 +83,7 @@ const (
 )
 
 type IpAddr struct {
-	IPAddrHigh uint64
-	IPAddrLow  uint64
+	IP       [16]uint8
 	Family     uint16
 	Pad        uint16
 }
@@ -104,32 +103,9 @@ func (tracking *TrackingPayload) String() string {
 
 func (ia IpAddr) Ip() net.IP {
 	if ia.Family == IpaddrInet4 {
-		m := uint32(ia.IPAddrHigh >> (32))
-		var ip [4]uint8
-		for i := 0; i < 4; i++ {
-			ip[i] = uint8(m % 0x100)
-			m = m / 0x100
-		}
-		return net.IPv4(ip[3], ip[2], ip[1], ip[0])
+		return net.IP(ia.IP[:4])
 	}
-
-	if ia.Family == IpaddrInet6 {
-		res := make(net.IP, net.IPv6len)
-		h := ia.IPAddrHigh
-		for i := 7; i >= 0; i-- {
-			res[i] = byte(h % 0x100)
-			h = h / 0x100
-		}
-		l := ia.IPAddrLow
-		for i := 7; i >= 0; i-- {
-			res[i+8] = byte(l % 0x100)
-			l = l / 0x100
-		}
-
-		return res
-	}
-
-	return net.IPv4zero
+	return net.IP(ia.IP[:])
 }
 
 func (ia IpAddr) String() string {