Skip to content

Commit c02003a

Browse files
sashamelentyevsashamelentyev
authored
Refactor time durations (grafana#58484)
This change uses `time.Second` in place of `1000 * time.Millisecond` and `time.Minute` in place of `60*time.Second`.
1 parent 6ac43c9 commit c02003a

File tree

18 files changed

+43
-43
lines changed

18 files changed

+43
-43
lines changed

‎pkg/components/imguploader/webdavuploader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type WebdavUploader struct {
2626
var netTransport = &http.Transport{
2727
Proxy: http.ProxyFromEnvironment,
2828
Dial: (&net.Dialer{
29-
Timeout: 60 * time.Second,
29+
Timeout: time.Minute,
3030
}).Dial,
3131
TLSHandshakeTimeout: 5 * time.Second,
3232
}

‎pkg/services/alerting/store_notification_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func TestIntegrationAlertNotificationSQLAccess(t *testing.T) {
285285
err := store.UpdateAlertNotification(context.Background(), newCmd)
286286
require.Nil(t, err)
287287
require.Equal(t, "NewName", newCmd.Result.Name)
288-
require.Equal(t, 60*time.Second, newCmd.Result.Frequency)
288+
require.Equal(t, time.Minute, newCmd.Result.Frequency)
289289
require.True(t, newCmd.Result.DisableResolveMessage)
290290
})
291291

‎pkg/services/datasources/service/datasource_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ func TestService_GetHttpTransport(t *testing.T) {
542542
func TestService_getTimeout(t *testing.T) {
543543
cfg := &setting.Cfg{}
544544
originalTimeout := sdkhttpclient.DefaultTimeoutOptions.Timeout
545-
sdkhttpclient.DefaultTimeoutOptions.Timeout = 60 * time.Second
545+
sdkhttpclient.DefaultTimeoutOptions.Timeout = time.Minute
546546
t.Cleanup(func() {
547547
sdkhttpclient.DefaultTimeoutOptions.Timeout = originalTimeout
548548
})
@@ -551,9 +551,9 @@ func TestService_getTimeout(t *testing.T) {
551551
jsonData *simplejson.Json
552552
expectedTimeout time.Duration
553553
}{
554-
{jsonData: simplejson.New(), expectedTimeout: 60 * time.Second},
555-
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: 60 * time.Second},
556-
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: 60 * time.Second},
554+
{jsonData: simplejson.New(), expectedTimeout: time.Minute},
555+
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": nil}), expectedTimeout: time.Minute},
556+
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 0}), expectedTimeout: time.Minute},
557557
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": 1}), expectedTimeout: time.Second},
558558
{jsonData: simplejson.NewFromAny(map[string]interface{}{"timeout": "2"}), expectedTimeout: 2 * time.Second},
559559
}

‎pkg/services/live/pipeline/devdata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type Data struct {
3232
func postTestData() {
3333
i := 0
3434
for {
35-
time.Sleep(1000 * time.Millisecond)
35+
time.Sleep(time.Second)
3636
num1 := rand.Intn(10)
3737
num2 := rand.Intn(10)
3838
d := Data{

‎pkg/services/live/runstream/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func WithCheckConfig(interval time.Duration, maxChecks int) ManagerOption {
7575

7676
const (
7777
defaultCheckInterval = 5 * time.Second
78-
defaultDatasourceCheckInterval = 60 * time.Second
78+
defaultDatasourceCheckInterval = time.Minute
7979
defaultMaxChecks = 3
8080
)
8181

‎pkg/services/ngalert/image/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
)
2222

2323
const (
24-
screenshotCacheTTL = 60 * time.Second
2524
screenshotTimeout = 10 * time.Second
25+
screenshotCacheTTL = time.Minute
2626
)
2727

2828
// DeleteExpiredService is a service to delete expired images.

‎pkg/services/ngalert/notifier/alertmanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func setupAMTest(t *testing.T) *Alertmanager {
3838
s := &store.DBstore{
3939
Cfg: setting.UnifiedAlertingSettings{
4040
BaseInterval: 10 * time.Second,
41-
DefaultRuleEvaluationInterval: 60 * time.Second,
41+
DefaultRuleEvaluationInterval: time.Minute,
4242
},
4343
SQLStore: sqlStore,
4444
Logger: log.New("alertmanager-test"),

‎pkg/services/ngalert/state/manager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2170,7 +2170,7 @@ func printAllAnnotations(annos map[int64]annotations.Item) string {
21702170

21712171
func TestStaleResultsHandler(t *testing.T) {
21722172
evaluationTime := time.Now()
2173-
interval := 60 * time.Second
2173+
interval := time.Minute
21742174

21752175
ctx := context.Background()
21762176
_, dbstore := tests.SetupTestEnv(t, 1)

‎pkg/services/ngalert/state/state_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func TestSetEndsAt(t *testing.T) {
202202
name: "more than resend delay: for=1m,interval=5m - endsAt = interval * 3",
203203
expected: evaluationTime.Add(time.Second * 300 * 3),
204204
testRule: &ngmodels.AlertRule{
205-
For: 60 * time.Second,
205+
For: time.Minute,
206206
IntervalSeconds: 300,
207207
},
208208
},

‎pkg/setting/setting_unified_alerting.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
alertmanagerDefaultPeerTimeout = 15 * time.Second
2121
alertmanagerDefaultGossipInterval = cluster.DefaultGossipInterval
2222
alertmanagerDefaultPushPullInterval = cluster.DefaultPushPullInterval
23-
alertmanagerDefaultConfigPollInterval = 60 * time.Second
23+
alertmanagerDefaultConfigPollInterval = time.Minute
2424
// To start, the alertmanager needs at least one route defined.
2525
// TODO: we should move this to Grafana settings and define this as the default.
2626
alertmanagerDefaultConfiguration = `{
@@ -45,7 +45,7 @@ const (
4545
}
4646
`
4747
evaluatorDefaultEvaluationTimeout = 30 * time.Second
48-
schedulerDefaultAdminConfigPollInterval = 60 * time.Second
48+
schedulerDefaultAdminConfigPollInterval = time.Minute
4949
schedulereDefaultExecuteAlerts = true
5050
schedulerDefaultMaxAttempts = 3
5151
schedulerDefaultLegacyMinInterval = 1

‎pkg/setting/setting_unified_alerting_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ func TestCfg_ReadUnifiedAlertingSettings(t *testing.T) {
1717

1818
// It sets the correct defaults.
1919
{
20-
require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
21-
require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval)
20+
require.Equal(t, time.Minute, cfg.UnifiedAlerting.AdminConfigPollInterval)
21+
require.Equal(t, time.Minute, cfg.UnifiedAlerting.AlertmanagerConfigPollInterval)
2222
require.Equal(t, 15*time.Second, cfg.UnifiedAlerting.HAPeerTimeout)
2323
require.Equal(t, "0.0.0.0:9094", cfg.UnifiedAlerting.HAListenAddr)
2424
require.Equal(t, "", cfg.UnifiedAlerting.HAAdvertiseAddr)
2525
require.Len(t, cfg.UnifiedAlerting.HAPeers, 0)
2626
require.Equal(t, 200*time.Millisecond, cfg.UnifiedAlerting.HAGossipInterval)
27-
require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.HAPushPullInterval)
27+
require.Equal(t, time.Minute, cfg.UnifiedAlerting.HAPushPullInterval)
2828
}
2929

3030
// With peers set, it correctly parses them.
@@ -66,7 +66,7 @@ func TestUnifiedAlertingSettings(t *testing.T) {
6666
verifyCfg: func(t *testing.T, cfg Cfg) {
6767
require.Equal(t, 120*time.Second, cfg.UnifiedAlerting.AdminConfigPollInterval)
6868
require.Equal(t, int64(6), cfg.UnifiedAlerting.MaxAttempts)
69-
require.Equal(t, 60*time.Second, cfg.UnifiedAlerting.MinInterval)
69+
require.Equal(t, time.Minute, cfg.UnifiedAlerting.MinInterval)
7070
require.Equal(t, false, cfg.UnifiedAlerting.ExecuteAlerts)
7171
require.Equal(t, 90*time.Second, cfg.UnifiedAlerting.EvaluationTimeout)
7272
require.Equal(t, SchedulerBaseInterval, cfg.UnifiedAlerting.BaseInterval)

‎pkg/tests/api/alerting/api_admin_configuration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
266266
{
267267
require.Eventually(t, func() bool {
268268
return fakeAM1.AlertsCount() == 1 && fakeAM2.AlertsCount() == 1
269-
}, 60*time.Second, 5*time.Second)
269+
}, time.Minute, 5*time.Second)
270270
}
271271

272272
// Add an alertmanager datasource fot the other organisation

‎pkg/tsdb/cloudwatch/cloudwatch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const (
6363
logStreamIdentifierInternal = "__logstream__grafana_internal__"
6464

6565
alertMaxAttempts = 8
66-
alertPollPeriod = 1000 * time.Millisecond
66+
alertPollPeriod = time.Second
6767
logsQueryMode = "Logs"
6868

6969
// QueryTypes

‎pkg/tsdb/cloudwatch/response_parser_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
121121
Label: aws.String("lb1"),
122122
Timestamps: []*time.Time{
123123
aws.Time(timestamp),
124-
aws.Time(timestamp.Add(60 * time.Second)),
125-
aws.Time(timestamp.Add(180 * time.Second)),
124+
aws.Time(timestamp.Add(time.Minute)),
125+
aws.Time(timestamp.Add(3 * time.Minute)),
126126
},
127127
Values: []*float64{
128128
aws.Float64(10),
@@ -136,8 +136,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
136136
Label: aws.String("lb2"),
137137
Timestamps: []*time.Time{
138138
aws.Time(timestamp),
139-
aws.Time(timestamp.Add(60 * time.Second)),
140-
aws.Time(timestamp.Add(180 * time.Second)),
139+
aws.Time(timestamp.Add(time.Minute)),
140+
aws.Time(timestamp.Add(3 * time.Minute)),
141141
},
142142
Values: []*float64{
143143
aws.Float64(10),
@@ -185,8 +185,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
185185
Label: aws.String("lb1 Sum"),
186186
Timestamps: []*time.Time{
187187
aws.Time(timestamp),
188-
aws.Time(timestamp.Add(60 * time.Second)),
189-
aws.Time(timestamp.Add(180 * time.Second)),
188+
aws.Time(timestamp.Add(time.Minute)),
189+
aws.Time(timestamp.Add(3 * time.Minute)),
190190
},
191191
Values: []*float64{
192192
aws.Float64(10),
@@ -200,8 +200,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
200200
Label: aws.String("lb2 Average"),
201201
Timestamps: []*time.Time{
202202
aws.Time(timestamp),
203-
aws.Time(timestamp.Add(60 * time.Second)),
204-
aws.Time(timestamp.Add(180 * time.Second)),
203+
aws.Time(timestamp.Add(time.Minute)),
204+
aws.Time(timestamp.Add(3 * time.Minute)),
205205
},
206206
Values: []*float64{
207207
aws.Float64(10),
@@ -248,8 +248,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
248248
Label: aws.String("lb3"),
249249
Timestamps: []*time.Time{
250250
aws.Time(timestamp),
251-
aws.Time(timestamp.Add(60 * time.Second)),
252-
aws.Time(timestamp.Add(180 * time.Second)),
251+
aws.Time(timestamp.Add(time.Minute)),
252+
aws.Time(timestamp.Add(3 * time.Minute)),
253253
},
254254
Values: []*float64{
255255
aws.Float64(10),
@@ -263,8 +263,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
263263
Label: aws.String("lb4"),
264264
Timestamps: []*time.Time{
265265
aws.Time(timestamp),
266-
aws.Time(timestamp.Add(60 * time.Second)),
267-
aws.Time(timestamp.Add(180 * time.Second)),
266+
aws.Time(timestamp.Add(time.Minute)),
267+
aws.Time(timestamp.Add(3 * time.Minute)),
268268
},
269269
Values: []*float64{
270270
aws.Float64(10),
@@ -307,8 +307,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
307307
Label: aws.String("lb3"),
308308
Timestamps: []*time.Time{
309309
aws.Time(timestamp),
310-
aws.Time(timestamp.Add(60 * time.Second)),
311-
aws.Time(timestamp.Add(180 * time.Second)),
310+
aws.Time(timestamp.Add(time.Minute)),
311+
aws.Time(timestamp.Add(3 * time.Minute)),
312312
},
313313
Values: []*float64{},
314314
StatusCode: aws.String("Complete"),
@@ -346,8 +346,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
346346
Label: aws.String("lb3"),
347347
Timestamps: []*time.Time{
348348
aws.Time(timestamp),
349-
aws.Time(timestamp.Add(60 * time.Second)),
350-
aws.Time(timestamp.Add(180 * time.Second)),
349+
aws.Time(timestamp.Add(time.Minute)),
350+
aws.Time(timestamp.Add(3 * time.Minute)),
351351
},
352352
Values: []*float64{},
353353
StatusCode: aws.String("Complete"),
@@ -432,8 +432,8 @@ func TestCloudWatchResponseParser(t *testing.T) {
432432
Label: aws.String("lb"),
433433
Timestamps: []*time.Time{
434434
aws.Time(timestamp),
435-
aws.Time(timestamp.Add(60 * time.Second)),
436-
aws.Time(timestamp.Add(180 * time.Second)),
435+
aws.Time(timestamp.Add(time.Minute)),
436+
aws.Time(timestamp.Add(3 * time.Minute)),
437437
},
438438
Values: []*float64{
439439
aws.Float64(10),

‎pkg/tsdb/intervalv2/intervalv2_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func TestIntervalCalculator_Calculate(t *testing.T) {
2727
{"from 15m to now and 100 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(15 * time.Minute)}, 100, "10s"},
2828
{"from 30m to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 0, "1s"},
2929
{"from 30m to now and 3000 resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(30 * time.Minute)}, 3000, "500ms"},
30-
{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 0, "2s"},
31-
{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(60 * time.Minute)}, 1000, "5s"},
30+
{"from 1h to now and default resolution", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 0, "2s"},
31+
{"from 1h to now and 1000 resoluion", backend.TimeRange{From: timeNow, To: timeNow.Add(time.Hour)}, 1000, "5s"},
3232
}
3333

3434
for _, tc := range testCases {

‎pkg/tsdb/mssql/mssql_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ func TestMSSQL(t *testing.T) {
933933
}
934934

935935
events := []*event{}
936-
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
936+
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
937937
events = append(events, &event{
938938
TimeSec: t.Unix(),
939939
Description: "Someone deployed something",

‎pkg/tsdb/mysql/mysql_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ func TestIntegrationMySQL(t *testing.T) {
905905
require.NoError(t, err)
906906

907907
events := []*event{}
908-
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
908+
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
909909
events = append(events, &event{
910910
TimeSec: t.Unix(),
911911
Description: "Someone deployed something",

‎pkg/tsdb/postgres/postgres_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ func TestIntegrationPostgres(t *testing.T) {
10031003
require.NoError(t, err)
10041004

10051005
events := []*event{}
1006-
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), 60*time.Minute, 25*time.Minute) {
1006+
for _, t := range genTimeRangeByInterval(fromStart.Add(-20*time.Minute), time.Hour, 25*time.Minute) {
10071007
events = append(events, &event{
10081008
TimeSec: t.Unix(),
10091009
Description: "Someone deployed something",

0 commit comments

Comments
 (0)