[EV-37][Indra] Select prometheus metrics when enabled over statsd

src/ziggurat/config.clj

@@ -99,7 +99,7 @@
   (get (ziggurat-config) :rabbit-mq))
 
 (defn prometheus-config []
-  (get config :prometheus))
+  (get (ziggurat-config) :prometheus))
 
 (defn statsd-config []
   (let [cfg (ziggurat-config)]

src/ziggurat/init.clj

@@ -147,14 +147,14 @@
   (set-properties-for-structured-logging))
 
 (defn start-common-states []
-  (start* #{#'metrics/statsd-reporter
+  (start* #{#'metrics/metrics-reporter
             #'sentry-reporter
             #'nrepl-server/server}))
 
 (defn stop-common-states []
   (mount/stop #'config/config
               #'sentry-reporter
-              #'metrics/statsd-reporter
+              #'metrics/metrics-reporter
               #'nrepl-server/server))
 
 (defn start

src/ziggurat/metrics.clj

@@ -1,7 +1,7 @@
 (ns ziggurat.metrics
   (:require [clojure.string :as str]
             [clojure.tools.logging :as log]
-            [ziggurat.config :refer [statsd-config ziggurat-config]]
+            [ziggurat.config :refer [statsd-config ziggurat-config prometheus-config]]
             [ziggurat.util.java-util :as util]
             [mount.core :refer [defstate]]
             [ziggurat.prometheus-exporter :as prometheus-exporter]
@@ -34,14 +34,20 @@
   (let [metrics-impl-constructor (get-metrics-implementor-constructor)]
     (reset! metric-impl (metrics-impl-constructor))))
 
-(defstate statsd-reporter
+(def prometheus-enabled?
+  (:enabled (prometheus-config)))
+
+(defstate metrics-reporter
   :start (do (log/info "Initializing Metrics")
-             (prometheus-exporter/start-http-server)
-             (initialise-metrics-library)
-             (metrics-interface/initialize @metric-impl (statsd-config)))
+             (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")
-            (prometheus-exporter/stop-http-server)
-            (metrics-interface/terminate @metric-impl)))
+            (if prometheus-enabled?
+              (prometheus-exporter/stop-http-server)
+              (metrics-interface/terminate @metric-impl))))
 
 (defn intercalate-dot
   [names]
@@ -96,8 +102,9 @@
          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]
-       (prometheus-exporter/update-counter metric-ns metric tags signed-int-value)
-       (metrics-interface/update-counter @metric-impl metric-ns metric tags signed-int-value)))))
+       (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))))))
 
 (def increment-count (partial inc-or-dec-count +))
 
@@ -116,8 +123,9 @@
          integer-value                  (get-int val)
          metric                          "all"]
      (doseq [metric-ns intercalated-metric-namespaces]
-       (prometheus-exporter/report-histogram metric-ns metric tags integer-value)
-       (metrics-interface/update-timing @metric-impl metric-ns metric tags integer-value)))))
+       (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))))))
 
 (defn report-time
   "This function is an alias for `report-histogram`.

test/ziggurat/fixtures.clj

@@ -61,9 +61,9 @@
       (mount/stop)))
 
 (defn mount-metrics [f]
-  (mount/start (mount/only [#'metrics/statsd-reporter]))
+  (mount/start (mount/only [#'metrics/metrics-reporter]))
   (f)
-  (mount/stop #'metrics/statsd-reporter))
+  (mount/stop #'metrics/metrics-reporter))
 
 (defn mount-config-with-tracer [f]
   (mount-config)

test/ziggurat/metrics_test.clj

@@ -19,7 +19,7 @@
 
 (deftest increment-count-test
   (with-redefs [config (assoc-in config [:ziggurat :metrics :constructor] "ziggurat.util.mock-metrics-implementation/->MockImpl")]
-    (mount/start (mount/only [#'metrics/statsd-reporter]))
+    (mount/start (mount/only [#'metrics/metrics-reporter]))
     (let [passed-metric-name         "metric3"
           expected-topic-entity-name "expected-topic-entity-name"
           input-tags                 {:topic_name expected-topic-entity-name}
@@ -114,11 +114,11 @@
                                                     (reset! increment-count-called? true)))]
             (metrics/-incrementCount metric-namespace passed-metric-name tags)
             (is (true? @increment-count-called?))))))
-    (mount/stop #'metrics/statsd-reporter)))
+    (mount/stop #'metrics/metrics-reporter)))
 
 (deftest decrement-count-test
   (with-redefs [config (assoc-in config [:ziggurat :metrics :constructor] "ziggurat.util.mock-metrics-implementation/->MockImpl")]
-    (mount/start (mount/only [#'metrics/statsd-reporter]))
+    (mount/start (mount/only [#'metrics/metrics-reporter]))
     (let [expected-topic-name "expected-topic-name"
           passed-metric-name  "metric3"
           input-tags          {:topic_name expected-topic-name}
@@ -195,11 +195,11 @@
                                                     (reset! decrement-count-called? true)))]
             (metrics/-decrementCount metric-namespace passed-metric-name tags)
             (is (true? @decrement-count-called?))))))
-    (mount/stop #'metrics/statsd-reporter)))
+    (mount/stop #'metrics/metrics-reporter)))
 
 (deftest report-histogram-test
   (with-redefs [config (assoc-in config [:ziggurat :metrics :constructor] "ziggurat.util.mock-metrics-implementation/->MockImpl")]
-    (mount/start (mount/only [#'metrics/statsd-reporter]))
+    (mount/start (mount/only [#'metrics/metrics-reporter]))
     (let [topic-entity-name "expected-topic-entity-name"
           input-tags        {:topic_name topic-entity-name}
           time-val          10
@@ -265,7 +265,7 @@
                                                      (reset! report-histogram-called? true)))]
             (metrics/-reportTime metric-namespace time-val tags)
             (is (true? @report-histogram-called?))))))
-    (mount/stop #'metrics/statsd-reporter)))
+    (mount/stop #'metrics/metrics-reporter)))
 
 (deftest report-time-test
   (let [metric-namespace "metric-namespace"