github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-15 19:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename awsCollector.getReportKeys to reportKeysInRange

Browse Source 
...so we can recycle the former name.
This commit is contained in:
Matthias Radestock
2017-12-13 23:40:04 +00:00
parent 930c4b5383
commit 3a122aeed5
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

@@ -215,8 +215,8 @@ func (c *awsCollector) CreateTables() error {
return err
}
// getReportKeys gets the s3 keys for reports in this range
func (c *awsCollector) getReportKeys(ctx context.Context, userid string, row int64, start, end time.Time) ([]string, error) {
// reportKeysInRange returns the s3 keys for reports in the specified range
func (c *awsCollector) reportKeysInRange(ctx context.Context, userid string, row int64, start, end time.Time) ([]string, error) {
rowKey := fmt.Sprintf("%s-%s", userid, strconv.FormatInt(row, 10))
var resp *dynamodb.QueryOutput
err := instrument.TimeRequestHistogram(ctx, "DynamoDB.Query", dynamoRequestDuration, func(_ context.Context) error {
@@ -314,12 +314,12 @@ func (c *awsCollector) Report(ctx context.Context, timestamp time.Time) (report.
// Queries will only every span 2 rows max.
var reportKeys []string
if rowStart != rowEnd {
reportKeys1, err := c.getReportKeys(ctx, userid, rowStart, start, end)
reportKeys1, err := c.reportKeysInRange(ctx, userid, rowStart, start, end)
if err != nil {
return report.MakeReport(), err
}
reportKeys2, err := c.getReportKeys(ctx, userid, rowEnd, start, end)
reportKeys2, err := c.reportKeysInRange(ctx, userid, rowEnd, start, end)
if err != nil {
return report.MakeReport(), err
}
@@ -327,7 +327,7 @@ func (c *awsCollector) Report(ctx context.Context, timestamp time.Time) (report.
reportKeys = append(reportKeys, reportKeys1...)
reportKeys = append(reportKeys, reportKeys2...)
} else {
if reportKeys, err = c.getReportKeys(ctx, userid, rowEnd, start, end); err != nil {
if reportKeys, err = c.reportKeysInRange(ctx, userid, rowEnd, start, end); err != nil {
return report.MakeReport(), err
}
}