From: William Dauchy <wdauchy@gmail.com>
Date: Mon, 11 Jan 2021 19:07:48 +0000 (+0100)
Subject: MINOR: contrib/prometheus-exporter: avoid connection close header
X-Git-Tag: v2.4-dev6~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1704efee89c9a0d430e63e7a9b54e97644d27a2a;p=thirdparty%2Fhaproxy.git

MINOR: contrib/prometheus-exporter: avoid connection close header

it does not seem to have a reason to close connections after each
request; reflect that in tests by doing all requests within the same
client.

Signed-off-by: William Dauchy <wdauchy@gmail.com>
---

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index beca87959d..63ccdd155d 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -2459,7 +2459,6 @@ static int promex_send_headers(struct appctx *appctx, struct stream_interface *s
 		goto full;
 	sl->info.res.status = 200;
 	if (!htx_add_header(htx, ist("Cache-Control"), ist("no-cache")) ||
-	    !htx_add_header(htx, ist("Connection"), ist("close")) ||
 	    !htx_add_header(htx, ist("Content-Type"), ist("text/plain; version=0.0.4")) ||
 	    !htx_add_header(htx, ist("Transfer-Encoding"), ist("chunked")) ||
 	    !htx_add_endof(htx, HTX_BLK_EOH))
diff --git a/reg-tests/contrib/prometheus.vtc b/reg-tests/contrib/prometheus.vtc
index 64b9cc0bc8..59ff82d5b9 100644
--- a/reg-tests/contrib/prometheus.vtc
+++ b/reg-tests/contrib/prometheus.vtc
@@ -37,22 +37,12 @@ client c1 -connect ${h1_stats_sock} {
 	expect resp.body ~ ".*haproxy_frontend.*"
 	expect resp.body ~ ".*haproxy_backend.*"
 	expect resp.body ~ ".*haproxy_server.*"
-} -run
-
-client c2 -connect ${h1_stats_sock} {
-	txreq -url "/metrics?scope"
-	rxresp
-	expect resp.status == 400
-} -run
 
-client c3 -connect ${h1_stats_sock} {
 	txreq -url "/metrics?scope="
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 0
-} -run
 
-client c4 -connect ${h1_stats_sock} {
 	txreq -url "/metrics?scope=server"
 	rxresp
 	expect resp.status == 200
@@ -60,9 +50,7 @@ client c4 -connect ${h1_stats_sock} {
 	expect resp.body !~ ".*haproxy_frontend.*"
 	expect resp.body !~ ".*haproxy_backend.*"
 	expect resp.body ~ ".*haproxy_server.*"
-} -run
 
-client c5 -connect ${h1_stats_sock} {
 	txreq -url "/metrics?scope=frontend&scope=backend"
 	rxresp
 	expect resp.status == 200
@@ -70,4 +58,8 @@ client c5 -connect ${h1_stats_sock} {
 	expect resp.body ~ ".*haproxy_frontend.*"
 	expect resp.body ~ ".*haproxy_backend.*"
 	expect resp.body !~ ".*haproxy_server.*"
+
+	txreq -url "/metrics?scope"
+	rxresp
+	expect resp.status == 400
 } -run