newrelic-redis 1.1.0 → 1.2.0

data/lib/newrelic_redis/instrumentation.rb

@@ -5,10 +5,6 @@ require 'redis'
 #  Originally contributed by Ashley Martens of ngmoco
 #  Rewritten, reorganized, and repackaged by Evan Phoenix
 
-# defined?(::Redis) && !NewRelic::Control.instance['disable_redis']
-
-NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
-
 ::Redis::Client.class_eval do
 
   include NewRelic::Agent::MethodTracer
@@ -19,27 +15,27 @@ NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
   call_method = 
     ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
 
-    def call_with_newrelic_trace(*args)
-      if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
-        total_metric = 'Database/Redis/allWeb'
-      else
-        total_metric = 'Database/Redis/allOther'
-      end
+  def call_with_newrelic_trace(*args)
+    if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
+      total_metric = 'Database/Redis/allWeb'
+    else
+      total_metric = 'Database/Redis/allOther'
+    end
 
-      method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
-      metrics = ["Database/Redis/#{method_name.to_s.upcase}", total_metric]
+    method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
+    metrics = ["Database/Redis/#{method_name.to_s.upcase}", total_metric]
 
-      self.class.trace_execution_scoped(metrics) do
-        start = Time.now
+    self.class.trace_execution_scoped(metrics) do
+      start = Time.now
 
-        begin
-          call_without_newrelic_trace(*args)
-        ensure
-          s = NewRelic::Agent.instance.transaction_sampler
-          s.notice_nosql(args.inspect, (Time.now - start).to_f) rescue nil
-        end
+      begin
+        call_without_newrelic_trace(*args)
+      ensure
+        s = NewRelic::Agent.instance.transaction_sampler
+        s.notice_nosql(args.inspect, (Time.now - start).to_f) rescue nil
       end
     end
+  end
 
   alias_method :call_without_newrelic_trace, call_method
   alias_method call_method, :call_with_newrelic_trace

data/lib/newrelic_redis/version.rb

@@ -1,3 +1,3 @@
 class NewRelicRedis
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic-redis
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: newrelic-redis
-rubygems_version: 1.8.17
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Redis instrumentation for Newrelic.