traceview 3.3.3-java → 3.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba9ede32f6b82764e4c1f79575f13195e60365cc
-  data.tar.gz: 7c4fd3b02180e75ff31c4e0ffb0244377bf680a4
+  metadata.gz: 79f990d586021911ee937f498d590b569da91445
+  data.tar.gz: 803519418a7cb2bb09cdcd915d436afaaa434222
 SHA512:
-  metadata.gz: af167e8b74c3d2ca7186d6c6112ec965f6aab6cff43ee9f2bbc42a0fc94081904909047babac08f7149cdc89958f1d3ed4f59822d36b09fea62ce14f42600a7e
-  data.tar.gz: 4374aa1626b0d93804e27b3f6d92b1eee7491fa4c7455ad5cedd19aefd668ee5c94b404ffec22a7f8d4f1b47764c635ba9ab7842e976f1a3adc5e0be28f650e8
+  metadata.gz: 2f3ad43392f02407f593ed2170fb053a16e7a77c30e30b1ffc1aa62972877373d395f10cf104901a64e6a314df4299405e33714edf5cce111a30acabba16ee5f
+  data.tar.gz: 87606a310e7cd5964ab73d6d57cbd9379e00f49ebcf75c80510c790ebea18132618950352eb933c8f4fc89b6990cb293953db786607c9df4c084c824fa9f6b43

data/.travis.yml

@@ -6,42 +6,42 @@ cache:
   - vendor/bundle
 
 rvm:
-  - 2.2.3
+  - 2.2.4
   - 1.9.3
   - 1.8.7
-  - jruby-9.0.0.0
+  - jruby-9.0.4.0
 
 gemfile:
   - gemfiles/libraries.gemfile
   - gemfiles/frameworks.gemfile
-  - gemfiles/rails30.gemfile
-  - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
-  - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/delayed_job.gemfile
 
 matrix:
   exclude:
     # Rails 4.0+ requires Ruby 1.9.3 or higher
     - rvm: 1.8.7
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails42.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails40.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails41.gemfile
-    - rvm: ree
       gemfile: gemfiles/rails42.gemfile
 
+    # Don't test DelayedJob under MRI 1.8 and JRuby
+    - rvm: 1.8.7
+      gemfile: gemfiles/delayed_job.gemfile
+
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/delayed_job.gemfile
+
     # Other frameworks tested on Ruby 1.9.3 or higher
     - rvm: 1.8.7
       gemfile: gemfiles/frameworks.gemfile
-    - rvm: ree
-      gemfile: gemfiles/frameworks.gemfile
+
+  allow_failures:
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/rails32.gemfile
+
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/rails42.gemfile
+
 
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650

data/CHANGELOG.md

@@ -4,6 +4,19 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.4.0
+
+This minor release includes the following features & fixes:
+
+* New [DelayedJob](https://github.com/collectiveidea/delayed_job/) instrumentation: #151
+* Limit BSON gem dependency to < 4.0: #152
+* Code refactoring & improvements: #148
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.4.0
+https://rubygems.org/gems/traceview/versions/3.4.0-java
+
 # traceview 3.3.3
 
 This patch release includes the following fixes:

data/README.md

@@ -16,6 +16,8 @@ _Note: The repository name has been changed to ruby-traceview.  Please update yo
 
 # Installation
 
+_Before installing the gem below, make sure that you have the [base packages](http://docs.appneta.com/installation-overview#1-install-base-packages) installed on your host first._
+
 The traceview gem is [available on Rubygems](https://rubygems.org/gems/traceview) and can be installed with:
 
 ```bash
@@ -199,7 +201,7 @@ class Engine
 end
 ```
 
-This example demonstrates method profiling of instance methods.  Class methods are profiled slightly differently.  See the TraceView [documentation portal](https://docs.appneta.com/custom-ruby-instrumentation) for full details.
+This example demonstrates method profiling of instance methods.  Class methods are profiled slightly differently.  See the TraceView [documentation portal](https://docs.appneta.com/ruby#customizing-ruby-instrumentation) for full details.
 
 # Support
 

data/Rakefile

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rake/testtask'
+require 'traceview/test'
 
 Rake::TestTask.new do |t|
   t.verbose = true
@@ -16,7 +17,10 @@ Rake::TestTask.new do |t|
   # Here we detect the Gemfile the tests are being run against
   # and load the appropriate tests.
   #
-  case File.basename(ENV['BUNDLE_GEMFILE'])
+  case TraceView::Test.gemfile
+  when /delayed_job/
+    require 'delayed/tasks'
+    t.test_files = FileList["test/queues/delayed_job*_test.rb"]
   when /rails/
     # Pre-load rails to get the major version number
     require 'rails'
@@ -114,22 +118,27 @@ end
 desc "Rebuild the gem's c extension"
 task :recompile => [ :distclean, :compile ]
 
-task :console do
-  require 'traceview/test'
+task :environment do
   ENV['TRACEVIEW_GEM_VERBOSE'] = 'true'
+
   Bundler.require(:default, :development)
   TraceView::Config[:tracing_mode] = :always
   TV::Test.load_extras
+
+  if TV::Test.gemfile?(:delayed_job)
+    require 'delayed/tasks'
+  end
+end
+
+task :console => :environment do
   ARGV.clear
+  if TV::Test.gemfile?(:delayed_job)
+    require './test/servers/delayed_job'
+  end
   Pry.start
 end
 
 # Used when testing Resque locally
-task "resque:setup" do
+task "resque:setup" => :environment do
   require 'resque/tasks'
-  require 'traceview/test'
-  ENV['TRACEVIEW_GEM_VERBOSE'] = 'true'
-  Bundler.require(:default, :development)
-  TraceView::Config[:tracing_mode] = :always
-  TV::Test.load_extras
 end

data/gemfiles/delayed_job.gemfile

@@ -0,0 +1,38 @@
+source "https://rubygems.org"
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest'
+  gem 'minitest-reporters', '< 1.0.18'
+  gem 'minitest-debugger', :require => false
+  gem 'rack-test'
+  gem 'puma'
+  gem 'bson'
+end
+
+group :development do
+  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
+  gem 'debugger',     :platform  =>   :mri_19
+  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
+  if RUBY_VERSION > '1.8.7'
+    gem 'pry'
+    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
+  else
+    gem 'pry', '0.9.12.4'
+  end
+end
+
+if defined?(JRUBY_VERSION)
+  gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
+else
+  gem 'sinatra'
+  gem 'pg'
+  gem "delayed_job_active_record"
+end
+
+gem "rails", "~> 4.2.5"
+
+gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
+# vim:syntax=ruby

data/gemfiles/frameworks.gemfile

@@ -18,7 +18,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -33,7 +32,7 @@ else
   gem 'sinatra'
 end
 
-gem "grape"
+gem "grape", "< 0.14"
 gem "padrino", '< 0.13'
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')

data/gemfiles/libraries.gemfile

@@ -28,7 +28,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -45,7 +44,7 @@ end
 
 gem 'cassandra'
 gem 'curb' unless defined?(JRUBY_VERSION)
-gem 'dalli'
+gem 'dalli' if RUBY_VERSION > '1.8.7'
 gem 'excon'
 gem 'faraday'
 gem 'httpclient'

data/gemfiles/rails23.gemfile

@@ -31,7 +31,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -46,7 +45,7 @@ else
   gem 'sinatra'
 end
 
-gem "rails", "~>2.3"
+gem "rails", "~> 2.3.18"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails30.gemfile

@@ -31,7 +31,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -42,11 +41,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg', '< 0.17'
 end
 
-gem "rails", "~>3.0"
+gem "rails", "~> 3.0.20"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails31.gemfile

@@ -31,7 +31,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -42,11 +41,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg', '< 0.17'
 end
 
-gem "rails", "~>3.1"
+gem "rails", "~> 3.1.12"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails32.gemfile

@@ -31,7 +31,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -42,11 +41,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg', '< 0.17'
 end
 
-gem "rails", "~>3.2"
+gem "rails", "~> 3.2.22"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails40.gemfile

@@ -14,7 +14,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -25,11 +24,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg', '< 0.17'
 end
 
-gem "rails", "~>4.0"
+gem "rails", "~> 4.0.13"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails41.gemfile

@@ -14,7 +14,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -25,11 +24,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg', '< 0.17'
 end
 
-gem "rails", "~>4.1"
+gem "rails", "~> 4.1.14"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails42.gemfile

@@ -14,7 +14,6 @@ group :development do
   gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
   gem 'debugger',     :platform  =>   :mri_19
   gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-#  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
     gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
@@ -25,11 +24,14 @@ end
 
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
 else
   gem 'sinatra'
+  gem 'pg'
 end
 
-gem "rails", "~>4.2"
+gem "rails", "~> 4.2.5"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/lib/traceview/api/layerinit.rb

@@ -13,11 +13,9 @@ module TraceView
       def report_init(layer = 'rack')
         # Don't send __Init in development, test or if the gem
         # isn't fully loaded (e.g. missing c-extension)
-        if %w(development test).include? ENV['RACK_ENV'] ||
-                          ENV.key?('TRACEVIEW_GEM_TEST') ||
-                          !TraceView.loaded
-          return
-        end
+        return if %w(development test).include?(ENV['RACK_ENV']) ||
+                  ENV.key?('TRACEVIEW_GEM_TEST') ||
+                  !TraceView.loaded
 
         platform_info = TraceView::Util.build_init_report
 

data/lib/traceview/api/logging.rb

@@ -31,9 +31,9 @@ module TraceView
       #
       # Returns nothing.
       def log(layer, label, opts = {})
-        if TraceView.loaded
-          log_event(layer, label, TraceView::Context.createEvent, opts)
-        end
+        return unless TraceView.loaded
+
+        log_event(layer, label, TraceView::Context.createEvent, opts)
       end
 
       ##
@@ -58,6 +58,11 @@ module TraceView
       def log_exception(layer, exn, kvs = {})
         return if !TraceView.loaded || exn.instance_variable_get(:@oboe_logged)
 
+        unless exn
+          TV.logger.debug '[traceview/debug] log_exception called with nil exception'
+          return
+        end
+
         kvs.merge!(:ErrorClass => exn.class.name,
                    :ErrorMsg => exn.message,
                    :Backtrace => exn.backtrace.join("\r\n"))
@@ -84,6 +89,14 @@ module TraceView
         return if !TraceView.loaded || TraceView.never? ||
                   (opts.key?(:URL) && ::TraceView::Util.static_asset?(opts[:URL]))
 
+        # For entry only layers (DelayedJob workers, Sidekiq workers), auto-set the tracing mode
+        # Don't do this if tracing mode is already :always or :never
+        if TraceView.through? && TraceView.entry_layer?(layer)
+          TraceView.logger.debug "[traceview/debug] Detected #{layer}: auto-configuring tracing mode"
+          TraceView::Config[:tracing_mode] = :always
+        end
+
+        # Used by JRuby/Java webservers such as Tomcat
         TraceView::Context.fromString(xtrace) if TraceView.pickup_context?(xtrace)
 
         if TraceView.tracing?
@@ -132,12 +145,12 @@ module TraceView
       #
       # Returns an xtrace metadata string
       def log_end(layer, opts = {})
-        if TraceView.loaded
-          log_event(layer, 'exit', TraceView::Context.createEvent, opts)
-          xtrace = TraceView::Context.toString
-          TraceView::Context.clear unless TraceView.has_incoming_context?
-          xtrace
-        end
+        return unless TraceView.loaded
+
+        log_event(layer, 'exit', TraceView::Context.createEvent, opts)
+        xtrace = TraceView::Context.toString
+        TraceView::Context.clear unless TraceView.has_incoming_context?
+        xtrace
       end
 
       ##
@@ -157,10 +170,10 @@ module TraceView
       #
       # Returns an xtrace metadata string
       def log_entry(layer, kvs = {}, op = nil)
-        if TraceView.loaded
-          TraceView.layer_op = op if op
-          log_event(layer, 'entry', TraceView::Context.createEvent, kvs)
-        end
+        return unless TraceView.loaded
+
+        TraceView.layer_op = op if op
+        log_event(layer, 'entry', TraceView::Context.createEvent, kvs)
       end
 
       ##
@@ -179,9 +192,9 @@ module TraceView
       #
       # Returns an xtrace metadata string
       def log_info(layer, kvs = {})
-        if TraceView.loaded
-          log_event(layer, 'info', TraceView::Context.createEvent, kvs)
-        end
+        return unless TraceView.loaded
+
+        log_event(layer, 'info', TraceView::Context.createEvent, kvs)
       end
 
       ##
@@ -201,10 +214,10 @@ module TraceView
       #
       # Returns an xtrace metadata string
       def log_exit(layer, kvs = {}, op = nil)
-        if TraceView.loaded
-          TraceView.layer_op = nil if op
-          log_event(layer, 'exit', TraceView::Context.createEvent, kvs)
-        end
+        return unless TraceView.loaded
+
+        TraceView.layer_op = nil if op
+        log_event(layer, 'exit', TraceView::Context.createEvent, kvs)
       end
 
       ##
@@ -227,36 +240,36 @@ module TraceView
       #   TraceView::API.log_event(:layer_name, 'exit',  exit_event, { :id => @user.id })
       #
       def log_event(layer, label, event, opts = {})
-        if TraceView.loaded
-          event.addInfo('Layer', layer.to_s) if layer
-          event.addInfo('Label', label.to_s)
-
-          TraceView.layer = layer if label == 'entry'
-          TraceView.layer = nil   if label == 'exit'
-
-          opts.each do |k, v|
-            value = nil
-
-            if valid_key? k
-              if [Integer, Float, Fixnum, NilClass, String].include?(v.class)
-                value = v
-              elsif v.class == Set
-                value = v.to_a.to_s
-              else
-                value = v.to_s if v.respond_to?(:to_s)
-              end
-
-              begin
-                event.addInfo(k.to_s, value)
-              rescue ArgumentError => e
-                TraceView.logger.debug "[TraceView/debug] Couldn't add event KV: #{k.to_s} => #{v.class}"
-                TraceView.logger.debug "[TraceView/debug] #{e.message}"
-              end
-            end
-          end if !opts.nil? && opts.any?
-
-          TraceView::Reporter.sendReport(event)
-        end
+        return unless TraceView.loaded
+
+        event.addInfo('Layer', layer.to_s) if layer
+        event.addInfo('Label', label.to_s)
+
+        TraceView.layer = layer if label == 'entry'
+        TraceView.layer = nil   if label == 'exit'
+
+        opts.each do |k, v|
+          value = nil
+
+          next unless valid_key? k
+
+          if [Integer, Float, Fixnum, NilClass, String].include?(v.class)
+            value = v
+          elsif v.class == Set
+            value = v.to_a.to_s
+          else
+            value = v.to_s if v.respond_to?(:to_s)
+          end
+
+          begin
+            event.addInfo(k.to_s, value)
+          rescue ArgumentError => e
+            TraceView.logger.debug "[TraceView/debug] Couldn't add event KV: #{k} => #{v.class}"
+            TraceView.logger.debug "[TraceView/debug] #{e.message}"
+          end
+        end if !opts.nil? && opts.any?
+
+        TraceView::Reporter.sendReport(event)
       end
     end
   end

data/lib/traceview/api/memcache.rb

@@ -13,17 +13,18 @@ module TraceView
       end
 
       def remote_host(key)
-        return unless defined?(Lib.memcached_server_by_key) \
-          && defined?(@struct) && defined?(is_unix_socket?)
+        return unless defined?(Lib.memcached_server_by_key) &&
+                      defined?(@struct) && defined?(is_unix_socket?)
 
         server_as_array = Lib.memcached_server_by_key(@struct, key.to_s)
-        if server_as_array.is_a?(Array)
-          server = server_as_array.first
-          if is_unix_socket?(server)
-            return 'localhost'
-          elsif defined?(server.hostname)
-            return server.hostname
-          end
+
+        return unless server_as_array.is_a?(Array)
+
+        server = server_as_array.first
+        if is_unix_socket?(server)
+          'localhost'
+        elsif defined?(server.hostname)
+          server.hostname
         end
       end
     end

data/lib/traceview/api/profiling.rb

@@ -69,13 +69,12 @@ module TraceView
       #   TraceView::API.profile_method(Array, :sort, opts)
       #
       def profile_method(klass, method, opts = {}, extra_kvs = {})
-
         # If we're on an unsupported platform (ahem Mac), just act
         # like we did something to nicely play the no-op part.
         return true unless TraceView.loaded
 
         if RUBY_VERSION < '1.9.3'
-          TraceView.logger.warn "[traceview/error] profile_method: Use the legacy method profiling for Ruby versions before 1.9.3"
+          TraceView.logger.warn '[traceview/error] profile_method: Use the legacy method profiling for Ruby versions before 1.9.3'
           return false
 
         elsif !klass.is_a?(Module)
@@ -110,7 +109,7 @@ module TraceView
 
         # Check if already profiled
         if klass.instance_methods.include?(with_traceview.to_sym) ||
-          klass.singleton_methods.include?(with_traceview.to_sym)
+           klass.singleton_methods.include?(with_traceview.to_sym)
           TraceView.logger.warn "[traceview/error] profile_method: #{klass}::#{method} already profiled."
           TraceView.logger.warn "[traceview/error] profile_method: #{__FILE__}:#{__LINE__}"
           return false
@@ -130,17 +129,17 @@ module TraceView
 
         if instance_method
           klass.class_eval do
-            define_method(with_traceview) { | *args, &block |
+            define_method(with_traceview) do |*args, &block|
               profile_wrapper(without_traceview, report_kvs, opts, *args, &block)
-            }
+            end
 
             alias_method without_traceview, "#{method}"
             alias_method "#{method}", with_traceview
           end
         elsif class_method
-          klass.define_singleton_method(with_traceview) { | *args, &block |
+          klass.define_singleton_method(with_traceview) do |*args, &block|
             profile_wrapper(without_traceview, report_kvs, opts, *args, &block)
-          }
+          end
 
           klass.singleton_class.class_eval do
             alias_method without_traceview, "#{method}"