e2e: make sure ALS server is ready (envoyproxy#3816)

Signed-off-by: zirain <[email protected]>
guydc · Jul 22, 2024 · 98ef802 · 98ef802
1 parent d538ca7
commit 98ef802
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/test/e2e/tests/accesslog.go b/test/e2e/tests/accesslog.go
@@ -152,7 +152,22 @@ var ALSTest = suite.ConformanceTest{
 			routeNN := types.NamespacedName{Name: "accesslog-als", Namespace: ns}
 			gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 			gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(t, suite.Client, suite.TimeoutConfig, suite.ControllerName, kubernetes.NewGatewayRef(gwNN), routeNN)
-			preCount := ALSLogCount(t, suite)
+
+			preCount := 0
+			// make sure ALS server metric endpoint is ready
+			if err := wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute, true,
+				func(ctx context.Context) (bool, error) {
+					curCount, err := ALSLogCount(suite)
+					if err != nil {
+						t.Logf("failed to get log count from loki: %v", err)
+						return false, nil
+					}
+					preCount = curCount
+					return true, nil
+				}); err != nil {
+				t.Errorf("failed to get log count from loki: %v", err)
+			}
+
 			expectedResponse := httputils.ExpectedResponse{
 				Request: httputils.Request{
 					Path: "/als",
@@ -170,7 +185,11 @@ var ALSTest = suite.ConformanceTest{
 
 			if err := wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute, true,
 				func(ctx context.Context) (bool, error) {
-					curCount := ALSLogCount(t, suite)
+					curCount, err := ALSLogCount(suite)
+					if err != nil {
+						t.Logf("failed to get log count from loki: %v", err)
+						return false, nil
+					}
 					return preCount < curCount, nil
 				}); err != nil {
 				t.Errorf("failed to get log count from loki: %v", err)

diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go
@@ -369,18 +369,18 @@ func WaitForLoadBalancerAddress(t *testing.T, client client.Client, timeout time
 	return ipAddr, nil
 }
 
-func ALSLogCount(t *testing.T, suite *suite.ConformanceTestSuite) int {
+func ALSLogCount(suite *suite.ConformanceTestSuite) (int, error) {
 	metricPath, err := RetrieveURL(suite.Client, types.NamespacedName{
 		Namespace: "monitoring",
 		Name:      "envoy-als",
 	}, 19001, "/metrics")
 	if err != nil {
-		t.Fatalf("failed to get metric url: %v", err)
+		return -1, err
 	}
 
 	countMetric, err := RetrieveMetric(metricPath, "log_count", time.Second)
 	if err != nil {
-		t.Fatalf("failed to get metric: %v", err)
+		return -1, err
 	}
 
 	total := 0
@@ -390,7 +390,7 @@ func ALSLogCount(t *testing.T, suite *suite.ConformanceTestSuite) int {
 		}
 	}
 
-	return total
+	return total, nil
 }
 
 // QueryLogCountFromLoki queries log count from loki