traceview 3.8.0 → 3.8.1

data/lib/traceview/inst/excon.rb

@@ -11,27 +11,27 @@ module TraceView
 
       def traceview_collect(params)
         kvs = {}
-        kvs['IsService'] = 1
-        kvs['RemoteProtocol'] = ::TraceView::Util.upcase(@data[:scheme])
-        kvs['RemoteHost'] = @data[:host]
+        kvs[:IsService] = 1
+        kvs[:RemoteProtocol] = ::TraceView::Util.upcase(@data[:scheme])
+        kvs[:RemoteHost] = @data[:host]
 
         # Conditionally log query args
         if TraceView::Config[:excon][:log_args] && @data[:query]
           if @data[:query].is_a?(Hash)
             if RUBY_VERSION >= '1.9.2'
-              kvs['ServiceArg'] = "#{@data[:path]}?#{URI.encode_www_form(@data[:query])}"
+              kvs[:ServiceArg] = "#{@data[:path]}?#{URI.encode_www_form(@data[:query])}"
             else
               # An imperfect solution for the lack of URI.encode_www_form for Ruby versions before
               # 1.9.2.  We manually create a query string for reporting purposes only.
               query_arg = ""
               @data[:query].each_pair { |k,v| query_arg += "#{k}=#{v}?"; }
-              kvs['ServiceArg'] = "#{@data[:path]}?#{query_arg.chop}"
+              kvs[:ServiceArg] = "#{@data[:path]}?#{query_arg.chop}"
             end
           else
-            kvs['ServiceArg'] = "#{@data[:path]}?#{@data[:query]}"
+            kvs[:ServiceArg] = "#{@data[:path]}?#{@data[:query]}"
           end
         else
-          kvs['ServiceArg'] = @data[:path]
+          kvs[:ServiceArg] = @data[:path]
         end
 
         # In the case of HTTP pipelining, params could be an array of
@@ -41,12 +41,12 @@ module TraceView
           params.each do |p|
             methods << ::TraceView::Util.upcase(p[:method])
           end
-          kvs['HTTPMethods'] = methods.join(', ')[0..1024]
-          kvs['Pipeline'] = true
+          kvs[:HTTPMethods] = methods.join(', ')[0..1024]
+          kvs[:Pipeline] = true
         else
-          kvs['HTTPMethod'] = ::TraceView::Util.upcase(params[:method])
+          kvs[:HTTPMethod] = ::TraceView::Util.upcase(params[:method])
         end
-        kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:excon][:collect_backtraces]
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:excon][:collect_backtraces]
         kvs
       rescue => e
         TraceView.logger.debug "[traceview/debug] Error capturing excon KVs: #{e.message}"
@@ -57,7 +57,7 @@ module TraceView
 
       def requests_with_traceview(pipeline_params)
         responses = nil
-        TraceView::API.trace('excon', traceview_collect(pipeline_params)) do
+        TraceView::API.trace(:excon, traceview_collect(pipeline_params)) do
           responses = requests_without_traceview(pipeline_params)
         end
         responses
@@ -82,9 +82,9 @@ module TraceView
           @data[:headers]['X-Trace'] = req_context unless blacklisted
 
           kvs = traceview_collect(params)
-          kvs['Blacklisted'] = true if blacklisted
+          kvs[:Blacklisted] = true if blacklisted
 
-          TraceView::API.log_entry('excon', kvs)
+          TraceView::API.log_entry(:excon, kvs)
           kvs.clear
 
           # The core excon call
@@ -95,11 +95,11 @@ module TraceView
           # the datatype before trying to extract pertinent info
           if response.is_a?(Excon::Response)
             response_context = response.headers['X-Trace']
-            kvs['HTTPStatus'] = response.status
+            kvs[:HTTPStatus] = response.status
 
             # If we get a redirect, report the location header
             if ((300..308).to_a.include? response.status.to_i) && response.headers.key?('Location')
-              kvs['Location'] = response.headers['Location']
+              kvs[:Location] = response.headers['Location']
             end
 
             if response_context && !blacklisted
@@ -109,10 +109,10 @@ module TraceView
 
           response
         rescue => e
-          TraceView::API.log_exception('excon', e)
+          TraceView::API.log_exception(:excon, e)
           raise e
         ensure
-          TraceView::API.log_exit('excon', kvs) unless params[:pipeline]
+          TraceView::API.log_exit(:excon, kvs) unless params[:pipeline]
         end
       end
     end

data/lib/traceview/inst/faraday.rb

@@ -13,13 +13,13 @@ module TraceView
         # Otherwise, the Net::HTTP instrumentation will send the service KVs
         handle_service = !@builder.handlers.include?(Faraday::Adapter::NetHttp) &&
                          !@builder.handlers.include?(Faraday::Adapter::Excon)
-        TraceView::API.log_entry('faraday')
+        TraceView::API.log_entry(:faraday)
 
         result = run_request_without_traceview(method, url, body, headers, &block)
 
         kvs = {}
-        kvs['Middleware'] = @builder.handlers
-        kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:faraday][:collect_backtraces]
+        kvs[:Middleware] = @builder.handlers
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:faraday][:collect_backtraces]
 
         if handle_service
           blacklisted = TraceView::API.blacklisted?(@url_prefix.to_s)
@@ -30,14 +30,14 @@ module TraceView
           # Conditionally add the X-Trace header to the outgoing request
           @headers['X-Trace'] = context unless blacklisted
 
-          kvs['IsService'] = 1
-          kvs['RemoteProtocol'] = (@url_prefix.scheme == 'https') ? 'HTTPS' : 'HTTP'
-          kvs['RemoteHost'] = @url_prefix.host
-          kvs['RemotePort'] = @url_prefix.port
-          kvs['ServiceArg'] = url
-          kvs['HTTPMethod'] = method
+          kvs[:IsService] = 1
+          kvs[:RemoteProtocol] = (@url_prefix.scheme == 'https') ? 'HTTPS' : 'HTTP'
+          kvs[:RemoteHost] = @url_prefix.host
+          kvs[:RemotePort] = @url_prefix.port
+          kvs[:ServiceArg] = url
+          kvs[:HTTPMethod] = method
           kvs[:HTTPStatus] = result.status
-          kvs['Blacklisted'] = true if blacklisted
+          kvs[:Blacklisted] = true if blacklisted
 
           # Re-attach net::http edge unless it's blacklisted or if we don't have a
           # valid X-Trace header
@@ -56,13 +56,13 @@ module TraceView
           end
         end
 
-        TraceView::API.log('faraday', 'info', kvs)
+        TraceView::API.log(:faraday, :info, kvs)
         result
       rescue => e
-        TraceView::API.log_exception('faraday', e)
+        TraceView::API.log_exception(:faraday, e)
         raise e
       ensure
-        TraceView::API.log_exit('faraday')
+        TraceView::API.log_exit(:faraday)
       end
     end
   end

data/lib/traceview/inst/http.rb

@@ -17,7 +17,7 @@ if TraceView::Config[:nethttp][:enabled]
       # Avoid cross host tracing for blacklisted domains
       blacklisted = TraceView::API.blacklisted?(addr_port)
 
-      TraceView::API.trace('net-http') do
+      TraceView::API.trace(:'net-http') do
         opts = {}
         context = TraceView::Context.toString()
         task_id = TraceView::XTrace.task_id(context)
@@ -26,20 +26,20 @@ if TraceView::Config[:nethttp][:enabled]
         if args.length && args[0]
           req = args[0]
 
-          opts['IsService'] = 1
-          opts['RemoteProtocol'] = use_ssl? ? 'HTTPS' : 'HTTP'
-          opts['RemoteHost'] = addr_port
+          opts[:IsService] = 1
+          opts[:RemoteProtocol] = use_ssl? ? :HTTPS : :HTTP
+          opts[:RemoteHost] = addr_port
 
           # Conditionally log query params
           if TraceView::Config[:nethttp][:log_args]
-            opts['ServiceArg'] = req.path
+            opts[:ServiceArg] = req.path
           else
-            opts['ServiceArg'] = req.path.split('?').first
+            opts[:ServiceArg] = req.path.split('?').first
           end
 
-          opts['HTTPMethod'] = req.method
-          opts['Blacklisted'] = true if blacklisted
-          opts['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:nethttp][:collect_backtraces]
+          opts[:HTTPMethod] = req.method
+          opts[:Blacklisted] = true if blacklisted
+          opts[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:nethttp][:collect_backtraces]
 
           req['X-Trace'] = context unless blacklisted
         end
@@ -64,17 +64,17 @@ if TraceView::Config[:nethttp][:enabled]
             end
           end
 
-          opts['HTTPStatus'] = resp.code
+          opts[:HTTPStatus] = resp.code
 
           # If we get a redirect, report the location header
           if ((300..308).to_a.include? resp.code.to_i) && resp.header["Location"]
-            opts["Location"] = resp.header["Location"]
+            opts[:Location] = resp.header["Location"]
           end
 
           next resp
         ensure
           # Log the info event with the KVs in opts
-          TraceView::API.log('net-http', 'info', opts)
+          TraceView::API.log(:'net-http', :info, opts)
         end
       end
     end

data/lib/traceview/inst/httpclient.rb

@@ -12,23 +12,23 @@ module TraceView
 
       def traceview_collect(method, uri, query = nil)
         kvs = {}
-        kvs['IsService'] = 1
+        kvs[:IsService] = 1
 
         # Conditionally log URL query params
         # Because of the hook points, the query arg can come in under <tt>query</tt>
         # or as a part of <tt>uri</tt> (not both).  Here we handle both cases.
         if TraceView::Config[:httpclient][:log_args]
           if query
-            kvs['RemoteURL'] = uri.to_s + '?' + TraceView::Util.to_query(query)
+            kvs[:RemoteURL] = uri.to_s + '?' + TraceView::Util.to_query(query)
           else
-            kvs['RemoteURL'] = uri.to_s
+            kvs[:RemoteURL] = uri.to_s
           end
         else
-          kvs['RemoteURL'] = uri.to_s.split('?').first
+          kvs[:RemoteURL] = uri.to_s.split('?').first
         end
 
-        kvs['HTTPMethod'] = ::TraceView::Util.upcase(method)
-        kvs['Backtrace'] = TraceView::API.backtrace if TraceView::Config[:httpclient][:collect_backtraces]
+        kvs[:HTTPMethod] = ::TraceView::Util.upcase(method)
+        kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:httpclient][:collect_backtraces]
         kvs
       rescue => e
         TraceView.logger.debug "[traceview/debug] Error capturing httpclient KVs: #{e.message}"
@@ -50,9 +50,9 @@ module TraceView
           blacklisted = TraceView::API.blacklisted?(uri.hostname)
 
           kvs = traceview_collect(method, uri, query)
-          kvs['Blacklisted'] = true if blacklisted
+          kvs[:Blacklisted] = true if blacklisted
 
-          TraceView::API.log_entry('httpclient', kvs)
+          TraceView::API.log_entry(:httpclient, kvs)
           kvs.clear
 
           req_context = TraceView::Context.toString()
@@ -68,11 +68,11 @@ module TraceView
           response = do_request_without_traceview(method, uri, query, body, header, &block)
 
           response_context = response.headers['X-Trace']
-          kvs['HTTPStatus'] = response.status_code
+          kvs[:HTTPStatus] = response.status_code
 
           # If we get a redirect, report the location header
           if ((300..308).to_a.include? response.status.to_i) && response.headers.key?("Location")
-            kvs["Location"] = response.headers["Location"]
+            kvs[:Location] = response.headers["Location"]
           end
 
           if response_context && !blacklisted
@@ -81,10 +81,10 @@ module TraceView
 
           response
         rescue => e
-          TraceView::API.log_exception('httpclient', e)
+          TraceView::API.log_exception(:httpclient, e)
           raise e
         ensure
-          TraceView::API.log_exit('httpclient', kvs)
+          TraceView::API.log_exit(:httpclient, kvs)
         end
       end
 
@@ -123,10 +123,10 @@ module TraceView
           blacklisted = TraceView::API.blacklisted?(uri.hostname)
 
           kvs = traceview_collect(method, uri)
-          kvs['Blacklisted'] = true if blacklisted
-          kvs['Async'] = 1
+          kvs[:Blacklisted] = true if blacklisted
+          kvs[:Async] = 1
 
-          TraceView::API.log_entry('httpclient', kvs)
+          TraceView::API.log_entry(:httpclient, kvs)
           kvs.clear
 
           req_context = TraceView::Context.toString()
@@ -143,11 +143,11 @@ module TraceView
           end
 
           response_context = response.headers['X-Trace']
-          kvs['HTTPStatus'] = response.status_code
+          kvs[:HTTPStatus] = response.status_code
 
           # If we get a redirect, report the location header
           if ((300..308).to_a.include? response.status.to_i) && response.headers.key?("Location")
-            kvs["Location"] = response.headers["Location"]
+            kvs[:Location] = response.headers["Location"]
           end
 
           if response_context && !blacklisted
@@ -158,11 +158,11 @@ module TraceView
           conn.push response if result.is_a?(::HTTPClient::Connection)
           result
         rescue => e
-          TraceView::API.log_exception('httpclient', e)
+          TraceView::API.log_exception(:httpclient, e)
           raise e
         ensure
           # TraceView::API.log_exit('httpclient', kvs.merge('Async' => 1))
-          TraceView::API.log_exit('httpclient', kvs)
+          TraceView::API.log_exit(:httpclient, kvs)
         end
       end
     end

data/lib/traceview/inst/memcache.rb

@@ -17,7 +17,7 @@ module TraceView
               report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:memcache][:collect_backtraces]
 
               if TraceView.tracing?
-                TraceView::API.trace('memcache', report_kvs) do
+                TraceView::API.trace(:memcache, report_kvs) do
                   send("#{m}_without_traceview", *args)
                 end
               else
@@ -58,11 +58,11 @@ module TraceView
           TraceView.logger.debug e.backtrace
         end
 
-        TraceView::API.trace('memcache', { :KVOp => :get_multi }, :get_multi) do
+        TraceView::API.trace(:memcache, { :KVOp => :get_multi }, :get_multi) do
           values = get_multi_without_traceview(args)
 
           info_kvs[:KVHitCount] = values.length
-          TraceView::API.log('memcache', 'info', info_kvs)
+          TraceView::API.log(:memcache, :info, info_kvs)
 
           values
         end
@@ -74,7 +74,7 @@ module TraceView
 
           info_kvs = { :KVKey => cache_key, :RemoteHost => server.host }
           info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:memcache][:collect_backtraces]
-          TraceView::API.log('memcache', 'info', info_kvs)
+          TraceView::API.log(:memcache, :info, info_kvs)
 
           [server, cache_key]
         else
@@ -87,7 +87,7 @@ module TraceView
 
         info_kvs = { :KVHit => memcache_hit?(result) }
         info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:memcache][:collect_backtraces]
-        TraceView::API.log('memcache', 'info', info_kvs)
+        TraceView::API.log(:memcache, :info, info_kvs)
 
         result
       end

data/lib/traceview/inst/memcached.rb

@@ -20,14 +20,14 @@ module TraceView
                 opts[:RemoteHost] = rhost if rhost
               end
 
-              TraceView::API.trace('memcache', opts) do
+              TraceView::API.trace(:memcache, opts) do
                 result = send("#{m}_without_traceview", *args)
 
                 info_kvs = {}
                 info_kvs[:KVHit] = memcache_hit?(result) if m == :get && args.length && args[0].class == String
                 info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:memcached][:collect_backtraces]
 
-                TraceView::API.log('memcache', 'info', info_kvs) unless info_kvs.empty?
+                TraceView::API.log(:memcache, :info, info_kvs) unless info_kvs.empty?
                 result
               end
             end
@@ -57,7 +57,7 @@ module TraceView
           layer_kvs = {}
           layer_kvs[:KVOp] = :get_multi
 
-          TraceView::API.trace('memcache', layer_kvs || {}, :get_multi) do
+          TraceView::API.trace(:memcache, layer_kvs || {}, :get_multi) do
             begin
               info_kvs = {}
               info_kvs[:KVKeyCount] = keys.flatten.length
@@ -67,7 +67,7 @@ module TraceView
               info_kvs[:KVHitCount] = values.length
               info_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:memcached][:collect_backtraces]
 
-              TraceView::API.log('memcache', 'info', info_kvs)
+              TraceView::API.log(:memcache, :info, info_kvs)
             rescue
               values = get_multi_without_traceview(keys, raw)
             end

data/lib/traceview/inst/mongo.rb

@@ -60,7 +60,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
               TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
-            TraceView::API.trace('mongo', report_kvs) do
+            TraceView::API.trace(:mongo, report_kvs) do
               send("#{m}_without_traceview", *args)
             end
           end
@@ -94,7 +94,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
                 unless @selector.empty?
                   report_kvs[:Query] = @selector.to_json
                 else
-                  report_kvs[:Query] = 'all'
+                  report_kvs[:Query] = :all
                 end
                 report_kvs[:Limit] = @limit if @limit != 0
               end
@@ -102,7 +102,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
               TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
-            TraceView::API.trace('mongo', report_kvs) do
+            TraceView::API.trace(:mongo, report_kvs) do
               send("#{m}_without_traceview", *args)
             end
           end
@@ -167,7 +167,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
               TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
-            TraceView::API.trace('mongo', report_kvs) do
+            TraceView::API.trace(:mongo, report_kvs) do
               send("#{m}_without_traceview", *args)
             end
           end
@@ -206,7 +206,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
               TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
-            TraceView::API.trace('mongo', report_kvs) do
+            TraceView::API.trace(:mongo, report_kvs) do
               send("#{m}_without_traceview", *args, &blk)
             end
           end
@@ -228,7 +228,7 @@ if defined?(::Mongo) && (Gem.loaded_specs['mongo'].version.to_s < '2.0.0') && Tr
               TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
             end
 
-            TraceView::API.trace('mongo', report_kvs) do
+            TraceView::API.trace(:mongo, report_kvs) do
               send("#{m}_without_traceview", *args)
             end
           end