newrelic-redis 1.0.0 → 1.1.0

data/lib/newrelic_redis/instrumentation.rb

@@ -30,7 +30,14 @@ NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
       metrics = ["Database/Redis/#{method_name.to_s.upcase}", total_metric]
 
       self.class.trace_execution_scoped(metrics) do
-        call_without_newrelic_trace(*args)
+        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
       end
     end
 
@@ -52,7 +59,7 @@ NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
       # can at least see what all the commands were. This prevents
       # metric namespace explosion.
 
-      metrics = [total_metric, "Database/Redis/Pipelined"]
+      metrics = ["Database/Redis/Pipelined", total_metric]
 
       commands.each do |c|
         name = c.kind_of?(Array) ? c[0] : c
@@ -60,7 +67,14 @@ NewRelic::Agent.logger.debug 'Installing Redis instrumentation'
       end
 
       self.class.trace_execution_scoped(metrics) do
-        call_pipelined_without_newrelic_trace commands, options
+        start = Time.now
+
+        begin
+          call_pipelined_without_newrelic_trace commands, options
+        ensure
+          s = NewRelic::Agent.instance.transaction_sampler
+          s.notice_nosql(commands.inspect, (Time.now - start).to_f) rescue nil
+        end
       end
     end
 

data/lib/newrelic_redis/version.rb

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

data/newrelic-redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic-redis"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = "Redis instrumentation for Newrelic."
   s.email = ["evan@phx.io"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".autotest", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/newrelic_redis.rb", "lib/newrelic_redis/instrumentation.rb", "lib/newrelic_redis/version.rb", "test/test_newrelic_redis.rb", ".gemtest"]
+  s.files = [".autotest", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/newrelic-redis.rb", "lib/newrelic_redis/instrumentation.rb", "lib/newrelic_redis/version.rb", "newrelic-redis.gemspec", "test/test_newrelic_redis.rb", ".gemtest"]
   s.homepage = "http://github.com/evanphx/newrelic-redis"
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

data/test/test_newrelic_redis.rb

@@ -26,6 +26,11 @@ class TestNewRelicRedis < Test::Unit::TestCase
     @engine = NewRelic::Agent.instance.stats_engine
     @engine.clear_stats
 
+    @sampler = NewRelic::Agent.instance.transaction_sampler
+    @sampler.enable
+    @sampler.reset!
+    @sampler.start_builder
+
     @redis = Redis.new :path => "/tmp/redis"
     @client = @redis.client
     class << @client
@@ -33,6 +38,10 @@ class TestNewRelicRedis < Test::Unit::TestCase
     end
   end
 
+  def teardown
+    @sampler.clear_builder
+  end
+
   def assert_metrics(*m)
     assert_equal m.sort, @engine.metrics.sort
   end
@@ -41,6 +50,9 @@ class TestNewRelicRedis < Test::Unit::TestCase
     @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]
   end
 
   def test_call_pipelined
@@ -50,9 +62,12 @@ class TestNewRelicRedis < Test::Unit::TestCase
     end
 
     assert_equal [[[:hgetall, "foo"], [:inc, "bar"]]], @client.process_args
-    assert_metrics "Database/Redis/Pipelined/HGETALL",
+    assert_metrics "Database/Redis/Pipelined",
+                   "Database/Redis/Pipelined/HGETALL",
                    "Database/Redis/Pipelined/INC",
-                   "Database/Redis/Pipelined",
                    "Database/Redis/allOther"
+
+    prm = @sampler.builder.current_segment.params
+    assert_equal "[[:hgetall, \"foo\"], [:inc, \"bar\"]]", prm[:key]
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic-redis
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Evan Phoenix