diff --git a/test/integration/red_test_client.go b/test/integration/red_test_client.go index 2b745934f..e91f3f18e 100644 --- a/test/integration/red_test_client.go +++ b/test/integration/red_test_client.go @@ -18,7 +18,7 @@ import ( "github.com/grafana/beyla/test/integration/components/prom" ) -func testClientWithMethodAndStatusCode(t *testing.T, method string, statusCode int, traceIDLookup string) { +func testClientWithMethodAndStatusCode(t *testing.T, method string, statusCode int, traces bool, traceIDLookup string) { // Eventually, Prometheus would make this query visible pq := prom.Client{HostPort: prometheusHostPort} var results []prom.Result @@ -50,6 +50,10 @@ func testClientWithMethodAndStatusCode(t *testing.T, method string, statusCode i assert.LessOrEqual(t, 1, val) }) + if !traces { + return + } + var trace jaeger.Trace test.Eventually(t, testTimeout, func(t require.TestingT) { resp, err := http.Get(jaegerQueryURL + fmt.Sprintf("?service=pingclient&operation=%s", method)) @@ -83,6 +87,11 @@ func testClientWithMethodAndStatusCode(t *testing.T, method string, statusCode i } func testREDMetricsForClientHTTPLibrary(t *testing.T) { - testClientWithMethodAndStatusCode(t, "GET", 200, "0000000000000000") - testClientWithMethodAndStatusCode(t, "OPTIONS", 204, "0000000000000001") + testClientWithMethodAndStatusCode(t, "GET", 200, true, "0000000000000000") + testClientWithMethodAndStatusCode(t, "OPTIONS", 204, true, "0000000000000001") +} + +func testREDMetricsForClientHTTPLibraryNoTraces(t *testing.T) { + testClientWithMethodAndStatusCode(t, "GET", 200, false, "0000000000000000") + testClientWithMethodAndStatusCode(t, "OPTIONS", 204, false, "0000000000000001") } diff --git a/test/integration/suites_test.go b/test/integration/suites_test.go index d006b1633..e2750ca47 100644 --- a/test/integration/suites_test.go +++ b/test/integration/suites_test.go @@ -77,7 +77,7 @@ func TestSuiteClientPromScrape(t *testing.T) { ) require.NoError(t, err) require.NoError(t, compose.Up()) - t.Run("Client RED metrics", testREDMetricsForClientHTTPLibrary) + t.Run("Client RED metrics", testREDMetricsForClientHTTPLibraryNoTraces) t.Run("BPF pinning folder mounted", testBPFPinningMounted) require.NoError(t, compose.Close()) t.Run("BPF pinning folder unmounted", testBPFPinningUnmounted)