NR-170460: fix default NTP timeout to 5 seconds (#1744)

* NR-170460: set default NTP timeout to 5s * NR-170460: avoid magic number linter for defaults
newrelic · Oct 19, 2023 · 4d395a8 · 4d395a8
1 parent 220eafd
commit 4d395a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
@@ -35,7 +35,7 @@ const (
 
 // Default configurable values
 //
-//nolint:gochecknoglobals
+//nolint:gochecknoglobals,gomnd
 var (
 	// public
 	DefaultContainerCacheMetadataLimit = 60
@@ -111,8 +111,8 @@ var (
 	defaultRegisterMaxRetryBoSecs        = 60
 	defaultNtpPool                       = []string{} // i.e: []string{"time.cloudflare.com"}
 	defaultNtpEnabled                    = false
-	defaultNtpInterval                   = uint(15)   // minutes
-	defaultNtpTimeout                    = uint(5000) // millisecods
+	defaultNtpInterval                   = uint(15) // minutes
+	defaultNtpTimeout                    = uint(5)  // seconds
 )
 
 // Default internal values

diff --git a/pkg/metrics/host_test.go b/pkg/metrics/host_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestHostSample_CachedNtpOffset(t *testing.T) {
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{

diff --git a/pkg/metrics/ntp_test.go b/pkg/metrics/ntp_test.go
@@ -155,7 +155,7 @@ func TestOffset_Interval(t *testing.T) {
 }
 
 func TestOffset_OffsetAverage(t *testing.T) {
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one", "two", "three"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{
@@ -179,7 +179,7 @@ func TestOffset_OffsetAverage(t *testing.T) {
 }
 
 func TestOffset_AnyHostErrorShouldNotReturnError(t *testing.T) {
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one", "two", "three"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{
@@ -202,7 +202,7 @@ func TestOffset_AnyHostErrorShouldNotReturnError(t *testing.T) {
 }
 
 func TestOffset_AllHostErrorShouldReturnError(t *testing.T) {
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one", "two", "three"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{
@@ -225,7 +225,7 @@ func TestOffset_AllHostErrorShouldReturnError(t *testing.T) {
 func TestOffset_InvalidNtpResponse(t *testing.T) {
 	t.Parallel()
 
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one", "two", "three"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{
@@ -251,7 +251,7 @@ func TestOffset_InvalidNtpResponse(t *testing.T) {
 func TestOffset_AnyHostInvalidShouldNotReturnError(t *testing.T) {
 	t.Parallel()
 
-	timeout := uint(5000)
+	timeout := uint(5)
 	interval := uint(15)
 	ntpMonitor := NewNtp([]string{"one", "two", "three"}, timeout, interval)
 	ntpMonitor.ntpQuery = ntpQueryMock([]ntpResp{