oboe-heroku 0.9.17.4 → 0.9.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c91e362bef82bc73ca272c0c58ff1e3b5cd34bf
-  data.tar.gz: e759d1afabd1393c399ed6a4b5274779df880dcf
+  metadata.gz: 10a4fdece58a3dfd1118d6f5e7ecf2a3c96c9660
+  data.tar.gz: 9fc13b8e1daf90aebb19c76a58b8b2184167c84d
 SHA512:
-  metadata.gz: a01d74e37e4a503831328d1897ab21a81d4660c22d2ffd1b5f5f1fdbf31fde8da2534c20c790965cfffff77233b4a985fc1d8f6e5edefda654f1c1444e96b097
-  data.tar.gz: d5a683440d9a113fa47c7554fe86c5141046a083d6850cc4401e7436d3e7f3d881e45a0982a994fcfce010b1bfd5ab9389109ec495dba72db40770bd293a3a6e
+  metadata.gz: aa3e0b46571bc2552906e3e04c67e7643d248f9a2facdfbbdcb1a3740142baa469b533a8053b989147c98a57abb6bf8715975b60592a3b520907854a18438400
+  data.tar.gz: 27bf470697791d254b776730cbd2f5930e841690759f23d0f0f299273809ff03b5fac848f77ed3c666a0944152df04f9f085ae963aef1a1dbd3a6052cf5deceb

data/lib/heroku_metal.rb

@@ -45,24 +45,31 @@ module Oboe
 
   class << self
     def sample?(opts = {})
-      return false unless Oboe.always?
-
-      # Assure defaults since SWIG enforces Strings
-      opts[:layer]      ||= ''
-      opts[:xtrace]     ||= ''
-      opts['X-TV-Meta'] ||= ''
-
-      rv = Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
-
-      # For older liboboe that returns true/false, just return that.
-      return rv if [TrueClass, FalseClass].include?(rv.class) or (rv == 0)
-
-      # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
-      # source embedded
-      Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
-      Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
-
-      rv
+      begin
+        return false unless Oboe.always? && Oboe.loaded
+
+        # Assure defaults since SWIG enforces Strings
+        layer   = opts[:layer]      ? opts[:layer].strip      : ''
+        xtrace  = opts[:xtrace]     ? opts[:xtrace].strip     : ''
+        tv_meta = opts['X-TV-Meta'] ? opts['X-TV-Meta'].strip : ''
+
+        rv = Oboe::Context.sampleRequest(layer, xtrace, tv_meta)
+
+        if rv == 0
+          Oboe.sample_rate = -1
+          Oboe.sample_source = -1
+          false
+        else
+          # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
+          # source embedded
+          Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
+          Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
+          true
+        end
+      rescue StandardError => e
+        Oboe.logger.debug "[oboe/error] sample? error: #{e.inspect}"
+        false
+      end
     end
 
     def set_tracing_mode(mode)

data/lib/oboe-heroku/version.rb

@@ -3,7 +3,7 @@ module OboeHeroku
     MAJOR = 0
     MINOR = 9
     PATCH = 17
-    BUILD = 4
+    BUILD = 8
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/lib/oboe-heroku.rb

@@ -9,7 +9,7 @@ begin
 
   # TRACEVIEW_URL env var is standard with the Heroku addon.  We
   # use it to determine if we are actually running in Heroku or not.
-  if ENV.key?('TRACEVIEW_URL') and (($0 =~ /rake$/i) == nil)
+  if ENV.key?('TRACEVIEW_URL')
 
     require 'oboe_metal.so'
     require 'heroku_metal'

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.6.2"])
+  s.add_dependency(%q<oboe>, [">= 2.7.8.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.4
+  version: 0.9.17.8
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-09 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.6.2
+        version: 2.7.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.6.2
+        version: 2.7.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement