From 0a7843d2420bf43d4f9d413b3f7af75fdcdfc142 Mon Sep 17 00:00:00 2001 From: Indrajith Indraprastham Date: Thu, 23 Nov 2023 12:55:54 +0530 Subject: [PATCH 1/2] [EV-37][Indra] convert metrics/prometheus-enabled? from def to defn --- src/ziggurat/metrics.clj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ziggurat/metrics.clj b/src/ziggurat/metrics.clj index b84f483a..1dc46c35 100644 --- a/src/ziggurat/metrics.clj +++ b/src/ziggurat/metrics.clj @@ -34,18 +34,18 @@ (let [metrics-impl-constructor (get-metrics-implementor-constructor)] (reset! metric-impl (metrics-impl-constructor)))) -(def prometheus-enabled? +(defn prometheus-enabled? [] (:enabled (prometheus-config))) (defstate metrics-reporter :start (do (log/info "Initializing Metrics") - (if prometheus-enabled? + (if (prometheus-enabled?) (prometheus-exporter/start-http-server) (do (initialise-metrics-library) (metrics-interface/initialize @metric-impl (statsd-config))))) :stop (do (log/info "Terminating Metrics") - (if prometheus-enabled? + (if (prometheus-enabled?) (prometheus-exporter/stop-http-server) (metrics-interface/terminate @metric-impl)))) @@ -102,7 +102,7 @@ tags (remove-topic-tag-for-old-namespace (get-all-tags (get-map additional-tags) metric-namespaces) metric-namespace) signed-int-value (sign (get-int n))] (doseq [metric-ns metric-namespaces] - (if prometheus-enabled? + (if (prometheus-enabled?) (prometheus-exporter/update-counter metric-ns metric tags signed-int-value) (metrics-interface/update-counter @metric-impl metric-ns metric tags signed-int-value)))))) @@ -123,7 +123,7 @@ integer-value (get-int val) metric "all"] (doseq [metric-ns intercalated-metric-namespaces] - (if prometheus-enabled? + (if (prometheus-enabled?) (prometheus-exporter/report-histogram metric-ns metric tags integer-value) (metrics-interface/update-timing @metric-impl metric-ns metric tags integer-value)))))) From c5224c8cba48360235c2fce8dc96926342f10b89 Mon Sep 17 00:00:00 2001 From: Indrajith Indraprastham Date: Thu, 23 Nov 2023 13:49:23 +0530 Subject: [PATCH 2/2] feat: prometheus-fix update test config file --- resources/config.test.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/config.test.edn b/resources/config.test.edn index 1387c34f..d9327c45 100644 --- a/resources/config.test.edn +++ b/resources/config.test.edn @@ -95,5 +95,5 @@ :custom-provider ""} :new-relic {:report-errors false} :prometheus {:port 8002 - :enabled true} + :enabled false} :log-format "text"}}