oboe-heroku 0.8.0.27.beta2 → 0.9.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fa6cde0325de70e2f6e7218a1c9f4268f136834a
+  data.tar.gz: 38e42a03e506dc439db13cc4ef2535d1dacef956
+SHA512:
+  metadata.gz: 35790a7bb3634e1750299e97451bea1f3be21853dac3d9cd94ed0cfe2dff50d448a6a4fc445e6d7a3cf222d22e783d5b215fe501ad0bb44d286a1a6b9fcceed6
+  data.tar.gz: 9365f4ac4a3c1942e9d512a28811c62b8200ad4567f69c83f866de7faf894b0ed21f1940aa7030f02f4479ec9f489da12dd00610caa6ab3e7160f069e734812c

data/lib/base.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
+module OboeBase
+  attr_accessor :reporter
+  attr_accessor :loaded
+
+  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
+
+  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)
+  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."
+  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/heroku_metal.rb

@@ -1,20 +1,14 @@
 # Copyright (c) 2013 AppNeta
 # All rights reserved.
 
-module Oboe_metal
-  class Event
-    def self.metadataString(evt)
-      evt.metadataString()
-    end
-  end
+require 'base'
 
+module Oboe_metal
   class Context
     class << self
       attr_accessor :layer_op
-
-      def log(layer, label, options = {}, with_backtrace = true)
-        Oboe.logger.debug "HerokuMetal log: layer: #{layer}, label: #{label}, options: #{options}, with_backtrace: #{with_backtrace.to_s}"
-
+      
+      def log(layer, label, options = {}, with_backtrace = false)
         evt = Oboe::Context.createEvent()
         evt.addInfo("Layer", layer.to_s)
         evt.addInfo("Label", label.to_s)
@@ -24,9 +18,10 @@ module Oboe_metal
         end
 
         evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
+
         Oboe.reporter.sendReport(evt)
       end
-
+       
       def tracing_layer_op?(operation)
         if operation.is_a?(Array)
           return operation.include?(@layer_op)
@@ -37,6 +32,12 @@ module Oboe_metal
     end
   end
 
+  class Event
+    def self.metadataString(evt)
+      evt.metadataString()
+    end
+  end
+  
   class Reporter
     ##
     # Initialize the Oboe Context, reporter and report the initialization
@@ -62,24 +63,12 @@ module Oboe_metal
   end
 end
 
-module Oboe
+module Oboe 
+  extend OboeBase
   include Oboe_metal
 
   class << self
-    attr_accessor :reporter
-
-    def always?
-      Oboe::Config[:tracing_mode].to_s == "always"
-    end
-    
-    def never?
-      Oboe::Config[:tracing_mode].to_s == "never"
-    end
 
-    def passthrough?
-      ["always", "through"].include?(Oboe::Config[:tracing_mode])
-    end
-      
     def sample?(opts = {})
       # Assure defaults since SWIG enforces Strings
       opts[:layer]      ||= ''
@@ -87,25 +76,48 @@ module Oboe
       opts['TV-Meta']   ||= ''
       Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['TV-Meta'])
     end
-
-    def through?
-      Oboe::Config[:tracing_mode] == "through"
+    
+    def set_tracing_mode(mode)
+      return unless Oboe.loaded
+
+      value = mode.to_sym
+
+      case value
+      when :never
+        # OBOE_TRACE_NEVER
+        Oboe::Context.setTracingMode(0)
+      when :always
+        # OBOE_TRACE_ALWAYS
+        Oboe::Context.setTracingMode(1)
+      when :through
+        # OBOE_TRACE_THROUGH
+        Oboe::Context.setTracingMode(2)
+      else
+        Oboe.logger.fatal "[oboe/error] Invalid tracing mode set: #{mode}"
+        # OBOE_TRACE_ALWAYS
+        Oboe::Context.setTracingMode(1)
+      end
     end
-      
-    def tracing?
-      Oboe::Context.isValid and not Oboe.never?
+    
+    def set_sample_rate(rate)
+      if Oboe.loaded
+        # Update liboboe with the new SampleRate value
+        Oboe::Context.setDefaultSampleRate(rate.to_i)
+      end
     end
 
     # Disconnect/Reconnect wrappers used for forking webservers
     # such as Unicorn or Passenger
     #
     def disconnect!
-      ::Oboe::Context.disconnect(::Oboe.reporter)
+      ::Oboe::Context.disconnect(::Oboe.reporter) if Oboe.loaded
     end
 
     def reconnect!
-      ::Oboe::Context.reconnect(::Oboe.reporter)
+      ::Oboe::Context.reconnect(::Oboe.reporter) if Oboe.loaded
     end
   end
 end
 
+Oboe.loaded = true
+

data/lib/oboe-heroku/version.rb

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

data/lib/oboe-heroku.rb

@@ -3,8 +3,16 @@
 
 begin
   if ENV.has_key?('TRACEVIEW_URL')
-    require 'oboe_metal.so'
-    require 'heroku_metal'
+    begin
+      require 'heroku_metal'
+      require 'oboe_metal.so'
+    rescue LoadError => e
+      if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
+        $stderr.puts "[oboe-heroku/error] Could not load oboe-heroku dependencies: #{e.message}"
+        $stderr.puts e.backtrace.join("\n")
+      end
+    end
+
     require 'oboe-heroku/loading'
     require 'oboe-heroku/version'
 
@@ -13,11 +21,8 @@ begin
 
     ::OboeHeroku::Loading.initialize
   end
-rescue LoadError
-  if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
-    $stderr.puts "[oboe-heroku/error] Could not load oboe-heroku dependencies."
-  end
 rescue Exception => e
-  $stderr.puts "[oboe-heroku/error] Problem loading: #{e.inspect}"
+  $stderr.puts "[oboe-heroku/error] Problem loading: #{e.message}"
   $stderr.puts e.backtrace.join("\n")
 end
+

data/oboe-heroku.gemspec

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe-heroku
 version: !ruby/object:Gem::Version
-  version: 0.8.0.27.beta2
-  prerelease: 9
+  version: 0.9.0.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The oboe-heroku gem provides TraceView instrumentation for Ruby and Ruby
@@ -98,6 +91,7 @@ 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/loading.rb
@@ -106,26 +100,25 @@ files:
 - tasks/.keep
 homepage: http://www.appneta.com/application-performance-management
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for the Heroku platform
 test_files: []