fix test

Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com>

Author: zhaohuabing

test/e2e/testdata/dynamic-resolver-original-host-accesslog.yaml

@@ -31,7 +31,7 @@ spec:
         - format:
             type: JSON
             json:
-              x-request-id: "%REQ(X-REQUEST-ID)%"
+              test-id: "%REQ(X-EG-TEST-ID)%"
               http.host: "%REQ(HOST)%"
               http.original_host: "%REQ(X-ENVOY-ORIGINAL-HOST)%"
           matches:

test/e2e/tests/dynamic_resolver_original_host_accesslog.go

@@ -58,7 +58,7 @@ var DynamicResolverOriginalHostAccessLogTest = suite.ConformanceTest{
 				Path: "/original-host",
 				Headers: map[string]string{
 					"x-envoy-logged": "1",
-					"x-request-id":   requestID,
+					"x-eg-test-id":   requestID,
 				},
 			},
 			ExpectedRequest: &http.ExpectedRequest{
@@ -76,7 +76,7 @@ var DynamicResolverOriginalHostAccessLogTest = suite.ConformanceTest{
 		http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, expectedResponse)
 
 		labels := getOTELLabels(ns)
-		match := `\"x-request-id\":\"` + requestID + `\"`
+		match := `\"test-id\":\"` + requestID + `\"`
 
 		var matchedLog string
 		err := wait.PollUntilContextTimeout(context.Background(), time.Second, time.Minute, true, func(_ context.Context) (bool, error) {
@@ -94,15 +94,28 @@ var DynamicResolverOriginalHostAccessLogTest = suite.ConformanceTest{
 					continue
 				}
 
-				if gotRequestID, ok := entry["x-request-id"].(string); ok && gotRequestID == requestID {
+				if gotRequestID, ok := entry["test-id"].(string); ok && gotRequestID == requestID {
 					matchedLog = line
 					return true, nil
 				}
 			}
 
 			return false, nil
 		})
-		time.Sleep(5*time.Hour)
+		if err != nil {
+			lines, linesErr := QueryLogLinesFromLoki(t, suite.Client, labels, "")
+			if linesErr != nil {
+				tlog.Logf(t, "failed to query unfiltered log lines from loki: %v", linesErr)
+			} else {
+				tlog.Logf(t, "diagnostic: found %d unfiltered OTEL log lines", len(lines))
+				for i, line := range lines {
+					if i >= 10 {
+						break
+					}
+					tlog.Logf(t, "diagnostic unfiltered access log line %d: %s", i, line)
+				}
+			}
+		}
 		require.NoError(t, err, "timed out waiting for access log line for request id %s", requestID)
 
 		entry := map[string]string{}