oboe-heroku 0.9.17.8 → 0.9.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a4fdece58a3dfd1118d6f5e7ecf2a3c96c9660
-  data.tar.gz: 9fc13b8e1daf90aebb19c76a58b8b2184167c84d
+  metadata.gz: d0b5aa56d9294c1017ea792dd38e0c0bbcc60a93
+  data.tar.gz: 9321069644aa674865087019ea31123e3ce3bd7e
 SHA512:
-  metadata.gz: aa3e0b46571bc2552906e3e04c67e7643d248f9a2facdfbbdcb1a3740142baa469b533a8053b989147c98a57abb6bf8715975b60592a3b520907854a18438400
-  data.tar.gz: 27bf470697791d254b776730cbd2f5930e841690759f23d0f0f299273809ff03b5fac848f77ed3c666a0944152df04f9f085ae963aef1a1dbd3a6052cf5deceb
+  metadata.gz: 1ae617bbad4e0f3e4ca7972774cc855eec7c0ed373805fa77f17047de42623b540f5a6f74d582ecb724646305463c2bee3282d9c5cf5f504bbf372ad493af248
+  data.tar.gz: f977fb67e8d5f9243eeb6ab9f6754464837153cf2eb01ce886ecacae0945adea49768a28e071ba2f5ccd3f64416a0262194fb633989dd8d2e7e45e9dc9117a2b

data/lib/heroku_metal.rb

@@ -33,7 +33,16 @@ module Oboe
     end
 
     def self.sendReport(evt)
-      Oboe.reporter.sendReport(evt) if Oboe.loaded
+      if Oboe.loaded
+        # In the case of the SSL reporter (Heroku) and forking
+        # webservers, we don't start the reporter until we need
+        # it.
+        if !Oboe.reporter
+          Oboe::Reporter.start
+        end
+
+        Oboe.reporter.sendReport(evt)
+      end
     end
   end
 
@@ -104,12 +113,17 @@ module Oboe
     # such as Unicorn or Passenger
     #
     def disconnect!
-      # To avoid an issue with SSL reconnects, delay Reporter initialization
-      # until after the fork is completed.  Here, do nothing for now.
+      # Since we moved to delayed SSL reporter initialization for forking
+      # webservers with preload_app!, these ops now do nothing.
+      # We keep them here for users that already have these calls in
+      # their apps (before/after fork) and in case we want to use them again.
     end
 
     def reconnect!
-      Oboe::Reporter.start
+      # Since we moved to delayed SSL reporter initialization for forking
+      # webservers with preload_app!, these ops now do nothing.
+      # We keep them here for users that already have these calls in
+      # their apps (before/after fork) and in case we want to use them again.
     end
   end
 end

data/lib/oboe-heroku.rb

@@ -23,10 +23,10 @@ begin
     ::OboeHeroku::Loading.configure if Oboe.loaded
   end
 rescue LoadError => e
-  $stderr.puts "[oboe-heroku/error] Failed to load support libs: #{e.message}"
   Oboe.loaded = false
 
   if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
+    $stderr.puts "[oboe-heroku/error] Failed to load support libs: #{e.message}"
     $stderr.puts e.backtrace.join("\n")
   end
 rescue Exception => e

data/lib/oboe-heroku/base.rb

@@ -31,8 +31,8 @@ module OboeBase
 
   attr_accessor :reporter
   attr_accessor :loaded
-  attr_accessor :sample_source
-  attr_accessor :sample_rate
+  thread_local :sample_source
+  thread_local :sample_rate
   thread_local :layer
   thread_local :layer_op
 
@@ -183,7 +183,12 @@ module OboeBase
   # Determines if we are running under a forking webserver
   #
   def forking_webserver?
-    (defined?(::Unicorn) && ($PROGRAM_NAME =~ /unicorn/i)) ? true : false
+    if (defined?(::Unicorn) && ($PROGRAM_NAME =~ /unicorn/i)) ||
+       (defined?(::Puma)    && ($PROGRAM_NAME =~ /puma/i))
+      true
+    else
+      false
+    end
   end
 
   ##

data/lib/oboe-heroku/version.rb

@@ -2,8 +2,8 @@ module OboeHeroku
   module Version
     MAJOR = 0
     MINOR = 9
-    PATCH = 17
-    BUILD = 8
+    PATCH = 18
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/oboe-heroku.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.extensions = ['ext/oboe_metal/extconf.rb']
 
-  s.add_dependency(%q<oboe>, [">= 2.7.8.1"])
+  s.add_dependency(%q<oboe>, [">= 2.7.14.1"])
 
   s.add_development_dependency 'rake', '>= 0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe-heroku
 version: !ruby/object:Gem::Version
-  version: 0.9.17.8
+  version: 0.9.18.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.8.1
+        version: 2.7.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.8.1
+        version: 2.7.14.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for the Heroku platform