oboe 2.6.0.2 → 2.6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5cf2103662335b54454808e24505e4c0fe01ac
-  data.tar.gz: 0e18b3bac19c85fbfba7a34c38c7edb28bb0f53b
+  metadata.gz: 5236804c4d8fb3575b96b9adc6166157f3b262aa
+  data.tar.gz: c38126e75df9257d61b0c6572a96409795f37f0e
 SHA512:
-  metadata.gz: 94c63bc3a414703e1f29c2890a077af2c752dbcbd6f8de2e229b982802fa0b226d06186f8a0c8c5af54a526263c9dceb5f2074d64911f2420ba1ee595f5f0642
-  data.tar.gz: a7519e0aded683d91e0cf088d82a12349183616c3dec0b27beb97d969df0fa7e54df7b47c63120078c7743cddf72bd1b6a5730be608fe2e794f985b98b6fbda1
+  metadata.gz: be62476276374b23481ee433c76b784361a402b9b763730e2f86326758c9fac7e74d2af147fd560ed2780591557f9ded2853434c83655cc8424b60604f9c9429
+  data.tar.gz: a7de077c04074bd76205fd71a4831a67c621306fdcef8b0260727bb0927d3f2420e1a2383a43f4623a21df1f1761481606eecb68dcb95f3ce0bf077e1f67c6d3

data/Gemfile

@@ -8,7 +8,7 @@ group :development, :test do
   gem 'bson'
 end
 
-group :development, :test do
+group :development do
   gem 'ruby-debug',   :platform => :mri_18
   gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
   gem 'byebug',       :platform => :mri_20 

data/README.md

@@ -52,22 +52,22 @@ After the prompts, this will create an initializer: `config/initializers/oboe.rb
 You can instrument your Sinatra application by adding the following code to your `config.ru` Rackup file:
 
 ```ruby
-    # If you're not using Bundler.require.  Make sure this is done
-    # after the Sinatra require directive.
-    require 'oboe'
-    
-    # When traces should be initiated for incoming requests. Valid options are
-    # "always", "through" (when the request is initiated with a tracing header 
-    # from upstream) and "never". You must set this directive to "always" in 
-    # order to initiate tracing.
-    Oboe::Config[:tracing_mode] = 'through'
-    
-    # You can remove the following line in production to allow for
-    # auto sampling or managing the sample rate through the TraceView portal.
-    # Oboe::Config[:sample_rate] = 1000000
-    
-    # You may want to replace the Oboe.logger with whichever logger you are using
-    # Oboe.logger = Sinatra.logger
+# If you're not using Bundler.require.  Make sure this is done
+# after the Sinatra require directive.
+require 'oboe'
+
+# When traces should be initiated for incoming requests. Valid options are
+# "always", "through" (when the request is initiated with a tracing header
+# from upstream) and "never". You must set this directive to "always" in
+# order to initiate tracing.
+Oboe::Config[:tracing_mode] = 'through'
+
+# You can remove the following line in production to allow for
+# auto sampling or managing the sample rate through the TraceView portal.
+# Oboe::Config[:sample_rate] = 1000000
+
+# You may want to replace the Oboe.logger with whichever logger you are using
+# Oboe.logger = Sinatra.logger
 ```
 
 Note: If you're on Heroku, you don't need to set `tracing_mode` or `sample_rate` - they will be automatically configured.
@@ -83,17 +83,19 @@ As long as the oboe gem is in your `Gemfile` (inserted after the `gem 'padrino'`
 If you need to set `Oboe::Config` values on stack boot, you can do so by adding the following
 to your `config/boot.rb` file:
 
-    Padrino.before_load do
-      # When traces should be initiated for incoming requests. Valid options are
-      # "always", "through" (when the request is initiated with a tracing header 
-      # from upstream) and "never". You must set this directive to "always" in 
-      # order to initiate tracing.
-      Oboe::Config[:tracing_mode] = 'always'
-
-      # You can remove the following line in production to allow for
-      # auto sampling or managing the sample rate through the TraceView portal.
-      Oboe::Config[:sample_rate] = 1e6
-    end
+```ruby
+Padrino.before_load do
+  # When traces should be initiated for incoming requests. Valid options are
+  # "always", "through" (when the request is initiated with a tracing header
+  # from upstream) and "never". You must set this directive to "always" in
+  # order to initiate tracing.
+  Oboe::Config[:tracing_mode] = 'always'
+
+  # You can remove the following line in production to allow for
+  # auto sampling or managing the sample rate through the TraceView portal.
+  Oboe::Config[:sample_rate] = 1e6
+end
+```
 
 Note: If you're on Heroku, you don't need to set `tracing_mode` or `sample_rate` - they will be automatically configured.
 

data/lib/base.rb

@@ -58,6 +58,14 @@ module OboeBase
     Context.log(layer, label, options = options)
   end
 
+  def heroku?
+    false
+  end
+
+  def forking_webserver?
+    defined?(::Unicorn)
+  end
+
   ##
   # These methods should be implemented by the descendants
   # (Oboe_metal, Oboe_metal (JRuby), Heroku_metal)

data/lib/joboe_metal.rb

@@ -1,7 +1,9 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
-module Oboe_metal < MetalBase
+require 'base'
+
+module Oboe_metal
   include_package 'com.tracelytics.joboe'
   import 'com.tracelytics.joboe'
   include_package 'com.tracelytics.joboe.SettingsReader'
@@ -84,7 +86,7 @@ module Oboe_metal < MetalBase
         # Only report __Init from here if we are not instrumenting a framework.
         # Otherwise, frameworks will handle reporting __Init after full initialization
         unless defined?(::Rails) or defined?(::Sinatra) or defined?(::Padrino)
-          Oboe::API.report_init('rack') unless ["development", "test"].include? ENV['RACK_ENV']
+          Oboe::API.report_init
         end
       
       rescue Exception => e

data/lib/oboe.rb

@@ -6,7 +6,6 @@ begin
   require 'oboe/logger'
   require 'oboe/util'
   require 'oboe/xtrace'
-  require 'base.rb'
   
   # If Oboe_metal is already defined then we are in a PaaS environment
   # with an alternate metal (such as Heroku: see the oboe-heroku gem)

data/lib/oboe/api/layerinit.rb

@@ -8,7 +8,10 @@ module Oboe
       # installed, as well as the version of instrumentation and version of
       # layer.
       #
-      def report_init(layer)
+      def report_init(layer = 'rack')
+        # Don't send __Init in development or test
+        return if ["development", "test"].include? ENV['RACK_ENV']
+
         platform_info = { '__Init' => 1 }
         
         begin

data/lib/oboe/frameworks/padrino.rb

@@ -57,6 +57,9 @@ if defined?(::Padrino)
     if defined?(::Padrino::Rendering)
       ::Oboe::Util.send_include(::Padrino::Rendering::InstanceMethods, ::Oboe::PadrinoInst::Rendering)
     end
+  
+    # Report __Init after fork when in Heroku
+    Oboe::API.report_init unless Oboe.heroku?
   end
 
 end

data/lib/oboe/frameworks/rails.rb

@@ -111,7 +111,9 @@ if defined?(::Rails)
           Oboe::Loading.load_access_key
           Oboe::Inst.load_instrumentation
           Oboe::Rails.load_instrumentation
-          Oboe::API.report_init('rack') unless ["development", "test"].include? ENV['RACK_ENV']
+
+          # Report __Init after fork when in Heroku
+          Oboe::API.report_init unless Oboe.heroku?
         end
       end
     end
@@ -128,7 +130,9 @@ if defined?(::Rails)
       Oboe::Inst.load_instrumentation
       Oboe::Rails.load_instrumentation
       Oboe::Rails.include_helpers
-      Oboe::API.report_init('rack') unless ["development", "test"].include? ENV['RACK_ENV']
+      
+      # Report __Init after fork when in Heroku
+      Oboe::API.report_init unless Oboe.heroku?
     end
   end
 end

data/lib/oboe/frameworks/sinatra.rb

@@ -58,6 +58,9 @@ if defined?(::Sinatra)
     # instrumentation won't work anyways.  Only load for pure Sinatra apps.
     ::Oboe::Util.send_include(::Sinatra::Base,      ::Oboe::Sinatra::Base)
     ::Oboe::Util.send_include(::Sinatra::Templates, ::Oboe::Sinatra::Templates)
+      
+    # Report __Init after fork when in Heroku
+    Oboe::API.report_init unless Oboe.heroku?
   end
 end
 

data/lib/oboe/loading.rb

@@ -88,5 +88,10 @@ module Oboe
 end
 
 Oboe::Loading.require_api
-Oboe::Reporter.start
+
+# Auto-start the Reporter unless we running Unicorn on Heroku
+# In that case, we start the reporters after fork
+unless defined?(::Unicorn) and ENV.has_key?('TRACEVIEW_URL')
+  Oboe::Reporter.start
+end
 

data/lib/oboe/version.rb

@@ -5,8 +5,8 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 6 
-    PATCH = 0
-    BUILD = 2 
+    PATCH = 1 
+    BUILD = 0
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/lib/oboe_metal.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
+require 'base'
+
 module Oboe_metal
   class Context
     class << self
@@ -55,7 +57,7 @@ module Oboe_metal
         # Only report __Init from here if we are not instrumenting a framework.
         # Otherwise, frameworks will handle reporting __Init after full initialization
         unless defined?(::Rails) or defined?(::Sinatra) or defined?(::Padrino)
-          Oboe::API.report_init('rack') unless ["development", "test"].include? ENV['RACK_ENV']
+          Oboe::API.report_init
         end
 
       rescue Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.6.0.2
+  version: 2.6.1.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake