Commit a08b1256 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.5' into maint-0.4.6

parents bc500804 3c73622f

changes/ticket40552

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (MetricsPort, Prometheus):

    - Add double quotes to the label values of the onion service metrics. Fixes

      bug 40552; bugfix on 0.4.5.1-alpha.

src/feature/hs/hs_metrics.c

+5 −1
Original line number Diff line number Diff line
@@ -32,12 +32,16 @@ port_to_str(const uint16_t port) 
/** Return a static buffer pointer that contains a formatted label on the form

 * of key=value.

 *

 * NOTE: Important, label values MUST NOT contain double quotes else, in the

 * case of Prometheus, it will fail with a malformed line because we force the

 * label value to be enclosed in double quotes.

 *

 * Subsequent call to this function invalidates the previous buffer. */

static const char *

format_label(const char *key, const char *value)

{

  static char buf[128];

  tor_snprintf(buf, sizeof(buf), "%s=%s", key, value);

  tor_snprintf(buf, sizeof(buf), "%s=\"%s\"", key, value);

  return buf;

}

src/test/test_metrics.c

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


#define TEST_METRICS_ENTRY_NAME    "entryA"

#define TEST_METRICS_ENTRY_HELP    "Description of entryA"

#define TEST_METRICS_ENTRY_LABEL_1 "label=farfadet"

#define TEST_METRICS_ENTRY_LABEL_2 "label=ponki"

#define TEST_METRICS_ENTRY_LABEL_1 "label=\"farfadet\""

#define TEST_METRICS_ENTRY_LABEL_2 "label=\"ponki\""



static void

set_metrics_port(or_options_t *options)