Skip to content

Commit

Permalink
Flaky TestSQLAggregateWriteDataValues (TykTechnologies#485)
Browse files Browse the repository at this point in the history 
* refactoring TestSQLAggregateWriteDataValues

* removing sonarcloud from ci-tests.yml

* stop iterating over map as it maintans order

* adding fixed time
  • Loading branch information
@tbuchaillot
tbuchaillot authored Sep 8, 2022
1 parent fae5004 commit 46aeb3a
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 90 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/ci-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,4 @@ jobs:
if: ${{ github.event_name == 'push' }}
run: |
$(go env GOPATH)/bin/golangci-lint run --out-format checkstyle --timeout=300s --max-issues-per-linter=0 --max-same-issues=0 --issues-exit-code=0 ./... > golanglint.xml
sonarcloud:
if: ${{ always() }}
needs: test
uses: TykTechnologies/github-actions/.github/workflows/sonarcloud.yaml@main
with:
exclusions: ""
secrets:
GH_TOKEN: ${{ secrets.ORG_GH_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
194 changes: 114 additions & 80 deletions pumps/sql_aggregate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,89 +185,123 @@ func TestSQLAggregateWriteData(t *testing.T) {
}

func TestSQLAggregateWriteDataValues(t *testing.T) {
pmp := SQLAggregatePump{}
cfg := make(map[string]interface{})
cfg["type"] = "sqlite"
cfg["batch_size"] = 2
table := analytics.AggregateSQLTable
now := time.Date(2019, 1, 1, 0, 0, 0, 0, time.Local)
nowPlus10 := now.Add(10 * time.Minute)

err := pmp.Init(cfg)
if err != nil {
t.Fatal("SQL Pump Aggregate couldn't be initialized with err: ", err)
tcs := []struct {
testName string
assertion func(*testing.T, []analytics.SQLAnalyticsRecordAggregate)
records [][]interface{}
}{
{
testName: "only one writing",
records: [][]interface{}{
{
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 20}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 30}},
},
},
assertion: func(t *testing.T, dbRecords []analytics.SQLAnalyticsRecordAggregate) {
assert.Equal(t, 3, len(dbRecords))
assert.Equal(t, "apiid", dbRecords[0].Dimension)
assert.Equal(t, "api1", dbRecords[0].DimensionValue)
assert.Equal(t, 2, dbRecords[0].Code500)
assert.Equal(t, 5, dbRecords[0].Hits)
assert.Equal(t, 3, dbRecords[0].Success)
assert.Equal(t, 2, dbRecords[0].ErrorTotal)
assert.Equal(t, 14.0, dbRecords[0].RequestTime)
assert.Equal(t, 70.0, dbRecords[0].TotalRequestTime)
assert.Equal(t, float64(14), dbRecords[0].Latency)
assert.Equal(t, int64(70), dbRecords[0].TotalLatency)
assert.Equal(t, float64(16), dbRecords[0].UpstreamLatency)
assert.Equal(t, int64(80), dbRecords[0].TotalUpstreamLatency)
assert.Equal(t, int64(20), dbRecords[0].MaxLatency)
assert.Equal(t, int64(10), dbRecords[0].MinUpstreamLatency)
// checking if it has total dimension
assert.Equal(t, "total", dbRecords[2].DimensionValue)
assert.Equal(t, 5, dbRecords[2].Hits)
assert.Equal(t, now.Format(time.RFC3339), dbRecords[0].LastTime.Format(time.RFC3339))
},
},
{
testName: "two writings - on conflict",
records: [][]interface{}{
{
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 20}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 30}},
},
{
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: nowPlus10, Latency: analytics.Latency{Total: 10, Upstream: 5}},
analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 500, TimeStamp: nowPlus10, Latency: analytics.Latency{Total: 30, Upstream: 10}},
},
},
assertion: func(t *testing.T, dbRecords []analytics.SQLAnalyticsRecordAggregate) {
assert.Equal(t, 3, len(dbRecords))
assert.Equal(t, "apiid", dbRecords[0].Dimension)
assert.Equal(t, "api1", dbRecords[0].DimensionValue)
assert.Equal(t, 3, dbRecords[0].Code500)
assert.Equal(t, 7, dbRecords[0].Hits)
assert.Equal(t, 4, dbRecords[0].Success)
assert.Equal(t, 3, dbRecords[0].ErrorTotal)
assert.Equal(t, 12.857142857142858, dbRecords[0].RequestTime)
assert.Equal(t, 90.0, dbRecords[0].TotalRequestTime)
assert.Equal(t, 15.714285714285714, dbRecords[0].Latency)
assert.Equal(t, int64(110), dbRecords[0].TotalLatency)
assert.Equal(t, 13.571428571428571, dbRecords[0].UpstreamLatency)
assert.Equal(t, int64(95), dbRecords[0].TotalUpstreamLatency)
assert.Equal(t, int64(30), dbRecords[0].MaxLatency)
assert.Equal(t, int64(5), dbRecords[0].MinUpstreamLatency)
assert.Equal(t, nowPlus10.Minute(), dbRecords[0].LastTime.Minute(), "last time incorrect")
assert.Equal(t, "total", dbRecords[2].DimensionValue)
assert.Equal(t, 7, dbRecords[2].Hits)
assert.Equal(t, nowPlus10.Format("2006-01-02 15:04:05-07:00"), dbRecords[0].LastTime.Format("2006-01-02 15:04:05-07:00"))
},
},
}
defer func(table string) {
pmp.db.Migrator().DropTable(analytics.AggregateSQLTable)
}(table)

now := time.Now()
keys := make([]interface{}, 5)
keys[0] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}}
keys[1] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}}
keys[2] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 10, Upstream: 10}}
keys[3] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 200, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 20}}
keys[4] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 20, ResponseCode: 500, TimeStamp: now, Latency: analytics.Latency{Total: 20, Upstream: 30}}

err = pmp.WriteData(context.TODO(), keys)
if err != nil {
t.Fatal(err.Error())
}
table := analytics.AggregateSQLTable
dbRecords := []analytics.SQLAnalyticsRecordAggregate{}
if err := pmp.db.Table(table).Find(&dbRecords).Error; err != nil {
t.Fatal("Error getting analytics records from SQL")
return
}
for _, tc := range tcs {
t.Run(tc.testName, func(t *testing.T) {
// Configure and Initialise pump first
dbRecords := []analytics.SQLAnalyticsRecordAggregate{}

assert.Equal(t, 3, len(dbRecords))
assert.Equal(t, "apiid", dbRecords[0].Dimension)
assert.Equal(t, "api1", dbRecords[0].DimensionValue)
assert.Equal(t, 2, dbRecords[0].Code500)
assert.Equal(t, 5, dbRecords[0].Hits)
assert.Equal(t, 3, dbRecords[0].Success)
assert.Equal(t, 2, dbRecords[0].ErrorTotal)
assert.Equal(t, 14.0, dbRecords[0].RequestTime)
assert.Equal(t, 70.0, dbRecords[0].TotalRequestTime)
assert.Equal(t, float64(14), dbRecords[0].Latency)
assert.Equal(t, int64(70), dbRecords[0].TotalLatency)
assert.Equal(t, float64(16), dbRecords[0].UpstreamLatency)
assert.Equal(t, int64(80), dbRecords[0].TotalUpstreamLatency)
assert.Equal(t, int64(20), dbRecords[0].MaxLatency)
assert.Equal(t, int64(10), dbRecords[0].MinUpstreamLatency)
//checking if it has total dimension
assert.Equal(t, "total", dbRecords[2].DimensionValue)
assert.Equal(t, 5, dbRecords[2].Hits)
assert.Equal(t, now.Format(time.RFC3339), dbRecords[0].LastTime.Format(time.RFC3339))

//We check again to validate the ON CONFLICT CLAUSES
newKeys := make([]interface{}, 2)
newKeys[0] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 200, TimeStamp: now.Add(10 * time.Minute), Latency: analytics.Latency{Total: 10, Upstream: 5}}
newKeys[1] = analytics.AnalyticsRecord{OrgID: "1", APIID: "api1", RequestTime: 10, ResponseCode: 500, TimeStamp: now.Add(10 * time.Minute), Latency: analytics.Latency{Total: 30, Upstream: 10}}

err = pmp.WriteData(context.TODO(), newKeys)
if err != nil {
t.Fatal(err.Error())
}
dbRecords = []analytics.SQLAnalyticsRecordAggregate{}
if err := pmp.db.Table(table).Find(&dbRecords).Error; err != nil {
t.Fatal("Error getting analytics records from SQL")
}
pmp := SQLAggregatePump{}
cfg := make(map[string]interface{})
cfg["type"] = "sqlite"
cfg["batch_size"] = 1

err := pmp.Init(cfg)
if err != nil {
t.Fatal("SQL Pump Aggregate couldn't be initialized with err: ", err)
}
defer func(pmp SQLAggregatePump) {
err := pmp.db.Migrator().DropTable(analytics.AggregateSQLTable)
if err != nil {
t.Error(err)
}
}(pmp)
// Write the analytics records
for i := range tc.records {
err = pmp.WriteData(context.TODO(), tc.records[i])
if err != nil {
t.Fatal(err.Error())
}
}

// Fetch the analytics records from the db
if err := pmp.db.Table(table).Find(&dbRecords).Error; err != nil {
t.Fatal("Error getting analytics records from SQL")
return
}

assert.Equal(t, 3, len(dbRecords))
assert.Equal(t, "apiid", dbRecords[0].Dimension)
assert.Equal(t, "api1", dbRecords[0].DimensionValue)
assert.Equal(t, 3, dbRecords[0].Code500)
assert.Equal(t, 7, dbRecords[0].Hits)
assert.Equal(t, 4, dbRecords[0].Success)
assert.Equal(t, 3, dbRecords[0].ErrorTotal)
assert.Equal(t, 12.857142857142858, dbRecords[0].RequestTime)
assert.Equal(t, 90.0, dbRecords[0].TotalRequestTime)
assert.Equal(t, 15.714285714285714, dbRecords[0].Latency)
assert.Equal(t, int64(110), dbRecords[0].TotalLatency)
assert.Equal(t, 13.571428571428571, dbRecords[0].UpstreamLatency)
assert.Equal(t, int64(95), dbRecords[0].TotalUpstreamLatency)
assert.Equal(t, int64(30), dbRecords[0].MaxLatency)
assert.Equal(t, int64(5), dbRecords[0].MinUpstreamLatency)
assert.Equal(t, now.Add(10*time.Minute).Minute(), dbRecords[0].LastTime.Minute())
assert.Equal(t, "total", dbRecords[2].DimensionValue)
assert.Equal(t, 7, dbRecords[2].Hits)
assert.Equal(t, now.Add(10*time.Minute).Format("2006-01-02 15:04:05-07:00"), dbRecords[0].LastTime.Format("2006-01-02 15:04:05-07:00"))
// Validate
tc.assertion(t, dbRecords)
})
}
}

0 comments on commit 46aeb3a

Please sign in to comment.