oboe-heroku 0.9.13.3 → 0.9.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e19a6d5b316d67d558bd4e176e8708d6614000e
-  data.tar.gz: c38edda77b680dbb883b064a4404cf9cdb49bd58
+  metadata.gz: 09484b9fe45f61da96ed10ded3e01b791e1ad82f
+  data.tar.gz: 2324d8eed83cce559361b32ac4d9ca42147e0bd8
 SHA512:
-  metadata.gz: 4aca4a66c27e1e7664195eb25da0493f790fc5b24be3235c2307dafecc04395ef0b3f08e9891f0823e5e0004776a1bb64b1d161ef6702d5e0a479ae748d82e71
-  data.tar.gz: 64a8389dc0891ecc9cc78a474f51844faa8924455fdc1838ad07c4563366366b13be7786536c70b9d5557f38ac301de4ee91f2a43fe1cf4e8d73e6ab5c1d31f9
+  metadata.gz: 040d95a18c76a3b848893d1e98adcc6f1ffba6b173ef982dc9d2b1dd958b3c221aeae1f025c911863729604cb2582a256af4d91b59d705486cc3711bdcc0478d
+  data.tar.gz: 1bb1087081192a6a8571827ec9963f33a6fb1b54cfafe7230f96677fa77a21e55e09b0e713dd3c1251b9b5ff28b1d75f9ca34685bb6a4e834c7a1ff122215912

data/lib/heroku_metal.rb

@@ -1,43 +1,12 @@
 # Copyright (c) 2013 AppNeta
 # All rights reserved.
 
-require 'base'
-
-module Oboe_metal
-  class Context
-    class << self
-      attr_accessor :layer_op
-      
-      def log(layer, label, options = {}, with_backtrace = false)
-        evt = Oboe::Context.createEvent()
-        evt.addInfo("Layer", layer.to_s)
-        evt.addInfo("Label", label.to_s)
-
-        options.each_pair do |k, v|
-          evt.addInfo(k.to_s, v.to_s)
-        end
-
-        evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
+require 'oboe-heroku/base'
 
-        Oboe.reporter.sendReport(evt) if Oboe.loaded
-      end
-       
-      def tracing_layer_op?(operation)
-        if operation.is_a?(Array)
-          return operation.include?(@layer_op)
-        else
-          return @layer_op == operation
-        end
-      end
-    end
-  end
+module Oboe
+  extend OboeBase
+  include Oboe_metal
 
-  class Event
-    def self.metadataString(evt)
-      evt.metadataString()
-    end
-  end
-  
   class Reporter
     ##
     # Initialize the Oboe Context, reporter and report the initialization
@@ -54,9 +23,9 @@ module Oboe_metal
         Oboe_metal::Context.init()
 
         Oboe.logger.debug "[oboe/debug] Initializing Heroku based reporter."
-        
+
         # The Oboe Reporter is configured via Heroku config variables.
-        Oboe.reporter = Oboe::Reporter.new(nil, nil)
+        Oboe.reporter = Oboe_metal::Reporter.new(nil, nil)
 
         Oboe::API.report_init
       rescue Exception => e
@@ -69,14 +38,17 @@ module Oboe_metal
       Oboe.reporter.sendReport(evt) if Oboe.loaded
     end
   end
-end
 
-module Oboe 
-  extend OboeBase
-  include Oboe_metal
+  class Event
+    def self.metadataString(evt)
+      evt.metadataString()
+    end
+  end
 
   class << self
     def sample?(opts = {})
+      return false unless Oboe.always?
+
       # Assure defaults since SWIG enforces Strings
       opts[:layer]      ||= ''
       opts[:xtrace]     ||= ''
@@ -94,7 +66,7 @@ module Oboe
 
       rv
     end
-    
+
     def set_tracing_mode(mode)
       return unless Oboe.loaded
 

data/lib/{base.rb → oboe-heroku/base.rb}

@@ -1,6 +1,6 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
-  
+
 # Constants from liboboe
 OBOE_TRACE_NEVER   = 0
 OBOE_TRACE_ALWAYS  = 1
@@ -22,6 +22,22 @@ SAMPLE_SOURCE_MASK = 0b1111000000000000000000000000
 ZERO_SAMPLE_RATE_MASK   = 0b1111000000000000000000000000
 ZERO_SAMPLE_SOURCE_MASK = 0b0000111111111111111111111111
 
+module Oboe_metal
+  class Context
+    class << self
+      attr_accessor :layer_op
+
+      def tracing_layer_op?(operation)
+        if operation.is_a?(Array)
+          return operation.include?(@layer_op)
+        else
+          return @layer_op == operation
+        end
+      end
+    end
+  end
+end
+
 module OboeBase
   attr_accessor :reporter
   attr_accessor :loaded
@@ -31,11 +47,11 @@ module OboeBase
   def self.included(cls)
     self.loaded = true
   end
-  
+
   def always?
     Oboe::Config[:tracing_mode].to_s == "always"
   end
-  
+
   def never?
     Oboe::Config[:tracing_mode].to_s == "never"
   end
@@ -43,19 +59,20 @@ module OboeBase
   def passthrough?
     ["always", "through"].include?(Oboe::Config[:tracing_mode])
   end
-  
+
   def through?
     Oboe::Config[:tracing_mode] == "through"
   end
-  
+
   def tracing?
     return false unless Oboe.loaded
 
     Oboe::Context.isValid and not Oboe.never?
   end
-  
+
   def log(layer, label, options = {})
-    Context.log(layer, label, options = options)
+    # WARN: Oboe.log will be deprecated in a future release.  Please use Oboe::API.log instead.
+    Oboe::API.log(layer, label, options)
   end
 
   def heroku?
@@ -73,17 +90,18 @@ module OboeBase
   def sample?(opts = {})
     raise "sample? should be implemented by metal layer."
   end
-  
+
   def log(layer, label, options = {})
     raise "log should be implemented by metal layer."
   end
-    
+
   def set_tracing_mode(mode)
     raise "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."
   end
+
 end
 

data/lib/oboe-heroku/version.rb

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

data/oboe-heroku.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.date = Time.now.strftime('%Y-%m-%d')
 
   s.license = "AppNeta Open License, Version 1.0"
-  
+
   s.authors = ["Peter Giacomo Lombardo", "Guy Lancaster"]
   s.email = %q{traceviewsupport@appneta.com}
   s.homepage = %q{http://www.appneta.com/application-performance-management}
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["LICENSE"]
   s.files = `git ls-files`.split("\n")
   s.test_files  = Dir.glob("{spec}/**/*.rb")
-   
+
   s.extensions = ['ext/oboe_metal/extconf.rb']
-    
-  s.add_dependency(%q<oboe>, [">= 2.6.5.5"])
+
+  s.add_dependency(%q<oboe>, [">= 2.6.7.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.13.3
+  version: 0.9.14.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5.5
+        version: 2.6.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5.5
+        version: 2.6.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,9 +77,9 @@ files:
 - ext/oboe_metal/src/oboe/oboe.h
 - ext/oboe_metal/src/oboe/oboe_debug.h
 - ext/oboe_metal/src/oboe_wrap.cxx
-- lib/base.rb
 - lib/heroku_metal.rb
 - lib/oboe-heroku.rb
+- lib/oboe-heroku/base.rb
 - lib/oboe-heroku/loading.rb
 - lib/oboe-heroku/version.rb
 - oboe-heroku.gemspec