newrelic-redis 1.3.2 → 1.4.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.4.0 / 2012-10-31
+
+HAPPY HALLOWEEN!
+
+ * 1 minor bugfix:
+   * Use DependencyDetection to load up properly
+
 === 1.3.2 / 2012-05-18
 
  * 1 minor bugfix:

data/lib/newrelic_redis/instrumentation.rb

@@ -1,87 +1,94 @@
 require 'new_relic/agent/method_tracer'
-require 'redis'
 
 # Redis instrumentation.
 #  Originally contributed by Ashley Martens of ngmoco
 #  Rewritten, reorganized, and repackaged by Evan Phoenix
 
-load_probes =
-  !NewRelic::Control.instance['disable_redis'] &&
-  ENV['NEWRELIC_ENABLE'].to_s !~ /false|off|no/i
+DependencyDetection.defer do
+  @name = :redis
 
-# load_probes checked as a post condition
-::Redis::Client.class_eval do
-
-  include NewRelic::Agent::MethodTracer
-
-  # Support older versions of Redis::Client that used the method
-  # +raw_call_command+.
-
-  call_method = 
-    ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
+  depends_on do
+    defined?(::Redis) &&
+      !NewRelic::Control.instance['disable_redis'] &&
+      ENV['NEWRELIC_ENABLE'].to_s !~ /false|off|no/i
+  end
 
-  def call_with_newrelic_trace(*args, &blk)
-    if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
-      total_metric = 'Database/Redis/allWeb'
-    else
-      total_metric = 'Database/Redis/allOther'
-    end
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Redis Instrumentation'
+  end
 
-    method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
-    metrics = ["Database/Redis/#{method_name.to_s.upcase}", total_metric]
+  executes do
+    ::Redis::Client.class_eval do
+      # Support older versions of Redis::Client that used the method
+      # +raw_call_command+.
 
-    self.class.trace_execution_scoped(metrics) do
-      start = Time.now
+      call_method = ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
 
-      begin
-        call_without_newrelic_trace(*args, &blk)
-      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
-
-  # Older versions of Redis handle pipelining completely differently.
-  # Don't bother supporting them for now.
-  #
-  if public_method_defined? :call_pipelined
-    def call_pipelined_with_newrelic_trace(commands, *rest)
-      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, &blk)
+        if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
+          total_metric = 'Database/Redis/allWeb'
+        else
+          total_metric = 'Database/Redis/allOther'
+        end
 
-      # Report each command as a metric under pipelined, so the user
-      # can at least see what all the commands were. This prevents
-      # metric namespace explosion.
+        method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
+        metrics = ["Database/Redis/#{method_name.to_s.upcase}", total_metric]
 
-      metrics = ["Database/Redis/Pipelined", total_metric]
+        self.class.trace_execution_scoped(metrics) do
+          start = Time.now
 
-      commands.each do |c|
-        name = c.kind_of?(Array) ? c[0] : c
-        metrics << "Database/Redis/Pipelined/#{name.to_s.upcase}"
+          begin
+            call_without_newrelic_trace(*args, &blk)
+          ensure
+            s = NewRelic::Agent.instance.transaction_sampler
+            s.notice_nosql(args.inspect, (Time.now - start).to_f) rescue nil
+          end
+        end
       end
 
-      self.class.trace_execution_scoped(metrics) do
-        start = Time.now
-
-        begin
-          call_pipelined_without_newrelic_trace commands, *rest
-        ensure
-          s = NewRelic::Agent.instance.transaction_sampler
-          s.notice_nosql(commands.inspect, (Time.now - start).to_f) rescue nil
+      alias_method :call_without_newrelic_trace, call_method
+      alias_method call_method, :call_with_newrelic_trace
+
+      # Older versions of Redis handle pipelining completely differently.
+      # Don't bother supporting them for now.
+      #
+      if public_method_defined? :call_pipelined
+        def call_pipelined_with_newrelic_trace(commands, *rest)
+          if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
+            total_metric = 'Database/Redis/allWeb'
+          else
+            total_metric = 'Database/Redis/allOther'
+          end
+
+          # Report each command as a metric under pipelined, so the user
+          # can at least see what all the commands were. This prevents
+          # metric namespace explosion.
+
+          metrics = ["Database/Redis/Pipelined", total_metric]
+
+          commands.each do |c|
+            name = c.kind_of?(Array) ? c[0] : c
+            metrics << "Database/Redis/Pipelined/#{name.to_s.upcase}"
+          end
+
+          self.class.trace_execution_scoped(metrics) do
+            start = Time.now
+
+            begin
+              call_pipelined_without_newrelic_trace commands, *rest
+            ensure
+              s = NewRelic::Agent.instance.transaction_sampler
+              s.notice_nosql(commands.inspect, (Time.now - start).to_f) rescue nil
+            end
+          end
         end
+
+        alias_method :call_pipelined_without_newrelic_trace, :call_pipelined
+        alias_method :call_pipelined, :call_pipelined_with_newrelic_trace
       end
     end
+  end
 
+end
 
-    alias_method :call_pipelined_without_newrelic_trace, :call_pipelined
-    alias_method :call_pipelined, :call_pipelined_with_newrelic_trace
-  end
-end if load_probes
 

data/lib/newrelic_redis/version.rb

@@ -1,3 +1,3 @@
 class NewRelicRedis
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

data/test/test_newrelic_redis.rb

@@ -21,6 +21,8 @@ class TestNewRelicRedis < Test::Unit::TestCase
 
     @redis = Redis.new OPTIONS
     @client = @redis.client
+
+    DependencyDetection.detect!
   end
 
   def teardown

metadata

@@ -1,94 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: newrelic-redis
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.4.0
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 2
-  version: 1.3.2
 platform: ruby
-authors: 
+authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: newrelic_rpm
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: newrelic_rpm
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Redis instrumentation for Newrelic.
-email: 
+email:
 - evan@phx.io
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - .autotest
 - History.txt
 - Manifest.txt
@@ -103,37 +99,29 @@ files:
 - .gemtest
 homepage: http://github.com/evanphx/newrelic-redis
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: newrelic-redis
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Redis instrumentation for Newrelic.
-test_files: 
+test_files:
 - test/test_newrelic_redis.rb