From cfa8bd020a07ae938e3d9ec38ae369d83d30fc21 Mon Sep 17 00:00:00 2001 From: Kartik Gupta Date: Thu, 18 Jul 2019 12:19:10 +0530 Subject: [PATCH] Adds tags for channels metrics --- src/ziggurat/mapper.clj | 2 +- test/ziggurat/mapper_test.clj | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ziggurat/mapper.clj b/src/ziggurat/mapper.clj index b23d599a..2cfeb5c3 100644 --- a/src/ziggurat/mapper.clj +++ b/src/ziggurat/mapper.clj @@ -62,7 +62,7 @@ default-namespace "message-processing" base-namespaces [service-name topic-entity-name channel-name] metric-namespaces (conj base-namespaces default-namespace) - additional-tags {:topic_name topic-entity-name} + additional-tags {:topic_name topic-entity-name :channel_name channel-name} default-namespaces [default-namespace] metric-namespace (str/join "." metric-namespaces) success-metric "success" diff --git a/test/ziggurat/mapper_test.clj b/test/ziggurat/mapper_test.clj index 09d48e43..fe45b09d 100644 --- a/test/ziggurat/mapper_test.clj +++ b/test/ziggurat/mapper_test.clj @@ -1,6 +1,5 @@ (ns ziggurat.mapper-test (:require [clojure.test :refer :all] - [langohr.channel :as lch] [schema.core :as s] [sentry-clj.async :refer [sentry-report]] [ziggurat.config :refer [ziggurat-config]] @@ -8,8 +7,7 @@ [ziggurat.mapper :refer :all] [ziggurat.messaging.connection :refer [connection]] [ziggurat.metrics :as metrics] - [ziggurat.util.rabbitmq :as rmq]) - (:import [ziggurat.mapper MessagePayload])) + [ziggurat.util.rabbitmq :as rmq])) (use-fixtures :once (join-fixtures [fix/init-rabbit-mq fix/silence-logging])) @@ -119,17 +117,17 @@ (is @reported-execution-time?)))))) (deftest channel-mapper-func-test - (let [service-name (:app-name (ziggurat-config)) + (let [channel :channel-1 + channel-name (name channel) + service-name (:app-name (ziggurat-config)) stream-routes {:default {:handler-fn #(constantly nil) - :channel-1 #(constantly nil)}} + channel #(constantly nil)}} topic (first (keys stream-routes)) message-payload {:message {:foo "bar"} :retry-count (:count (:retry (ziggurat-config))) :topic-entity topic} expected-topic-entity-name (name topic) - expected-additional-tags {:topic_name expected-topic-entity-name} - channel :channel-1 - channel-name (name channel) + expected-additional-tags {:topic_name expected-topic-entity-name :channel_name channel-name} default-namespace "message-processing" expected-metric-namespaces [expected-topic-entity-name channel default-namespace]] (testing "message process should be successful"