newrelic-redis 1.4.0 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28b9cfa808b80ff682a14999a13a5c0c9dac3c18
+  data.tar.gz: 6c59cfd9cc77752487d36880c5bc149bef109ca0
+SHA512:
+  metadata.gz: c922be001df8876065c2b7f59160e8a53bfed58a0aa8fcef4700537208815a49daf0fef6c526aec7e2164f7623253eed0ce472ca66a1a5995fe3caa4d2a23dd4
+  data.tar.gz: 54f332a9d7a0270baa66e608b04b30b2502887462e42afd0c5c0dab0354c7e7d7c5b92663b151f021643f1445778bfdb848fc37efb73984f80f1a0defedc7c75

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.5.0 / 2014-08-25
+
+* 1 feature:
+   * Respect the obfuscated configuration parameter for in redis
+
 === 1.4.0 / 2012-10-31
 
 HAPPY HALLOWEEN!

data/lib/newrelic_redis/instrumentation.rb

@@ -40,8 +40,7 @@ DependencyDetection.defer do
           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
+            _send_to_new_relic(args, start)
           end
         end
       end
@@ -77,8 +76,7 @@ DependencyDetection.defer do
             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
+              _send_to_new_relic(commands, start)
             end
           end
         end
@@ -86,9 +84,16 @@ DependencyDetection.defer do
         alias_method :call_pipelined_without_newrelic_trace, :call_pipelined
         alias_method :call_pipelined, :call_pipelined_with_newrelic_trace
       end
+
+      def _send_to_new_relic(args, start)
+        if NewRelic::Control.instance["transaction_tracer.record_sql"] == "obfuscated"
+          args.map! { |arg| [arg.first] + ["?"] * (arg.count - 1) }
+        end
+        s = NewRelic::Agent.instance.transaction_sampler
+        s.notice_nosql(args.inspect, (Time.now - start).to_f) rescue nil
+      end
     end
   end
-
 end
 
 

data/lib/newrelic_redis/version.rb

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

data/test/test_newrelic_redis.rb

@@ -71,4 +71,20 @@ class TestNewRelicRedis < Test::Unit::TestCase
       assert_nil rep
     end
   end
+
+  def test_obfuscated
+    NewRelic::Control.instance["transaction_tracer.record_sql"] = "obfuscated"
+    @redis.pipelined do
+      @redis.hgetall "foo"
+      @redis.incr "bar"
+    end
+
+    assert_metrics "Database/Redis/Pipelined",
+                   "Database/Redis/Pipelined/HGETALL",
+                   "Database/Redis/Pipelined/INCR",
+                   "Database/Redis/allOther"
+
+    prm = @sampler.builder.current_segment.params
+    assert_equal "[[:select, \"?\"]];\n[[:hgetall, \"?\"], [:incr, \"?\"]]", prm[:key]
+  end
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-redis
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   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:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   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:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
 description: Redis instrumentation for Newrelic.
 email:
 - evan@phx.io
@@ -85,7 +76,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- .autotest
+- ".autotest"
+- ".gemtest"
 - History.txt
 - Manifest.txt
 - README.txt
@@ -96,32 +88,31 @@ files:
 - newrelic-redis.gemspec
 - test/test.conf
 - test/test_newrelic_redis.rb
-- .gemtest
 homepage: http://github.com/evanphx/newrelic-redis
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: newrelic-redis
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redis instrumentation for Newrelic.
 test_files:
 - test/test_newrelic_redis.rb