Merge pull request #722 from Meepoljdx/main

add: add timeout config for ntp input plugin

conf/input.ntp/ntp.toml

@@ -3,3 +3,6 @@
 
 # # ntp servers
 # ntp_servers = ["ntp.aliyun.com"]
+
+# # response time out seconds
+# timeout = 5

go.mod

@@ -54,8 +54,8 @@ require (
 	github.com/prometheus/prometheus v0.37.0
 	github.com/shirou/gopsutil/v3 v3.22.5
 	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/toolkits/pkg v1.3.7
 	github.com/stretchr/testify v1.8.4
-	github.com/toolkits/pkg v1.3.5
 	github.com/ulricqin/gosnmp v0.0.1
 	github.com/xdg/scram v1.0.5
 	go.mongodb.org/mongo-driver v1.9.1

inputs/ntp/ntp.go

@@ -7,6 +7,7 @@ import (
 	"flashcat.cloud/categraf/config"
 	"flashcat.cloud/categraf/inputs"
 	"flashcat.cloud/categraf/types"
+
 	"github.com/toolkits/pkg/nux"
 )
 
@@ -15,12 +16,16 @@ const inputName = "ntp"
 type NTPStat struct {
 	config.PluginConfig
 	NTPServers []string `toml:"ntp_servers"`
+	TimeOut    int64    `toml:"timeout"`
 	server     string
 }
 
 func init() {
 	inputs.Add(inputName, func() inputs.Input {
-		return &NTPStat{}
+		return &NTPStat{
+			// default timeout is 5 seconds
+			TimeOut: 5,
+		}
 	})
 }
 
@@ -46,7 +51,7 @@ func (n *NTPStat) Gather(slist *types.SampleList) {
 		}
 
 		orgTime := time.Now()
-		serverReciveTime, serverTransmitTime, err := nux.NtpTwoTime(n.server)
+		serverReciveTime, serverTransmitTime, err := nux.NtpTwoTime(n.server, n.TimeOut)
 		if err != nil {
 			log.Println("E! failed to connect ntp server:", n.server, "error:", err)
 			n.server = ""

inputs/ntp/ntp_test.go

@@ -0,0 +1,26 @@
+package ntp
+
+import (
+	"log"
+	"testing"
+	"time"
+
+	"github.com/toolkits/pkg/nux"
+)
+
+func TestGetTwoTime(t *testing.T) {
+	orgTime := time.Now()
+	log.Println("Begin")
+	serverReciveTime, serverTransmitTime, err := nux.NtpTwoTime("ntp1.aliyun.com", 20)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	dstTime := time.Now()
+
+	// https://en.wikipedia.org/wiki/Network_Time_Protocol
+	duration := ((serverReciveTime.UnixNano() - orgTime.UnixNano()) + (serverTransmitTime.UnixNano() - dstTime.UnixNano())) / 2
+
+	delta := duration / 1e6 // convert to ms
+	log.Println(delta)
+}