traceview 3.0.4-java → 3.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7b1e15c3cb6b5b4ef34bd1b5861f4a771e4d8f
-  data.tar.gz: 65fdda8e86ddf934c454eb518274f20c0541eb45
+  metadata.gz: 6ed3821a6292705e02ec4fff2d84e34da9c7c9cc
+  data.tar.gz: 5a033d814244dddae9e137c8bb23d76aeb56fbd0
 SHA512:
-  metadata.gz: 355c101e8ae6f25c1d23bdd405f1ab983daa57a091eaa3193e37677047dce5fbd15e1e442bffd23e4966fba211318b8cd0daa05359bdba84dcd161945007db13
-  data.tar.gz: d36d61c09d859c317362772510d8a6a0e2fb9d22164f58d7cdd5615c5423367a669c3a37209b1e312bb7e8b02a4aef6d74798e0207bb34e069612ac1a364a136
+  metadata.gz: fdb1e46cba04472ffa486012fef5da31cdb4c37a9bed5ecb7df10dab556b166b91818f86333cdff8b600fd962678f3d154f6749eb41fbeb5d83b0c53f69da422
+  data.tar.gz: 99f0b8bd3725297a5395c2fab358bba7cd3fb31c1f2fb5cc5a1f8da6312250f665082d2026cbf76508406487adc1f50da97671d169b89fc0ffd90cf6e192e514

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: java
 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