feat: Add counter metric for http.send network requests (#7851)

Signed-off-by: Anivar A Aravind <[email protected]>

Author: anivar

v1/topdown/http.go

@@ -99,6 +99,7 @@ var (
 	requiredKeys                = ast.NewSet(ast.InternedTerm("method"), ast.InternedTerm("url"))
 	httpSendLatencyMetricKey    = "rego_builtin_http_send"
 	httpSendInterQueryCacheHits = httpSendLatencyMetricKey + "_interquery_cache_hits"
+	httpSendNetworkRequests     = httpSendLatencyMetricKey + "_network_requests"
 )
 
 type httpSendKey string
@@ -1535,6 +1536,9 @@ func (c *interQueryCache) ExecuteHTTPRequest() (*http.Response, error) {
 		return nil, handleHTTPSendErr(c.bctx, err)
 	}
 
+	// Increment counter for actual network requests
+	c.bctx.Metrics.Counter(httpSendNetworkRequests).Incr()
+
 	return executeHTTPRequest(c.httpReq, c.httpClient, c.req)
 }
 
@@ -1586,6 +1590,10 @@ func (c *intraQueryCache) ExecuteHTTPRequest() (*http.Response, error) {
 	if err != nil {
 		return nil, handleHTTPSendErr(c.bctx, err)
 	}
+
+	// Increment counter for actual network requests
+	c.bctx.Metrics.Counter(httpSendNetworkRequests).Incr()
+
 	return executeHTTPRequest(httpReq, httpClient, c.req)
 }
 

v1/topdown/http_test.go

@@ -3428,6 +3428,45 @@ func TestHTTPSendMetrics(t *testing.T) {
 			t.Fatalf("expected %d cache hits, got %d", exp, act)
 		}
 	})
+
+	t.Run("network requests", func(t *testing.T) {
+		// Test that network requests counter is incremented correctly
+		m := metrics.New()
+
+		// Test 1: Single request - verify counter increments
+		q := NewQuery(ast.MustParseBody(fmt.Sprintf(`http.send({"method": "get", "url": %q})`, ts.URL))).WithMetrics(m)
+		_, err := q.Run(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if exp, act := uint64(1), m.Counter(httpSendNetworkRequests).Value(); exp != act {
+			t.Fatalf("expected %d network requests, got %d", exp, act)
+		}
+
+		// Test 2: Another request to different URL
+		q2 := NewQuery(ast.MustParseBody(fmt.Sprintf(`http.send({"method": "get", "url": %q})`, ts.URL+"/other"))).WithMetrics(m)
+		_, err = q2.Run(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if exp, act := uint64(2), m.Counter(httpSendNetworkRequests).Value(); exp != act {
+			t.Fatalf("expected %d network requests, got %d", exp, act)
+		}
+
+		// Test 3: Request with error should still increment counter
+		badURL := "http://localhost:1" // Port 1 should fail quickly
+		q3 := NewQuery(ast.MustParseBody(fmt.Sprintf(`http.send({"method": "get", "url": %q, "raise_error": false})`, badURL))).WithMetrics(m)
+		_, err = q3.Run(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if exp, act := uint64(3), m.Counter(httpSendNetworkRequests).Value(); exp != act {
+			t.Fatalf("expected %d network requests including failed one, got %d", exp, act)
+		}
+	})
 }
 
 // Warning(philipc): This test cannot be run in parallel with other tests, due