Merge pull request #10360 from eduardoj/user_states_roles_measurements

Introduce measurements for user states and user roles

src/api/app/jobs/measurements_job.rb

@@ -2,7 +2,19 @@ class MeasurementsJob < ApplicationJob
   queue_as :quick
 
   def perform
+    return unless CONFIG['amqp_options']
+
     RabbitmqBus.send_to_bus('metrics', "group count=#{Group.count}")
-    RabbitmqBus.send_to_bus('metrics', "user in_beta=#{User.in_beta.count},in_rollout=#{User.in_rollout.count},count=#{User.count}")
+    RabbitmqBus.send_to_bus('metrics', "user in_beta=#{User.in_beta.count},in_rollout=#{User.in_rollout.count},count=#{User.count},#{role_fields},#{state_fields}")
+  end
+
+  private
+
+  def role_fields
+    Role.global.pluck(:title).map { |role_title| "#{role_title.downcase}=#{Role.find_by(title: role_title).users.count}" }.join(',')
+  end
+
+  def state_fields
+    User::STATES.map { |state| "#{state}=#{User.where(state: state).count}" }.join(',')
   end
 end