stats: openmetrics: Do microsecond to seconds conversion only for duration values

Other metrics should be exported with their values unchanged.

diff --git a/src/stats/stats-service-openmetrics.c b/src/stats/stats-service-openmetrics.c
index 83832a3160b1b0db29a93b421e74848e36eb6797..b8c4c29494e11e3e90f3c3a70798ad8c027d793a 100644 (file)
--- a/src/stats/stats-service-openmetrics.c
+++ b/src/stats/stats-service-openmetrics.c
@@ -198,9 +198,12 @@ openmetrics_export_histogram_bucket(struct openmetrics_request *req,
        }
        if (bucket_limit == INTMAX_MAX)
                str_append(out, "le=\"+Inf\"");
-       else {
+       else if (strcmp(metric->group_by->field,
+                       STATS_EVENT_FIELD_NAME_DURATION) == 0) {
                /* Convert from microseconds to seconds */
                str_printfa(out, "le=\"%.6f\"", bucket_limit/1e6F);
+       } else {
+               str_printfa(out, "le=\"%jd\"", bucket_limit);
        }
        str_printfa(out, "} %"PRIu64"\n", count);
 }
@@ -246,8 +249,12 @@ openmetrics_export_histogram(struct openmetrics_request *req, string_t *out,
                str_append_str(out, req->labels);
                str_append_c(out, '}');
        }
-       /* Convert from microseconds to seconds */
-       str_printfa(out, " %.6f\n", sum/1e6F);
+       if (strcmp(metric->group_by->field,
+                  STATS_EVENT_FIELD_NAME_DURATION) == 0) {
+               /* Convert from microseconds to seconds */
+               sum /= 1e6F;
+       }
+       str_printfa(out, " %.6f\n", sum);
        /* Count */
        str_append(out, "dovecot_");
        str_append(out, metric->name);