oboe-heroku 0.9.15.6 → 0.9.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b525534ab23bff7247bc648e85de1e53542e6c
-  data.tar.gz: d141e8a197b1cdb1bac0ba87a5303faa3ad3c57e
+  metadata.gz: bc6c39cb8e4cc43a47e7efbe89d3a8094f32640e
+  data.tar.gz: d1d5f2fe48c8143d07055e9616c030553b7dae3c
 SHA512:
-  metadata.gz: aa1eabb362855ec18c834b9f191c1c7cb466fb31896bb2007d44a378b8df5296ba64e19e3affaedf53f9c50a30bc1455b203791a489e4a5c1f8e1bd8ed1de135
-  data.tar.gz: d44d39fa3854a20d79cdf5a31c2e57b92efa1e965411d17415f6b07d3b35b8320f420eb127d6aad9e85c9e2873f24c8863e13b5ad1e280a60231db503a6a0b17
+  metadata.gz: df68a3e633f1464ff52e27815857dd6200282c4a805a4704bab14231218ea949c051d77f952d88e13eace53e0fe03cf5f3c3d078b173abaf89f80b49ab4afa36
+  data.tar.gz: 42322e7bf47284592a572761f7a8ffef1af8bd3147e07e93c0b1ec97571b7930c418569821f0460cf48d2869647630976a2708db1abd7d5c6df3cfcf77531c91

data/lib/oboe-heroku/base.rb

@@ -22,16 +22,21 @@ SAMPLE_SOURCE_MASK = 0b1111000000000000000000000000
 ZERO_SAMPLE_RATE_MASK   = 0b1111000000000000000000000000
 ZERO_SAMPLE_SOURCE_MASK = 0b0000111111111111111111111111
 
+##
+# This module is the base module for the various implementations of Oboe reporting.
+# Current variations as of 2014-09-10 are a c-extension, JRuby (using TraceView Java
+# instrumentation) and a Heroku c-extension (with embedded tracelyzer)
 module OboeBase
   extend ::Oboe::ThreadLocal
 
   attr_accessor :reporter
+  attr_accessor :collector
   attr_accessor :loaded
-  attr_accessor :sample_source
-  attr_accessor :sample_rate
-  thread_local :layer_op
+  thread_local  :sample_source
+  thread_local  :sample_rate
+  thread_local  :layer_op
 
-  def self.included(cls)
+  def self.included(_)
     self.loaded = true
   end
 
@@ -43,26 +48,46 @@ module OboeBase
     end
   end
 
+  ##
+  # Returns true if the tracing_mode is set to always.
+  # False otherwise
+  #
   def always?
-    Oboe::Config[:tracing_mode].to_s == "always"
+    Oboe::Config[:tracing_mode].to_s == 'always'
   end
 
+  ##
+  # Returns true if the tracing_mode is set to never.
+  # False otherwise
+  #
   def never?
-    Oboe::Config[:tracing_mode].to_s == "never"
+    Oboe::Config[:tracing_mode].to_s == 'never'
   end
 
+  ##
+  # Returns true if the tracing_mode is set to always or through.
+  # False otherwise
+  #
   def passthrough?
-    ["always", "through"].include?(Oboe::Config[:tracing_mode])
+    %w(always through).include?(Oboe::Config[:tracing_mode])
   end
 
+  ##
+  # Returns true if the tracing_mode is set to through.
+  # False otherwise
+  #
   def through?
-    Oboe::Config[:tracing_mode] == "through"
+    Oboe::Config[:tracing_mode] == 'through'
   end
 
+  ##
+  # Returns true if we are currently tracing a request
+  # False otherwise
+  #
   def tracing?
     return false unless Oboe.loaded
 
-    Oboe::Context.isValid and not Oboe.never?
+    Oboe::Context.isValid && !Oboe.never?
   end
 
   def log(layer, label, options = {})
@@ -71,36 +96,45 @@ module OboeBase
   end
 
   def heroku?
-    true
+    ENV['TRACEVIEW_URL']
   end
 
+  ##
+  # Determines if we are running under a forking webserver
+  #
   def forking_webserver?
-    (defined?(::Unicorn) and ($0 =~ /unicorn/i)) ? true : false
+    (defined?(::Unicorn) && ($PROGRAM_NAME =~ /unicorn/i)) ? true : false
+  end
+
+  ##
+  # Indicates whether a supported framework is in use
+  # or not
+  #
+  def framework?
+    defined?(::Rails) or defined?(::Sinatra) or defined?(::Padrino) or defined?(::Grape)
   end
 
   ##
   # These methods should be implemented by the descendants
   # (Oboe_metal, Oboe_metal (JRuby), Heroku_metal)
   #
-  def sample?(opts = {})
-    raise "sample? should be implemented by metal layer."
+  def sample?(_opts = {})
+    fail 'sample? should be implemented by metal layer.'
   end
 
-  def log(layer, label, options = {})
-    raise "log should be implemented by metal layer."
+  def log(_layer, _label, _options = {})
+    fail 'log should be implemented by metal layer.'
   end
 
-  def set_tracing_mode(mode)
-    raise "set_tracing_mode should be implemented by metal layer."
+  def set_tracing_mode(_mode)
+    fail 'set_tracing_mode should be implemented by metal layer.'
   end
 
-  def set_sample_rate(rate)
-    raise "set_sample_rate should be implemented by metal layer."
+  def set_sample_rate(_rate)
+    fail 'set_sample_rate should be implemented by metal layer.'
   end
-
 end
 
 module Oboe
   extend OboeBase
 end
-

data/lib/oboe-heroku/version.rb

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

data/lib/oboe-heroku.rb

@@ -34,4 +34,3 @@ rescue Exception => e
     $stderr.puts e.backtrace.join("\n")
   end
 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.1.7"])
+  s.add_dependency(%q<oboe>, [">= 2.7.2.2"])
 
   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.15.6
+  version: 0.9.16.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-26 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.1.7
+        version: 2.7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.7
+        version: 2.7.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement