oboe-heroku 0.9.14.4 → 0.9.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09484b9fe45f61da96ed10ded3e01b791e1ad82f
-  data.tar.gz: 2324d8eed83cce559361b32ac4d9ca42147e0bd8
+  metadata.gz: 77b525534ab23bff7247bc648e85de1e53542e6c
+  data.tar.gz: d141e8a197b1cdb1bac0ba87a5303faa3ad3c57e
 SHA512:
-  metadata.gz: 040d95a18c76a3b848893d1e98adcc6f1ffba6b173ef982dc9d2b1dd958b3c221aeae1f025c911863729604cb2582a256af4d91b59d705486cc3711bdcc0478d
-  data.tar.gz: 1bb1087081192a6a8571827ec9963f33a6fb1b54cfafe7230f96677fa77a21e55e09b0e713dd3c1251b9b5ff28b1d75f9ca34685bb6a4e834c7a1ff122215912
+  metadata.gz: aa1eabb362855ec18c834b9f191c1c7cb466fb31896bb2007d44a378b8df5296ba64e19e3affaedf53f9c50a30bc1455b203791a489e4a5c1f8e1bd8ed1de135
+  data.tar.gz: d44d39fa3854a20d79cdf5a31c2e57b92efa1e965411d17415f6b07d3b35b8320f420eb127d6aad9e85c9e2873f24c8863e13b5ad1e280a60231db503a6a0b17

data/Gemfile

@@ -1,14 +1,26 @@
 source 'https://rubygems.org'
 
-# Import dependencies from oboe-heroku.gemspec
-gemspec :name => 'oboe-heroku'
+group :development, :test do
+  gem 'minitest'
+  gem 'minitest-reporters'
+  gem 'rack-test'
+  gem 'appraisal'
+end
 
 group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-
-  gem 'rb-inotify', :require => false
-  gem 'rb-fsevent', :require => false
-  gem 'rb-fchange', :require => false
+  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
+  gem 'debugger',     :platform  =>   :mri_19
+  gem 'byebug',       :platforms => [ :mri_20, :mri_21 ]
+  gem 'perftools.rb', :platforms => [ :mri_20, :mri_21 ], :require => 'perftools'
+  if RUBY_VERSION > '1.8.7'
+    gem 'pry'
+  else
+    gem 'pry', '0.9.12.4'
+  end
 end
 
+gem 'oboe', :path => "~/Projects/oboe-ruby"
+
+# Import dependencies from oboe-heroku.gemspec
+gemspec :name => 'oboe-heroku'
+

data/Gemfile.lock

@@ -1,65 +1,77 @@
 PATH
   remote: .
   specs:
-    oboe-heroku (0.9.13.1)
-      oboe (>= 2.6.5.1)
+    oboe-heroku (0.9.15.3)
+      oboe (>= 2.7.1.6)
+
+PATH
+  remote: ~/Projects/oboe-ruby
+  specs:
+    oboe (2.7.1.6)
+      json
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ansi (1.4.3)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    byebug (3.2.0)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     coderay (1.0.9)
-    diff-lcs (1.2.4)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    guard (1.8.2)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (3.0.2)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    json (0.4.3)
-    listen (1.3.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
+    columnize (0.8.9)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.5)
+    json (1.8.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     method_source (0.8.2)
-    oboe (2.6.5.1)
-      json (~> 0.4, >= 0.4.0)
+    minitest (5.4.1)
+    minitest-reporters (1.0.5)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    perftools.rb (2.0.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
-    rb-fchange (0.0.6)
-      ffi
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    rbx-require-relative (0.0.9)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-progressbar (1.5.1)
     slop (3.4.6)
-    thor (0.18.1)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  guard
-  guard-rspec
+  appraisal
+  byebug
+  debugger
+  minitest
+  minitest-reporters
+  oboe!
   oboe-heroku!
+  perftools.rb
+  pry
+  rack-test
   rake
-  rb-fchange
-  rb-fsevent
-  rb-inotify
+  ruby-debug

data/Rakefile

@@ -1,16 +1,108 @@
 #!/usr/bin/env rake
 
+require 'rubygems'
+require 'bundler/setup'
 require 'rake/testtask'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new('spec')
+require 'appraisal'
 
 Rake::TestTask.new do |t|
-  t.libs << 'spec'
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+  if defined?(JRUBY_VERSION)
+    t.ruby_opts = ["-J-javaagent:/usr/local/tracelytics/tracelyticsagent.jar"]
+  end
+end
+
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+else
+  task :default => :test
+end
+
+desc "Build the gem's c extension"
+task :compile do
+  unless defined?(JRUBY_VERSION)
+    puts "== Building the c extension against Ruby #{RUBY_VERSION}"
+
+    pwd     = Dir.pwd
+    ext_dir = File.expand_path('ext/oboe_metal')
+    lib_dir = File.expand_path('lib')
+    symlink = File.expand_path('lib/oboe_metal.so')
+    so_file = File.expand_path('ext/oboe_metal/oboe_metal.so')
+
+    Dir.chdir ext_dir
+    cmd = [ Gem.ruby, 'extconf.rb']
+    sh cmd.join(' ')
+    sh '/usr/bin/env make'
+    File.delete symlink if File.exist? symlink
+
+    if File.exists? so_file
+      File.symlink so_file, symlink
+      Dir.chdir pwd
+      puts "== Extension built and symlink'd to #{symlink}"
+    else
+      Dir.chdir pwd
+      puts "!! Extension failed to build (see above).  Are the base TraceView packages installed?"
+      puts "!! See https://support.appneta.com/cloud/installing-traceview"
+    end
+  else
+    puts "== Nothing to do under JRuby."
+  end
+end
+
+desc "Clean up extension build files"
+task :clean do
+  unless defined?(JRUBY_VERSION)
+    pwd     = Dir.pwd
+    ext_dir = File.expand_path('ext/oboe_metal')
+    lib_dir = File.expand_path('lib')
+    symlink = File.expand_path('lib/oboe_metal.so')
+    so_file = File.expand_path('ext/oboe_metal/oboe_metal.so')
+
+    Dir.chdir ext_dir
+    sh '/usr/bin/env make clean'
+
+    Dir.chdir pwd
+  else
+    puts "== Nothing to do under JRuby."
+  end
+end
+
+desc "Remove all built files and extensions"
+task :distclean do
+  unless defined?(JRUBY_VERSION)
+    pwd     = Dir.pwd
+    ext_dir = File.expand_path('ext/oboe_metal')
+    lib_dir = File.expand_path('lib')
+    symlink = File.expand_path('lib/oboe_metal.so')
+    so_file = File.expand_path('ext/oboe_metal/oboe_metal.so')
+    mkmf_log = File.expand_path('ext/oboe_metal/mkmf.log')
+
+    if File.exists? mkmf_log
+      Dir.chdir ext_dir
+      File.delete symlink if File.exist? symlink
+      sh '/usr/bin/env make distclean'
+
+      Dir.chdir pwd
+    else
+      puts "Nothing to distclean. (nothing built yet?)"
+    end
+  else
+    puts "== Nothing to do under JRuby."
+  end
+end
+
+desc "Rebuild the gem's c extension"
+task :recompile => [ :distclean, :compile ]
+
+task :console do
+  ENV['TRACEVIEW_URL'] = "http://something"
+  ENV['TRACEVIEW_DEBUG_LEVEL'] = "5"
+  require 'pry'
+  require 'oboe-heroku'
+  ARGV.clear
+  Pry.start
 end
 
-desc "Run tests"
-task :default => :spec
-task :test => :spec
 
-Dir["tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)

data/lib/heroku_metal.rb

@@ -1,8 +1,6 @@
 # Copyright (c) 2013 AppNeta
 # All rights reserved.
 
-require 'oboe-heroku/base'
-
 module Oboe
   extend OboeBase
   include Oboe_metal

data/lib/oboe-heroku/base.rb

@@ -22,32 +22,27 @@ 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
+  extend ::Oboe::ThreadLocal
+
   attr_accessor :reporter
   attr_accessor :loaded
   attr_accessor :sample_source
   attr_accessor :sample_rate
+  thread_local :layer_op
 
   def self.included(cls)
     self.loaded = true
   end
 
+  def tracing_layer_op?(operation)
+    if operation.is_a?(Array)
+      return operation.include?(Oboe.layer_op)
+    else
+      return Oboe.layer_op == operation
+    end
+  end
+
   def always?
     Oboe::Config[:tracing_mode].to_s == "always"
   end
@@ -105,3 +100,7 @@ module OboeBase
 
 end
 
+module Oboe
+  extend OboeBase
+end
+

data/lib/oboe-heroku/thread_local.rb

@@ -0,0 +1,18 @@
+# Copyright (c) 2014 AppNeta, Inc.
+# All rights reserved.
+
+module Oboe
+  module ThreadLocal
+    def thread_local(name)
+      key = "__#{self}_#{name}__".intern
+
+      define_method(name) do
+        Thread.current[key]
+      end
+
+      define_method(name.to_s + "=") do |value|
+        Thread.current[key] = value
+      end
+    end
+  end
+end

data/lib/oboe-heroku/version.rb

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

data/lib/oboe-heroku.rb

@@ -5,17 +5,11 @@ 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.has_key?('TRACEVIEW_URL') and ENV['RAILS_GROUP'] != 'assets'
-    begin
-      require 'heroku_metal'
-      require 'oboe_metal.so'
-    rescue LoadError => e
-      Oboe.loaded = false
-      
-      if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
-        $stderr.puts "[oboe-heroku/error] Could not load all dependencies: #{e.message}"
-        $stderr.puts e.backtrace.join("\n")
-      end
-    end
+
+    require "oboe-heroku/thread_local"
+    require 'oboe-heroku/base'
+    require 'oboe_metal.so'
+    require 'heroku_metal'
 
     require 'oboe-heroku/loading'
     require 'oboe-heroku/version'
@@ -25,10 +19,17 @@ begin
 
     ::OboeHeroku::Loading.configure if Oboe.loaded
   end
+rescue LoadError => e
+  Oboe.loaded = false
+  $stderr.puts "[oboe-heroku/error] Failed to load support libs: #{e.message}"
+
+  if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
+    $stderr.puts e.backtrace.join("\n")
+  end
 rescue Exception => e
   Oboe.loaded = false
+  $stderr.puts "[oboe-heroku/error] #{e.message}"
 
-  $stderr.puts "[oboe-heroku/error] Problem loading: #{e.message}"
   if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
     $stderr.puts e.backtrace.join("\n")
   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.6.7.1"])
+  s.add_dependency(%q<oboe>, [">= 2.7.1.7"])
 
   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.14.4
+  version: 0.9.15.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-09-08 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.7.1
+        version: 2.7.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.7.1
+        version: 2.7.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,7 @@ files:
 - lib/oboe-heroku.rb
 - lib/oboe-heroku/base.rb
 - lib/oboe-heroku/loading.rb
+- lib/oboe-heroku/thread_local.rb
 - lib/oboe-heroku/version.rb
 - oboe-heroku.gemspec
 - tasks/.keep
@@ -109,3 +110,4 @@ signing_key:
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for the Heroku platform
 test_files: []
+has_rdoc: