From 2fc2a7a09720f03962847b896b82d1cee525db8a Mon Sep 17 00:00:00 2001 From: Joel Johnson Date: Fri, 12 Mar 2021 15:46:50 -0500 Subject: [PATCH] Do not merge controller back in If a user defines a `default_tag :controller, nil`, then it cause the metrics to use `event.payload[:controller]` which is `"ApplicationController"` instead of `"application"`. --- lib/yabeda/rails.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/yabeda/rails.rb b/lib/yabeda/rails.rb index bfca67a..259c6c2 100644 --- a/lib/yabeda/rails.rb +++ b/lib/yabeda/rails.rb @@ -51,7 +51,8 @@ def install! status: event.payload[:status], format: event.payload[:format], method: event.payload[:method].downcase, - }.merge!(event.payload.slice(*Yabeda.default_tags.keys)) + } + labels.merge!(event.payload.slice(*Yabeda.default_tags.keys - labels.keys)) rails_requests_total.increment(labels) rails_request_duration.measure(labels, Yabeda::Rails.ms2s(event.duration))