Fix intermittent test failure (#91)

jemiahw · web-flow · commit 092a3ed79e3c · 2025-06-04T11:18:28.000-07:00
A number of Etre tests verify the server side metrics after performing some operation (create, update, delete, etc.). The existing assertions assume latency will be 0. Usually it is, but occasionaly on the GitHub servers running automated tests on the PR, the latency will be a few milliseconds. This causes the test to fail since the latency metric will have a value that doesn't match the 0 in the assertion.

To fix this, I've added a method "fixLatencyMetric". This method finds any latency metrics in the "expect" list and updates the value to match the corresponding metric from the "actual" list. To make sure the latency metric value is not garbage, fixLatencyMetrics also takes a max latency and asserts that the actual latency is between 0 and max. This way we still check the latency metric has some reasonable value, but we won't fail the test if the latency is a few milliseconds instead of 0.
diff --git a/api/bulk_write_test.go b/api/bulk_write_test.go
@@ -78,6 +78,7 @@ func TestPostEntitiesOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Created, IntVal: 2},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -129,6 +130,7 @@ func TestPostEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -164,6 +166,7 @@ func TestPostEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -196,6 +199,7 @@ func TestPostEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -224,6 +228,7 @@ func TestPostEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -309,6 +314,7 @@ func TestPutEntitiesOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Updated, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -357,6 +363,7 @@ func TestPutEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -381,6 +388,7 @@ func TestPutEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -412,7 +420,8 @@ func TestPutEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
-	assert.Equal(t, server.metricsrec.Called, expectMetrics)
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
+	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
 	// No patch (empty payload)
@@ -442,6 +451,7 @@ func TestPutEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -471,6 +481,7 @@ func TestPutEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -548,6 +559,7 @@ func TestDeleteEntitiesOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Deleted, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -596,6 +608,7 @@ func TestDeleteEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -620,6 +633,7 @@ func TestDeleteEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, server.metricsrec.Called, expectMetrics)
 
 	// ----------------------------------------------------------------------
@@ -651,5 +665,6 @@ func TestDeleteEntitiesErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
diff --git a/api/query_test.go b/api/query_test.go
@@ -66,6 +66,7 @@ func TestQueryBasic(t *testing.T) {
 		{Method: "Val", Metric: metrics.ReadMatch, IntVal: 3},              // len(testEntities)
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -110,6 +111,7 @@ func TestQueryBasic(t *testing.T) {
 		{Method: "Val", Metric: metrics.ReadMatch, IntVal: 3},              // len(testEntities)
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -152,6 +154,7 @@ func TestQueryBasic(t *testing.T) {
 		{Method: "Val", Metric: metrics.ReadMatch, IntVal: 3},                // len(testEntities)
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -205,6 +208,7 @@ func TestQueryNoMatches(t *testing.T) {
 		{Method: "Val", Metric: metrics.ReadMatch, IntVal: 0}, // no matching queries
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -250,6 +254,7 @@ func TestQueryErrorsDatabaseError(t *testing.T) {
 		{Method: "Inc", Metric: metrics.DbError, IntVal: 1}, // db error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -345,6 +350,7 @@ func TestQueryErrorsTimeout(t *testing.T) {
 		{Method: "Inc", Metric: metrics.QueryTimeout, IntVal: 1}, // query timeout
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -377,3 +383,21 @@ func TestResponseCompression(t *testing.T) {
 	// Make sure content type is correct
 	assert.Equal(t, "application/json", res.Header.Get("Content-Type"))
 }
+
+// fixLatencyMetric is a helper function that fixes the non-deterministic latency to ensure actual==expected for assertions.
+// Since latency is non-deterministic, it can cause tests to fail intermittently. This function replaces the latency metric
+// in the "expect" metrics with the "actual" value, so that the test can pass.
+// It also asserts that the actual latency is between 0 and the provided max value, to ensure that the latency is within acceptable limits.
+func fixLatencyMetric(t *testing.T, max int, expect, actual []mock.MetricMethodArgs) {
+	t.Helper()
+	if len(actual) != len(expect) {
+		// Something else is wrong, the test is going to fail anyway. Let it fail.
+		return
+	}
+	for i, _ := range actual {
+		if actual[i].Metric == metrics.LatencyMs && expect[i].Metric == metrics.LatencyMs && actual[i].Method == expect[i].Method {
+			assert.True(t, actual[i].IntVal >= 0 && actual[i].IntVal <= int64(max), "Latency metric value %d must be between 0 and %d.", actual[i].IntVal, max)
+			expect[i].IntVal = actual[i].IntVal
+		}
+	}
+}
diff --git a/api/single_entity_read_test.go b/api/single_entity_read_test.go
@@ -66,6 +66,7 @@ func TestGetEntityBasic(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -112,6 +113,7 @@ func TestGetEntityReturnLabels(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -152,6 +154,7 @@ func TestGetEntityNotFound(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -193,6 +196,7 @@ func TestGetEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -213,6 +217,7 @@ func TestGetEntityErrors(t *testing.T) {
 
 	// -- Metrics -----------------------------------------------------------
 	expectMetrics = []mock.MetricMethodArgs{}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -239,6 +244,7 @@ func TestGetEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.DbError, IntVal: 1}, // error
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -286,6 +292,7 @@ func TestGetEntityLabels(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ReadLabels, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
diff --git a/api/single_entity_write_test.go b/api/single_entity_write_test.go
@@ -81,6 +81,7 @@ func TestPostEntityOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Created, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -128,6 +129,7 @@ func TestPostEntityDuplicate(t *testing.T) {
 		{Method: "Inc", Metric: metrics.DbError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -177,6 +179,7 @@ func TestPostEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -207,6 +210,7 @@ func TestPostEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -234,6 +238,7 @@ func TestPostEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -309,6 +314,7 @@ func TestPutEntityOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Updated, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -359,6 +365,7 @@ func TestPutEntityDuplicate(t *testing.T) {
 		{Method: "Inc", Metric: metrics.DbError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -404,6 +411,7 @@ func TestPutEntityNotFound(t *testing.T) {
 		//{Method: "Inc", Metric: metrics.Updated, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -442,6 +450,7 @@ func TestPutEntityErrors(t *testing.T) {
 
 	// -- Metrics -----------------------------------------------------------
 	expectMetrics := []mock.MetricMethodArgs{}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -470,6 +479,7 @@ func TestPutEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -503,6 +513,7 @@ func TestPutEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -535,6 +546,7 @@ func TestPutEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// ----------------------------------------------------------------------
@@ -564,6 +576,7 @@ func TestPutEntityErrors(t *testing.T) {
 		{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 }
 
@@ -638,6 +651,7 @@ func TestDeleteEntityOK(t *testing.T) {
 		{Method: "Inc", Metric: metrics.Deleted, IntVal: 1},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------
@@ -711,6 +725,7 @@ func TestDeleteLabel(t *testing.T) {
 		{Method: "IncLabel", Metric: metrics.LabelDelete, StringVal: "foo"},
 		{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},
 	}
+	fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)
 	assert.Equal(t, expectMetrics, server.metricsrec.Called)
 
 	// -- Auth -----------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ func TestPostEntitiesOK(t *testing.T) {`
`78`	`78`	`{Method: "Inc", Metric: metrics.Created, IntVal: 2},`
`79`	`79`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`80`	`80`	`}`
	`81`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`81`	`82`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`82`	`83`
`83`	`84`	`// -- Auth -----------------------------------------------------------`
`@@ -129,6 +130,7 @@ func TestPostEntitiesErrors(t *testing.T) {`
`129`	`130`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},`
`130`	`131`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`131`	`132`	`}`
	`133`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`132`	`134`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`133`	`135`
`134`	`136`	`// ----------------------------------------------------------------------`
`@@ -164,6 +166,7 @@ func TestPostEntitiesErrors(t *testing.T) {`
`164`	`166`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},`
`165`	`167`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`166`	`168`	`}`
	`169`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`167`	`170`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`168`	`171`
`169`	`172`	`// ----------------------------------------------------------------------`
`@@ -196,6 +199,7 @@ func TestPostEntitiesErrors(t *testing.T) {`
`196`	`199`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},`
`197`	`200`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`198`	`201`	`}`
	`202`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`199`	`203`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`200`	`204`
`201`	`205`	`// ----------------------------------------------------------------------`
`@@ -224,6 +228,7 @@ func TestPostEntitiesErrors(t *testing.T) {`
`224`	`228`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1},`
`225`	`229`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`226`	`230`	`}`
	`231`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`227`	`232`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`228`	`233`	`}`
`229`	`234`
`@@ -309,6 +314,7 @@ func TestPutEntitiesOK(t *testing.T) {`
`309`	`314`	`{Method: "Inc", Metric: metrics.Updated, IntVal: 1},`
`310`	`315`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`311`	`316`	`}`
	`317`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`312`	`318`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`313`	`319`
`314`	`320`	`// -- Auth -----------------------------------------------------------`
`@@ -357,6 +363,7 @@ func TestPutEntitiesErrors(t *testing.T) {`
`357`	`363`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`358`	`364`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`359`	`365`	`}`
	`366`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`360`	`367`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`361`	`368`
`362`	`369`	`// ----------------------------------------------------------------------`
`@@ -381,6 +388,7 @@ func TestPutEntitiesErrors(t *testing.T) {`
`381`	`388`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`382`	`389`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`383`	`390`	`}`
	`391`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`384`	`392`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`385`	`393`
`386`	`394`	`// ----------------------------------------------------------------------`
`@@ -412,7 +420,8 @@ func TestPutEntitiesErrors(t *testing.T) {`
`412`	`420`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`413`	`421`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`414`	`422`	`}`
`415`		`- assert.Equal(t, server.metricsrec.Called, expectMetrics)`
	`423`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
	`424`	`+ assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`416`	`425`
`417`	`426`	`// ----------------------------------------------------------------------`
`418`	`427`	`// No patch (empty payload)`
`@@ -442,6 +451,7 @@ func TestPutEntitiesErrors(t *testing.T) {`
`442`	`451`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`443`	`452`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`444`	`453`	`}`
	`454`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`445`	`455`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`446`	`456`
`447`	`457`	`// ----------------------------------------------------------------------`
`@@ -471,6 +481,7 @@ func TestPutEntitiesErrors(t *testing.T) {`
`471`	`481`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`472`	`482`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`473`	`483`	`}`
	`484`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`474`	`485`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`475`	`486`	`}`
`476`	`487`
`@@ -548,6 +559,7 @@ func TestDeleteEntitiesOK(t *testing.T) {`
`548`	`559`	`{Method: "Inc", Metric: metrics.Deleted, IntVal: 1},`
`549`	`560`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`550`	`561`	`}`
	`562`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`551`	`563`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`552`	`564`
`553`	`565`	`// -- Auth -----------------------------------------------------------`
`@@ -596,6 +608,7 @@ func TestDeleteEntitiesErrors(t *testing.T) {`
`596`	`608`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`597`	`609`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`598`	`610`	`}`
	`611`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`599`	`612`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`600`	`613`
`601`	`614`	`// ----------------------------------------------------------------------`
`@@ -620,6 +633,7 @@ func TestDeleteEntitiesErrors(t *testing.T) {`
`620`	`633`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`621`	`634`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`622`	`635`	`}`
	`636`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`623`	`637`	`assert.Equal(t, server.metricsrec.Called, expectMetrics)`
`624`	`638`
`625`	`639`	`// ----------------------------------------------------------------------`
`@@ -651,5 +665,6 @@ func TestDeleteEntitiesErrors(t *testing.T) {`
`651`	`665`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`652`	`666`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`653`	`667`	`}`
	`668`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`654`	`669`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`655`	`670`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func TestGetEntityBasic(t *testing.T) {`
`66`	`66`	`{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},`
`67`	`67`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`68`	`68`	`}`
	`69`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`69`	`70`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`70`	`71`
`71`	`72`	`// -- Auth -----------------------------------------------------------`
`@@ -112,6 +113,7 @@ func TestGetEntityReturnLabels(t *testing.T) {`
`112`	`113`	`{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},`
`113`	`114`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`114`	`115`	`}`
	`116`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`115`	`117`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`116`	`118`
`117`	`119`	`// -- Auth -----------------------------------------------------------`
`@@ -152,6 +154,7 @@ func TestGetEntityNotFound(t *testing.T) {`
`152`	`154`	`{Method: "Inc", Metric: metrics.ReadId, IntVal: 1},`
`153`	`155`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`154`	`156`	`}`
	`157`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`155`	`158`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`156`	`159`	`}`
`157`	`160`
`@@ -193,6 +196,7 @@ func TestGetEntityErrors(t *testing.T) {`
`193`	`196`	`{Method: "Inc", Metric: metrics.ClientError, IntVal: 1}, // error`
`194`	`197`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`195`	`198`	`}`
	`199`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`196`	`200`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`197`	`201`
`198`	`202`	`// ----------------------------------------------------------------------`
`@@ -213,6 +217,7 @@ func TestGetEntityErrors(t *testing.T) {`
`213`	`217`
`214`	`218`	`// -- Metrics -----------------------------------------------------------`
`215`	`219`	`expectMetrics = []mock.MetricMethodArgs{}`
	`220`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`216`	`221`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`217`	`222`
`218`	`223`	`// ----------------------------------------------------------------------`
`@@ -239,6 +244,7 @@ func TestGetEntityErrors(t *testing.T) {`
`239`	`244`	`{Method: "Inc", Metric: metrics.DbError, IntVal: 1}, // error`
`240`	`245`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`241`	`246`	`}`
	`247`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`242`	`248`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`243`	`249`	`}`
`244`	`250`
`@@ -286,6 +292,7 @@ func TestGetEntityLabels(t *testing.T) {`
`286`	`292`	`{Method: "Inc", Metric: metrics.ReadLabels, IntVal: 1},`
`287`	`293`	`{Method: "Val", Metric: metrics.LatencyMs, IntVal: 0},`
`288`	`294`	`}`
	`295`	`+ fixLatencyMetric(t, 150, expectMetrics, server.metricsrec.Called)`
`289`	`296`	`assert.Equal(t, expectMetrics, server.metricsrec.Called)`
`290`	`297`
`291`	`298`	`// -- Auth -----------------------------------------------------------`