From c02003af3cfe62210861d2c38b6fd8cac930b857 Mon Sep 17 00:00:00 2001 From: Sasha Melentyev Date: Tue, 22 Nov 2022 10:09:15 +0300 Subject: [PATCH] Refactor time durations (#58484) This change uses `time.Second` in place of `1000 * time.Millisecond` and `time.Minute` in place of `60*time.Second`. --- pkg/components/imguploader/webdavuploader.go | 2 +- .../alerting/store_notification_test.go | 2 +- .../datasources/service/datasource_test.go | 8 ++--- pkg/services/live/pipeline/devdata.go | 2 +- pkg/services/live/runstream/manager.go | 2 +- pkg/services/ngalert/image/service.go | 2 +- .../ngalert/notifier/alertmanager_test.go | 2 +- pkg/services/ngalert/state/manager_test.go | 2 +- pkg/services/ngalert/state/state_test.go | 2 +- pkg/setting/setting_unified_alerting.go | 4 +-- pkg/setting/setting_unified_alerting_test.go | 8 ++--- .../alerting/api_admin_configuration_test.go | 2 +- pkg/tsdb/cloudwatch/cloudwatch.go | 2 +- pkg/tsdb/cloudwatch/response_parser_test.go | 36 +++++++++---------- pkg/tsdb/intervalv2/intervalv2_test.go | 4 +-- pkg/tsdb/mssql/mssql_test.go | 2 +- pkg/tsdb/mysql/mysql_test.go | 2 +- pkg/tsdb/postgres/postgres_test.go | 2 +- 18 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkg/components/imguploader/webdavuploader.go b/pkg/components/imguploader/webdavuploader.go index 5099164516f..a1e2671e245 100644 --- a/pkg/components/imguploader/webdavuploader.go +++ b/pkg/components/imguploader/webdavuploader.go @@ -26,7 +26,7 @@ type WebdavUploader struct { var netTransport = &http.Transport{ Proxy: http.ProxyFromEnvironment, Dial: (&net.Dialer{ - Timeout: 60 * time.Second, + Timeout: time.Minute, }).Dial, TLSHandshakeTimeout: 5 * time.Second, } diff --git a/pkg/services/alerting/store_notification_test.go b/pkg/services/alerting/store_notification_test.go index a6d468f15e9..b2724ef946c 100644 --- a/pkg/services/alerting/store_notification_test.go +++ b/pkg/services/alerting/store_notification_test.go @@ -285,7 +285,7 @@ func TestIntegrationAlertNotificationSQLAccess(t *testing.T) { err := store.UpdateAlertNotification(context.Background(), newCmd) require.Nil(t, err) require.Equal(t, "NewName", newCmd.Result.Name) - require.Equal(t, 60*time.Second, newCmd.Result.Frequency) + require.Equal(t, time.Minute, newCmd.Result.Frequency) require.True(t, newCmd.Result.DisableResolveMessage) }) diff --git a/pkg/services/datasources/service/datasource_test.go b/pkg/services/datasources/service/datasource_test.go index b06cb9913fa..cd22275f6a0 100644 --- a/pkg/services/datasources/service/datasource_test.go +++ b/pkg/services/datasources/service/datasource_test.go @@ -542,7 +542,7 @@ func TestService_GetHttpTransport(t *testing.T) { func TestService_getTimeout(t *testing.T) { cfg := &setting.Cfg{} originalTimeout := sdkhttpclient.DefaultTimeoutOptions.Timeout - sdkhttpclient.DefaultTimeoutOptions.Timeout = 60 * time.Second + sdkhttpclient.DefaultTimeoutOptions.Timeout = time.Minute t.Cleanup(func() { sdkhttpclient.DefaultTimeoutOptions.Timeout = originalTimeout }) @@ -551,9 +551,9 @@ func TestService_getTimeout(t *testing.T) { jsonData *simplejson.Json expectedTimeout time.Duration }{ - {jsonData: simplejson.New(), expectedTimeout: 60 * time.Second}, - {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: 60 * time.Second}, - {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: 60 * time.Second}, + {jsonData: simplejson.New(), expectedTimeout: time.Minute}, + {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: time.Minute}, + {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: time.Minute}, {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 1}), expectedTimeout: time.Second}, {jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": "2"}), expectedTimeout: 2 * time.Second}, } diff --git a/pkg/services/live/pipeline/devdata.go b/pkg/services/live/pipeline/devdata.go index 3d6b8ad7e54..db7c278bf79 100644 --- a/pkg/services/live/pipeline/devdata.go +++ b/pkg/services/live/pipeline/devdata.go @@ -32,7 +32,7 @@ type Data struct { func postTestData() { i := 0 for { - time.Sleep(1000 * time.Millisecond) + time.Sleep(time.Second) num1 := rand.Intn(10) num2 := rand.Intn(10) d := Data{ diff --git a/pkg/services/live/runstream/manager.go b/pkg/services/live/runstream/manager.go index 8e96da34cfb..f4ab4d7b134 100644 --- a/pkg/services/live/runstream/manager.go +++ b/pkg/services/live/runstream/manager.go @@ -75,7 +75,7 @@ func WithCheckConfig(interval time.Duration, maxChecks int) ManagerOption { const ( defaultCheckInterval = 5 * time.Second - defaultDatasourceCheckInterval = 60 * time.Second + defaultDatasourceCheckInterval = time.Minute defaultMaxChecks = 3 ) diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go index 385375537cd..4f7a36a69a2 100644 --- a/pkg/services/ngalert/image/service.go +++ b/pkg/services/ngalert/image/service.go @@ -21,8 +21,8 @@ import ( ) const ( - screenshotCacheTTL = 60 * time.Second screenshotTimeout = 10 * time.Second + screenshotCacheTTL = time.Minute ) // DeleteExpiredService is a service to delete expired images. diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go index 4b076ff8c31..48efde7c517 100644 --- a/pkg/services/ngalert/notifier/alertmanager_test.go +++ b/pkg/services/ngalert/notifier/alertmanager_test.go @@ -38,7 +38,7 @@ func setupAMTest(t *testing.T) *Alertmanager { s := &store.DBstore{ Cfg: setting.UnifiedAlertingSettings{ BaseInterval: 10 * time.Second, - DefaultRuleEvaluationInterval: 60 * time.Second, + DefaultRuleEvaluationInterval: time.Minute, }, SQLStore: sqlStore, Logger: log.New("alertmanager-test"), diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go index 06974b44089..69a8d792093 100644 --- a/pkg/services/ngalert/state/manager_test.go +++ b/pkg/services/ngalert/state/manager_test.go @@ -2170,7 +2170,7 @@ func printAllAnnotations(annos map[int64]annotations.Item) string { func TestStaleResultsHandler(t *testing.T) { evaluationTime := time.Now() - interval := 60 * time.Second + interval := time.Minute ctx := context.Background() _, dbstore := tests.SetupTestEnv(t, 1) diff --git a/pkg/services/ngalert/state/state_test.go b/pkg/services/ngalert/state/state_test.go index b86037d4bc7..b99fd3e32ab 100644 --- a/pkg/services/ngalert/state/state_test.go +++ b/pkg/services/ngalert/state/state_test.go @@ -202,7 +202,7 @@ func TestSetEndsAt(t *testing.T) { name: "more than resend delay: for=1m,interval=5m - endsAt = interval * 3", expected: evaluationTime.Add(time.Second * 300 * 3), testRule: &ngmodels.AlertRule{ - For: 60 * time.Second, + For: time.Minute, IntervalSeconds: 300, }, }, diff --git a/pkg/setting/setting_unified_alerting.go b/pkg/setting/setting_unified_alerting.go index 1d8fcbb3ed7..6e0ee10df70 100644 --- a/pkg/setting/setting_unified_alerting.go +++ b/pkg/setting/setting_unified_alerting.go @@ -20,7 +20,7 @@ const ( alertmanagerDefaultPeerTimeout = 15 * time.Second alertmanagerDefaultGossipInterval = cluster.DefaultGossipInterval alertmanagerDefaultPushPullInterval = cluster.DefaultPushPullInterval - alertmanagerDefaultConfigPollInterval = 60 * time.Second + alertmanagerDefaultConfigPollInterval = time.Minute // To start, the alertmanager needs at least one route defined. // TODO: we should move this to Grafana settings and define this as the default. alertmanagerDefaultConfiguration = `{ @@ -45,7 +45,7 @@ const ( } ` evaluatorDefaultEvaluationTimeout = 30 * time.Second - schedulerDefaultAdminConfigPollInterval = 60 * time.Second + schedulerDefaultAdminConfigPollInterval = time.Minute schedulereDefaultExecuteAlerts = true schedulerDefaultMaxAttempts = 3 schedulerDefaultLegacyMinInterval = 1 diff --git a/pkg/setting/setting_unified_alerting_test.go b/pkg/setting/setting_unified_alerting_test.go index 5968688483c..92fa07648ad 100644 --- a/pkg/setting/setting_unified_alerting_test.go +++ b/pkg/setting/setting_unified_alerting_test.go @@ -17,14 +17,14 @@ func TestCfg_ReadUnifiedAlertingSettings(t *testing.T) { // It sets the correct defaults. { - require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval) - require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval) + require.Equal(t, time.Minute, cfg.UnifiedAlerting.AdminConfigPollInterval) + require.Equal(t, time.Minute, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval) require.Equal(t, 15*time.Second, cfg.UnifiedAlerting.HAPeerTimeout) require.Equal(t, "0.0.0.0:9094", cfg.UnifiedAlerting.HAListenAddr) require.Equal(t, "", cfg.UnifiedAlerting.HAAdvertiseAddr) require.Len(t, cfg.UnifiedAlerting.HAPeers, 0) require.Equal(t, 200*time.Millisecond, cfg.UnifiedAlerting.HAGossipInterval) - require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.HAPushPullInterval) + require.Equal(t, time.Minute, cfg.UnifiedAlerting.HAPushPullInterval) } // With peers set, it correctly parses them. @@ -66,7 +66,7 @@ func TestUnifiedAlertingSettings(t *testing.T) { verifyCfg: func(t *testing.T, cfg Cfg) { require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval) require.Equal(t, int64(6), cfg.UnifiedAlerting.MaxAttempts) - require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.MinInterval) + require.Equal(t, time.Minute, cfg.UnifiedAlerting.MinInterval) require.Equal(t, false, cfg.UnifiedAlerting.ExecuteAlerts) require.Equal(t, 90*time.Second, cfg.UnifiedAlerting.EvaluationTimeout) require.Equal(t, SchedulerBaseInterval, cfg.UnifiedAlerting.BaseInterval) diff --git a/pkg/tests/api/alerting/api_admin_configuration_test.go b/pkg/tests/api/alerting/api_admin_configuration_test.go index deeaec99eed..09d2be1a8ec 100644 --- a/pkg/tests/api/alerting/api_admin_configuration_test.go +++ b/pkg/tests/api/alerting/api_admin_configuration_test.go @@ -266,7 +266,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) { { require.Eventually(t, func() bool { return fakeAM1.AlertsCount() == 1 && fakeAM2.AlertsCount() == 1 - }, 60*time.Second, 5*time.Second) + }, time.Minute, 5*time.Second) } // Add an alertmanager datasource fot the other organisation diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go index b93ba732f16..291715cce88 100644 --- a/pkg/tsdb/cloudwatch/cloudwatch.go +++ b/pkg/tsdb/cloudwatch/cloudwatch.go @@ -63,7 +63,7 @@ const ( logStreamIdentifierInternal = "__logstream__grafana_internal__" alertMaxAttempts = 8 - alertPollPeriod = 1000 * time.Millisecond + alertPollPeriod = time.Second logsQueryMode = "Logs" // QueryTypes diff --git a/pkg/tsdb/cloudwatch/response_parser_test.go b/pkg/tsdb/cloudwatch/response_parser_test.go index 9cb2ff2980f..fb9c6494942 100644 --- a/pkg/tsdb/cloudwatch/response_parser_test.go +++ b/pkg/tsdb/cloudwatch/response_parser_test.go @@ -121,8 +121,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb1"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -136,8 +136,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb2"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -185,8 +185,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb1 Sum"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -200,8 +200,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb2 Average"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -248,8 +248,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb3"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -263,8 +263,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb4"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), @@ -307,8 +307,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb3"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{}, StatusCode: aws.String("Complete"), @@ -346,8 +346,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb3"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{}, StatusCode: aws.String("Complete"), @@ -432,8 +432,8 @@ func TestCloudWatchResponseParser(t *testing.T) { Label: aws.String("lb"), Timestamps: []*time.Time{ aws.Time(timestamp), - aws.Time(timestamp.Add(60 * time.Second)), - aws.Time(timestamp.Add(180 * time.Second)), + aws.Time(timestamp.Add(time.Minute)), + aws.Time(timestamp.Add(3 * time.Minute)), }, Values: []*float64{ aws.Float64(10), diff --git a/pkg/tsdb/intervalv2/intervalv2_test.go b/pkg/tsdb/intervalv2/intervalv2_test.go index d7adff32928..21b5a48abef 100644 --- a/pkg/tsdb/intervalv2/intervalv2_test.go +++ b/pkg/tsdb/intervalv2/intervalv2_test.go @@ -27,8 +27,8 @@ func TestIntervalCalculator_Calculate(t *testing.T) { {"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"}, {"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"}, {"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"}, - {"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 0, "2s"}, - {"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 1000, "5s"}, + {"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"}, + {"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"}, } for _, tc := range testCases { diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go index 705b35c5896..55705b9a73a 100644 --- a/pkg/tsdb/mssql/mssql_test.go +++ b/pkg/tsdb/mssql/mssql_test.go @@ -933,7 +933,7 @@ func TestMSSQL(t *testing.T) { } events := []*event{} - for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) { + for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) { events = append(events, &event{ TimeSec: t.Unix(), Description: "Someone deployed something", diff --git a/pkg/tsdb/mysql/mysql_test.go b/pkg/tsdb/mysql/mysql_test.go index 043902ce527..58142d23190 100644 --- a/pkg/tsdb/mysql/mysql_test.go +++ b/pkg/tsdb/mysql/mysql_test.go @@ -905,7 +905,7 @@ func TestIntegrationMySQL(t *testing.T) { require.NoError(t, err) events := []*event{} - for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) { + for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) { events = append(events, &event{ TimeSec: t.Unix(), Description: "Someone deployed something", diff --git a/pkg/tsdb/postgres/postgres_test.go b/pkg/tsdb/postgres/postgres_test.go index 3b5094231e6..e48c79c5ef9 100644 --- a/pkg/tsdb/postgres/postgres_test.go +++ b/pkg/tsdb/postgres/postgres_test.go @@ -1003,7 +1003,7 @@ func TestIntegrationPostgres(t *testing.T) { require.NoError(t, err) events := []*event{} - for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) { + for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) { events = append(events, &event{ TimeSec: t.Unix(), Description: "Someone deployed something",