From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 1 Jul 2024 08:33:03 +0000 (+0200)
Subject: BUG/MINOR: promex: Remove Help prefix repeated twice for each metric
X-Git-Tag: v3.1-dev3~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b789cef91f5ac6123b130f5474b44fb7c57106ae;p=thirdparty%2Fhaproxy.git

BUG/MINOR: promex: Remove Help prefix repeated twice for each metric

When the support for modules was added, the function producing the #HELP
line of each metric was refactored. Since then, the prefix "#HELP
<metric-name>" is printed twice because a code block was not removed. It is
now fixed.

This patch must be backported to 3.0.
---

diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 4e0bc68e10..99aa464825 100644
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -438,11 +438,6 @@ static int promex_dump_ts_header(const struct ist name, const struct ist desc, e
 			t = ist("gauge");
 	}
 
-	if (istcat(out, ist("# HELP "), max) == -1 ||
-	    istcat(out, name, max) == -1 ||
-	    istcat(out, ist(" "), max) == -1)
-		goto full;
-
 	if (istcat(out, ist("# HELP "), max) == -1 ||
 	    istcat(out, name, max) == -1 ||
 	    istcat(out, ist(" "), max) == -1 ||