newrelic-redis 1.2.0 → 1.3.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.0 / 2012-05-17
+
+ * 2 minor feature:
+   * Supports the redis gem version 3.0
+   * Can be disabled via some environment flags
+
 === 1.0.0 / 2012-03-09
 
 * 1 major enhancement

data/Rakefile

@@ -3,6 +3,46 @@
 require 'rubygems'
 require 'hoe'
 
+REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
+REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+
+task :default => :run
+
+desc "Run tests and manage server start/stop"
+task :run => [:start, :test, :stop]
+
+desc "Start the Redis server"
+task :start do
+  redis_running = \
+  begin
+    File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
+  rescue Errno::ESRCH
+    FileUtils.rm REDIS_PID
+    false
+  end
+
+  unless redis_running
+    unless system("which redis-server")
+      STDERR.puts "redis-server not in PATH"
+      exit 1
+    end
+
+    unless system("redis-server #{REDIS_CNF}")
+      STDERR.puts "could not start redis-server"
+      exit 1
+    end
+  end
+end
+
+desc "Stop the Redis server"
+task :stop do
+  if File.exists?(REDIS_PID)
+    Process.kill "INT", File.read(REDIS_PID).to_i
+    FileUtils.rm REDIS_PID
+  end
+end
+
 Hoe.plugin :bundler
 Hoe.plugin :gemspec
 Hoe.plugin :git

data/lib/newrelic_redis/instrumentation.rb

@@ -5,6 +5,11 @@ require 'redis'
 #  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
+
+# load_probes checked as a post condition
 ::Redis::Client.class_eval do
 
   include NewRelic::Agent::MethodTracer
@@ -44,7 +49,7 @@ require 'redis'
   # Don't bother supporting them for now.
   #
   if public_method_defined? :call_pipelined
-    def call_pipelined_with_newrelic_trace(commands, options={})
+    def call_pipelined_with_newrelic_trace(commands, *rest)
       if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
         total_metric = 'Database/Redis/allWeb'
       else
@@ -66,7 +71,7 @@ require 'redis'
         start = Time.now
 
         begin
-          call_pipelined_without_newrelic_trace commands, options
+          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
@@ -78,5 +83,5 @@ require 'redis'
     alias_method :call_pipelined_without_newrelic_trace, :call_pipelined
     alias_method :call_pipelined, :call_pipelined_with_newrelic_trace
   end
-end
+end if load_probes
 

data/lib/newrelic_redis/version.rb

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

data/newrelic-redis.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic-redis"
-  s.version = "1.1.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-03-09"
+  s.date = "2012-05-17"
   s.description = "Redis instrumentation for Newrelic."
   s.email = ["evan@phx.io"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "newrelic-redis"
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.22"
   s.summary = "Redis instrumentation for Newrelic."
   s.test_files = ["test/test_newrelic_redis.rb"]
 

data/test/test_newrelic_redis.rb

@@ -6,20 +6,8 @@ require 'newrelic_redis/instrumentation'
 class TestNewRelicRedis < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-  module StubProcess
-    def establish_connection
-    end
-
-    def read(*args)
-    end
-
-    def process(*args)
-      @process_args = args
-    end
-
-    attr_reader :process_args
-
-  end
+  PORT = 6381
+  OPTIONS = {:port => PORT, :db => 15, :timeout => 0.1}
 
   def setup
     NewRelic::Agent.manual_start
@@ -31,11 +19,8 @@ class TestNewRelicRedis < Test::Unit::TestCase
     @sampler.reset!
     @sampler.start_builder
 
-    @redis = Redis.new :path => "/tmp/redis"
+    @redis = Redis.new OPTIONS
     @client = @redis.client
-    class << @client
-      include StubProcess
-    end
   end
 
   def teardown
@@ -43,31 +28,31 @@ class TestNewRelicRedis < Test::Unit::TestCase
   end
 
   def assert_metrics(*m)
-    assert_equal m.sort, @engine.metrics.sort
+    m.each do |x|
+      assert @engine.metrics.include?(x), "#{x} not in metrics"
+    end
   end
 
   def test_call
     @redis.hgetall "foo"
-    assert_equal [[[:hgetall, "foo"]]], @client.process_args
     assert_metrics "Database/Redis/HGETALL", "Database/Redis/allOther"
 
     prm = @sampler.builder.current_segment.params
-    assert_equal "[[:hgetall, \"foo\"]]", prm[:key]
+    assert_equal "[[:select, 15]];\n[[:hgetall, \"foo\"]]", prm[:key]
   end
 
   def test_call_pipelined
     @redis.pipelined do
       @redis.hgetall "foo"
-      @redis.inc "bar"
+      @redis.incr "bar"
     end
 
-    assert_equal [[[:hgetall, "foo"], [:inc, "bar"]]], @client.process_args
     assert_metrics "Database/Redis/Pipelined",
                    "Database/Redis/Pipelined/HGETALL",
-                   "Database/Redis/Pipelined/INC",
+                   "Database/Redis/Pipelined/INCR",
                    "Database/Redis/allOther"
 
     prm = @sampler.builder.current_segment.params
-    assert_equal "[[:hgetall, \"foo\"], [:inc, \"bar\"]]", prm[:key]
+    assert_equal "[[:select, 15]];\n[[:hgetall, \"foo\"], [:incr, \"bar\"]]", prm[:key]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic-redis
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-05-17 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.18
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Redis instrumentation for Newrelic.