Adds enabled toggle to tracer

gojek · Sep 26, 2019 · a0f425f · a0f425f
1 parent bc487c8
commit a0f425f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/resources/config.test.ci.edn b/resources/config.test.ci.edn
@@ -50,7 +50,8 @@
                                                       :channels             {:channel-1 {:worker-count [10 :int]
                                                                                          :retry        {:count   [5 :int]
                                                                                                         :enabled [true :bool]}}}}}
-            :tracer               {:jaeger_service_name       "test_service"
+            :tracer               {:enabled                   [true :bool]
+                                   :jaeger_service_name       "test_service"
                                    :jaeger_endpoint           "test_endpoint"
                                    :jaeger_reporter_log_spans [true :bool]}}}
 
diff --git a/resources/config.test.edn b/resources/config.test.edn
@@ -50,6 +50,7 @@
                                                       :channels             {:channel-1 {:worker-count [10 :int]
                                                                                          :retry        {:count   [5 :int]
                                                                                                         :enabled [true :bool]}}}}}
-            :tracer               {:jaeger_service_name       "test_service"
+            :tracer               {:enabled                   [true :bool]
+                                   :jaeger_service_name       "test_service"
                                    :jaeger_endpoint           "test_endpoint"
                                    :jaeger_reporter_log_spans [true :bool]}}}
diff --git a/src/ziggurat/tracer.clj b/src/ziggurat/tracer.clj
@@ -5,10 +5,10 @@
            (io.opentracing.noop NoopTracerFactory)))
 
 (defn- create-tracer []
-  (let [jaeger-service-name (-> (ziggurat-config) :tracer :jaeger_service_name)]
-    (if (nil? jaeger-service-name)
+  (let [tracer-config (:tracer (ziggurat-config))]
+    (if (or (nil? tracer-config) (false? (:enabled tracer-config)))
       (NoopTracerFactory/create)
-      (.getTracer (Configuration/fromEnv jaeger-service-name)))))
+      (.getTracer (Configuration/fromEnv (:jaeger_service_name tracer-config))))))
 
 (defstate tracer
   :start (create-tracer)

diff --git a/test/ziggurat/tracer_test.clj b/test/ziggurat/tracer_test.clj
@@ -13,6 +13,13 @@
     (mount/stop))
 
   (testing "should start NoopTracer when tracer is not enabled"
+    (fix/mount-config)
+    (with-redefs [ziggurat-config (fn [] {:tracer {:enabled false}})]
+      (mount/start (mount/only [#'tracer/tracer]))
+      (is (= "NoopTracerImpl" (.getSimpleName (.getClass tracer/tracer)))))
+    (mount/stop))
+
+  (testing "should start NoopTracer when tracer is not configured"
     (fix/mount-config)
     (with-redefs [ziggurat-config (fn [] {})]
       (mount/start (mount/only [#'tracer/tracer]))