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

Multitenant DynamoDB collector should use a string for the hash key.

Browse Source 
This is because the key is of the form "<userid>-<hour bucket>", but as I was testing without a userid, I didn't notice that "-<hour bucket>" was a valid number.
This commit is contained in:
Tom Wilkie
2016-04-06 13:23:31 +01:00
parent c9b323ff84
commit fd75e45715
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/multitenant/dynamo_collector.go
View File

@@ -65,7 +65,7 @@ func (c *dynamoDBCollector) CreateTables() error {
AttributeDefinitions: []*dynamodb.AttributeDefinition{
{
AttributeName: aws.String(hourField),
AttributeType: aws.String("N"),
AttributeType: aws.String("S"),
},
{
AttributeName: aws.String(tsField),
@@ -104,7 +104,7 @@ func (c *dynamoDBCollector) getRows(userid string, row int64, start, end time.Ti
KeyConditions: map[string]*dynamodb.Condition{
hourField: {
AttributeValueList: []*dynamodb.AttributeValue{
{N: aws.String(rowKey)},
{S: aws.String(rowKey)},
},
ComparisonOperator: aws.String("EQ"),
},
@@ -158,11 +158,11 @@ func (c *dynamoDBCollector) Report(ctx context.Context) (report.Report, error) {
// Queries will only every span 2 rows max.
if rowStart != rowEnd {
if result, err = c.getRows(userid, rowStart, start, now, result); err != nil {
return report.MakeReport(), nil
return report.MakeReport(), err
}
}
if result, err = c.getRows(userid, rowEnd, start, now, result); err != nil {
return report.MakeReport(), nil
return report.MakeReport(), err
}
return result, nil
}
@@ -186,7 +186,7 @@ func (c *dynamoDBCollector) Add(ctx context.Context, rep report.Report) error {
TableName: aws.String(tableName),
Item: map[string]*dynamodb.AttributeValue{
hourField: {
N: aws.String(rowKey),
S: aws.String(rowKey),
},
tsField: {
N: aws.String(strconv.FormatInt(now.UnixNano(), 10)),