traceview 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851cfffb5ecd5503573c7a1674fc5d121041d9ed
-  data.tar.gz: 4ad25c56896ad27b8c81e83eb99ff6a9d55d45e1
+  metadata.gz: c2284d42530b2ec6252db379fc6370a378bd56d4
+  data.tar.gz: c9985e9de191c6a7bf7bea724023acc2018ab810
 SHA512:
-  metadata.gz: f53d8f9ebe0f8545cc9636aff8821ceedb5b1ea5d9264358a2efd72b176387e3b232040912608a90996a3b5c40110283ab6c24b506a258c1a9a0e7290d8d27b5
-  data.tar.gz: f7295210d1a9c5ff6ac49247c3a98ae30aae26932f4800e6f224d68b1289649142500c8097f2dd76a6284ccecafc1388eae80eb34a7fa3da8bcc18c6eee2ec78
+  metadata.gz: 13954be81725c72efc6cb6d635883539ea92cd1a1dea46be838fa34f4b1665c087955c79d630a0eab024bd926c975700dcdcfc47d9f98e148ddf250e4b53c233
+  data.tar.gz: 0d487b99dd015b6a1544de7210d489b51c676e3fbd06c919ea74891de3c2dc7dbf4105a06ada896e6500f8a6241415e8f82fc8bf2c685c5e9ed968abfb28a711

data/lib/traceview/inst/httpclient.rb

@@ -38,7 +38,7 @@ module TraceView
       def do_request_with_traceview(method, uri, query, body, header, &block)
         # If we're not tracing, just do a fast return.
         if !TraceView.tracing?
-          return request_without_traceview(method, uri, query, body, header, &block)
+          return do_request_without_traceview(method, uri, query, body, header, &block)
         end
 
         begin

data/lib/traceview/inst/redis.rb

@@ -97,11 +97,23 @@ module TraceView
               case op
               when :set
                 if command.count > 3
-                  options = command[3]
-                  kvs[:ex] = options[:ex] if options.key?(:ex)
-                  kvs[:px] = options[:px] if options.key?(:px)
-                  kvs[:nx] = options[:nx] if options.key?(:nx)
-                  kvs[:xx] = options[:xx] if options.key?(:xx)
+                  if command[3].is_a?(Hash)
+                    options = command[3]
+                    kvs[:ex] = options[:ex] if options.key?(:ex)
+                    kvs[:px] = options[:px] if options.key?(:px)
+                    kvs[:nx] = options[:nx] if options.key?(:nx)
+                    kvs[:xx] = options[:xx] if options.key?(:xx)
+                  else
+                    options = command[3..-1]
+                    until (opts = options.shift(2)).empty?
+                      case opts[0]
+                      when "EX"; kvs[:ex] = opts[1]
+                      when "PX"; kvs[:px] = opts[1]
+                      when "NX"; kvs[:nx] = opts[1]
+                      when "XX"; kvs[:xx] = opts[1]
+                      end
+                    end
+                  end
                 end
 
               when :get

data/lib/traceview/version.rb

@@ -8,7 +8,7 @@ module TraceView
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/instrumentation/httpclient_test.rb

@@ -295,5 +295,28 @@ class HTTPClientTest < Minitest::Test
 
     TraceView::Config[:httpclient][:log_args] = @log_args
   end
+
+  def test_without_tracing
+    clear_all_traces
+
+    @tm = TraceView::Config[:tracing_mode]
+    TraceView::Config[:tracing_mode] = :never
+
+    response = nil
+
+    TraceView::API.start_trace('httpclient_tests') do
+      clnt = HTTPClient.new
+      response = clnt.get('http://127.0.0.1:8101/', :query => { :keyword => 'ruby', :lang => 'en' })
+    end
+
+    xtrace = response.headers['X-Trace']
+    assert xtrace == nil
+
+    traces = get_all_traces
+
+    assert_equal traces.count, 0
+
+    TraceView::Config[:tracing_mode] = @tm
+  end
 end
 

data/test/instrumentation/redis_strings_test.rb

@@ -266,6 +266,18 @@ if defined?(::Redis)
       traces[2]['KVKey'].must_equal "one"
     end
 
+    it "should trace set + expiration" do
+      TraceView::API.start_trace('redis_test', '', {}) do
+        @redis.set("one", "hello", :ex => 12)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+      traces[2]['KVOp'].must_equal "set"
+      traces[2]['KVKey'].must_equal "one"
+      traces[2]['ex'].must_equal 12
+    end
+
     it "should trace setbit" do
       min_server_version(2.2)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json