active-record-profiler 1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 211f71211f9004c489a7de54d5c5e59698d7597d
-  data.tar.gz: 956d9fbd435a5eaa6159e221fa4a7182532e6a70
+  metadata.gz: 1a7100d5c7531cd91b863eda7d33b18e4bf42f70
+  data.tar.gz: bff2d8ace930dbc38ce3a1ec2bc6a36ed9f6e33a
 SHA512:
-  metadata.gz: a7b4b502cbd6e098f23aa3666b1567954aedf24d4de83e69168a404216e914ed53c011a815b85ca8bcf5febe33bddf08330969631f28cc87a9f5474a119f3df5
-  data.tar.gz: a8e5101c041a79d1383039ac2ab661d832b3a6d054d19be37a3255f5d8eae71b3ce1af69f3445f64ced0dc667248751d0ff108f5c86f987227025e0e8bd906e3
+  metadata.gz: 983b8595fbeedc12c65082590033ff996adc409c044682cd8cb6ece0dc893353771c72fdb1b063d137a4f840cceb582f7a9cffafb41a15cd6f7ddbaa78320501
+  data.tar.gz: 4463447815648e31ca7ac8ace162fa9bcb22647510af5827e7867f3f8a9534c8fe829553ba6e483665d22f53005f12b4674922a7c60937d99350443b6abcf827

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/CHANGELOG.md

@@ -1,5 +1,15 @@
+# 1.1.0
+
+* Add self-profiling for the logger component
+* Prevent calling a logger.add block twice in the unusual case where the block returns a nil message.
+* Convert duration in events from milliseconds to seconds (doh!). You'll want to clear old profiler data when upgrading.
+* Don't accumulate statistics for queries fulfilled by the CACHE 
+
+# 1.0
+
+* Converted to Rails Engine, with mountable web interface
+* Simplified configuration somewhat
+
 # 0.1.0
 
 * Convert from plugin to gem
-
-TODO: Convert to an engine for the reports

data/README.md

@@ -1,5 +1,6 @@
 ActiveRecordProfiler
 ====================
+** Note: ** This gem is in transition from an old Rails 2.x plugin and still has some issues to iron out. In particular, using the notification system to track ActiveRecord query durations isn't as straightforward as it seems, so the times recorded by the profiler don't match the times ActiveRecord reports in the logs. It's still handy for tracking where your N+1 queries are coming from, thoug....
 
 The `active-record-profiler` gem adds a log formatter to improve the standard SQL logging and a log subscriber to provide profiler-like tracking of SQL statements generated by application code. The log formatter makes the SQL statements in your logs look like this (imagine it's all in one log line):
 

data/lib/active-record-profiler/log_subscriber.rb

@@ -2,11 +2,14 @@ require 'active_record/log_subscriber'
 
 module ActiveRecordProfiler
   class LogSubscriber < ActiveRecord::LogSubscriber
+    CACHE_PAYLOAD_NAME = 'CACHE'
+
     def sql(event)
       start_time = Time.now.to_f
       payload = event.payload
+      return if payload[:name] == CACHE_PAYLOAD_NAME
 
-      duration = event.duration
+      duration = event.duration / 1000.0  # convert from ms to seconds
       sql_string = payload[:sql]
 
       begin

data/lib/active-record-profiler/logger.rb

@@ -5,10 +5,13 @@ module ActiveRecordProfiler
 
     def add(severity, message = nil, progname = nil, &block)
       return true if (severity || ::Logger::Severity::UNKNOWN) < self.level
+      start_time = Time.now.to_f
 
+      called_block = false
       if message.nil?
         if block_given?
           message = yield
+          called_block = true
         else
           message = progname
           progname = self.progname
@@ -16,8 +19,18 @@ module ActiveRecordProfiler
       end
 
       message = add_call_site_to_message(message)
+      collector.record_self_info((Time.now.to_f - start_time), 'enhancing log line') if ActiveRecordProfiler::Collector.profile_self?
 
-      super(severity, message, progname, &block)
+      # We don't use super() here to pass control to the delegate because if we 
+      # do, there's no way to prevent super() from seeing the block and yielding
+      # to it, and if we've already yielded to the block, this could result in a
+      # double yield (if the message is nil after calling the block).
+      if called_block
+        # don't pass the block, since we already called it
+        __getobj__.add(severity, message, progname)
+      else  
+        __getobj__.add(severity, message, progname, &block)
+      end
     end
 
     # Define all of the basic logging methods so that they invoke our add()

data/lib/active-record-profiler/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordProfiler
-  VERSION = "1.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-record-profiler
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt