Merge pull request #24978 from code-dot-org/newrelic_user_custom_attr…

…ibute add user id as Custom Attribute to New Relic agent
code-dot-org · Sep 26, 2018 · 7fcc454 · 7fcc454
2 parents 070cdc7 + 36960e5
commit 7fcc454
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/dashboard/config/initializers/new_relic_user_attribute.rb b/dashboard/config/initializers/new_relic_user_attribute.rb
@@ -0,0 +1,8 @@
+if defined?(::NewRelic::Agent.add_custom_attributes) &&
+  defined?(::Warden::Manager.after_set_user)
+  ::Warden::Manager.after_set_user do |user, _auth, _opts|
+    if user.respond_to?(:id)
+      ::NewRelic::Agent.add_custom_attributes({user_id: user.id})
+    end
+  end
+end
diff --git a/shared/test/spy_newrelic_agent.rb b/shared/test/spy_newrelic_agent.rb
@@ -40,5 +40,13 @@ def self.get_events(regex)
         regex.match event.first
       end
     end
+
+    def self.add_custom_attributes(params)
+      (@@attributes ||= {}).merge!(params)
+    end
+
+    def self.custom_attributes
+      @@attributes ||= {}
+    end
   end
 end