github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use time.Duration instead of nanoseconds for constants

Browse Source
This commit is contained in:
Bryan Boreham
2019-09-13 07:31:07 +00:00
parent b5376facf2
commit 74b6a292d5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/multitenant/aws_collector.go
View File

@@ -31,10 +31,10 @@ const (
reportField = "report"
natsTimeout = 10 * time.Second
reportQuantisationInterval = 3000000000 // 3 seconds in nanoseconds
reportQuantisationInterval = 3 * time.Second
// Grace period allows for some gap between the timestamp on reports
// (assigned when they arrive at collector) and them appearing in DynamoDB query
gracePeriod = 500000000 // 1/2 second in nanoseconds
gracePeriod = 500 * time.Millisecond
)
var (
@@ -381,8 +381,8 @@ func (c *awsCollector) Report(ctx context.Context, timestamp time.Time) (report.
var reports []report.Report
// Fetch a merged report for each time quantum covering the window
startTS, endTS := start.UnixNano(), end.UnixNano()
ts := startTS - (startTS % reportQuantisationInterval)
for ; ts+reportQuantisationInterval+gracePeriod < endTS; ts += reportQuantisationInterval {
ts := startTS - (startTS % reportQuantisationInterval.Nanoseconds())
for ; ts+(reportQuantisationInterval+gracePeriod).Nanoseconds() < endTS; ts += reportQuantisationInterval.Nanoseconds() {
quantumReport, err := c.reportForQuantum(ctx, userid, reportKeys, ts)
if err != nil {
return report.MakeReport(), err
@@ -406,7 +406,7 @@ func (c *awsCollector) reportForQuantum(ctx context.Context, userid string, repo
if len(cached) == 1 {
return cached[key], nil
}
reports, err := c.reportsForKeysInRange(ctx, reportKeys, start, start+reportQuantisationInterval)
reports, err := c.reportsForKeysInRange(ctx, reportKeys, start, start+reportQuantisationInterval.Nanoseconds())
if err != nil {
return report.MakeReport(), err
}