Make the identity map use the instrumentation infrastructure so we can style the messages nicely with colors (FIXME: Can someone look into why the test is not working?)

2 files changed, 18 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index 95a8e5cff7..4ad0b0d205 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -49,12 +49,15 @@ module ActiveRecord
       end
 
       def get(klass, primary_key)
-        obj = repository[klass.symbolized_base_class][primary_key]
-        if obj.is_a?(klass)
-          if ActiveRecord::Base.logger
-            ActiveRecord::Base.logger.debug "#{klass} with ID = #{primary_key} loaded from Identity Map"
-          end
-          obj
+        record = repository[klass.symbolized_base_class][primary_key]
+
+        if record.is_a?(klass)
+          ActiveSupport::Notifications.instrument("identity.active_record",
+            :line => "From Identity Map (id: #{primary_key})", 
+            :name => "#{klass} Loaded",
+            :connection_id => object_id)
+
+          record
         else
           nil
         end
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index d31e321440..3a015ee8c2 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -46,6 +46,15 @@ module ActiveRecord
       debug "  #{name}  #{sql}#{binds}"
     end
 
+    def identity(event)
+      return unless logger.debug?
+
+      name = color(event.payload[:name], odd? ? CYAN : MAGENTA, true)
+      line = odd? ? color(event.payload[:line], nil, true) : event.payload[:line]
+
+      debug "  #{name}  #{line}"
+    end
+
     def odd?
       @odd_or_even = !@odd_or_even
     end