garelic 0.0.2 → 0.1.0

data/README.md

@@ -1,14 +1,16 @@
-# Garelic: Google Analytics Reports as "New Relic"-like performance monitoring for your Rails app
+# Garelic: Use Google Analytics as "New Relic" performance monitoring for your Rails app
 
 This gem uses Google Analytics User Timing API to report application performance statistics directly to Google Analytics, where you can slice & dice your data as you wish.
 
 Here are some features with pictures:
 
-- [Showing average response times for each action](http://twitpic.com/b0gwkx/full)
-- [Identify slow page loads & drill down to different actions](http://twitpic.com/b0gump/full)
-- [Histogram of response times for an actions](http://twitpic.com/b0gv6e/full)
 - [Performance reports as a nice dashboard](http://twitpic.com/b0gt4j/full)
-
+- [Histogram of response times for action](http://twitpic.com/b0gv6e/full)
+- [Identify slow page loads & drill down to different actions](http://twitpic.com/b0gump/full)
+- [Showing average response times for each action](http://twitpic.com/b0gwkx/full)
+- [How much is spent in database & view generation for an action?](http://twitpic.com/b0h062/full)
+- [How has the switch to Ruby 1.9.3 affected response time?](http://twitpic.com/b11mxm/full)
+- [In which action do we spent most time globaly?](http://twitpic.com/b15l7j/full)
 
 *This is a proof of concept and will probably break things. Use it at your own risk.*
 
@@ -31,18 +33,20 @@ It's easy as 1-2-3.
 
         <%= Garelic::Timing %>
 
-          (function() {
+        (function() {
             var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-          })();
+        })();
     </script>
+    
+(Please note the `_gaq.push(['_setSiteSpeedSampleRate', 100]);` code for better testing.)
 
-*Step 3.* Go to Google Analytics > Content > Site speed > User Timings
+*Step 3.* Go to Google Analytics > Content > Site Speed > User Timings
 
 Enjoy!
 
-## Know advantages
+## Known advantages
 
 - it's free
 - shows slow performing pages (not only actions)

data/garelic.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/garelic/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Jan Suchal"]
   gem.email         = ["johno@jsmf.net"]
-  gem.description   = %q{Google Analytics Reports as "New Relic"-like performance monitoring for your Rails app}
+  gem.description   = %q{Use Google Analytics for Rails App Performance Monitoring}
   gem.summary       = %q{}
   gem.homepage      = "https://github.com/jsuchal/garelic"
 

data/lib/garelic/dispatcher.rb

@@ -3,9 +3,11 @@ module ActionController
     alias :dispatch_without_garelic :dispatch
 
     def dispatch(*args)
+      Garelic::Metrics.reset!
+
       response = dispatch_without_garelic(*args)
 
-      timing_data = Garelic.build_user_timing_from_payload(Thread.current[:garelic_payload])
+      timing_data = Garelic.report_user_timing_from_metrics(Garelic::Metrics)
 
       _, _, chunks = response
       chunks.each do |chunk|

data/lib/garelic/version.rb

@@ -1,3 +1,3 @@
 class Garelic
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/garelic.rb

@@ -4,13 +4,27 @@ require "garelic/dispatcher"
 class Garelic
   Timing = '<!-- /* GARELIC DATA */ -->'.html_safe
 
-  def self.build_user_timing_from_payload(payload)
-    action_identifier = "#{payload[:controller]}##{payload[:action]}"
+  def self.report_user_timing_from_metrics(metrics)
+    reports = report_user_timing_for_action(metrics[:action], metrics.action_identifier)
+    reports += report_user_timing_for_active_record(metrics[:active_record], metrics.action_identifier)
+
+    reports.join("\n")
+  end
+
+  def self.report_user_timing_for_action(metrics, action_identifier)
     [
-        track_timing('Garelic', 'Response (Total)', payload[:total_runtime], action_identifier),
-        track_timing('Garelic', 'Response (Views)', payload[:view_runtime], action_identifier),
-        track_timing('Garelic', 'Response (ActiveRecord)', payload[:db_runtime], action_identifier),
-    ].join("\n")
+        track_timing('Garelic (Controller)', 'Response time (Total)', metrics[:total_runtime], action_identifier),
+        track_timing('Garelic (Controller)', 'Response time (Views)', metrics[:view_runtime], action_identifier),
+        track_timing('Garelic (Controller)', 'Response time (ActiveRecord)', metrics[:db_runtime], action_identifier),
+    ]
+  end
+
+  def self.report_user_timing_for_active_record(metrics, action_identifier)
+    timings = []
+    metrics.each do |call_type, time|
+      timings << track_timing('Garelic (ActiveRecord)', call_type, time, action_identifier)
+    end
+    timings
   end
 
   def self.track_timing(category, variable, time, opt_label = nil, opt_sample = nil)
@@ -22,10 +36,48 @@ class Garelic
 
   class Railtie < Rails::Railtie
     initializer 'garelic.install_instrumentation' do
+      Garelic::Metrics.reset!
+
       ActiveSupport::Notifications.subscribe('process_action.action_controller') do |_, start, finish, _, payload|
-        payload[:total_runtime] = (finish - start) * 1000
-        Thread.current[:garelic_payload] = payload
+        Garelic::Metrics.report(:action, :db_runtime, payload[:db_runtime] || 0)
+        Garelic::Metrics.report(:action, :view_runtime, payload[:view_runtime] || 0)
+        Garelic::Metrics.report(:action, :total_runtime, (finish - start) * 1000)
+        Garelic::Metrics.action_identifier = "#{payload[:controller]}##{payload[:action]}"
+      end
+
+      ActiveSupport::Notifications.subscribe('sql.active_record') do |_, start, finish, _, payload|
+        type = payload[:name] || 'Other SQL'
+        Garelic::Metrics.report(:active_record, type, (finish - start) * 1000) if type != 'CACHE'
       end
     end
   end
+
+  class Metrics
+    def self.reset!
+      Thread.current[:garelic] = {}
+      Thread.current[:garelic_action] = nil
+    end
+
+    def self.action_identifier=(value)
+      Thread.current[:garelic_action] = value
+    end
+
+    def self.action_identifier
+      Thread.current[:garelic_action]
+    end
+
+    def self.report(category, variable, runtime, payload = nil)
+      metrics[category] ||= Hash.new(0)
+      metrics[category][variable] += runtime
+    end
+
+    def self.[](category)
+      metrics[category]
+    end
+
+    private
+    def self.metrics
+      Thread.current[:garelic]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garelic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies: []
-description: Google Analytics Reports as "New Relic"-like performance monitoring for
-  your Rails app
+description: Use Google Analytics for Rails App Performance Monitoring
 email:
 - johno@jsmf.net
 executables: []