oboe 2.6.6.1 → 2.6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b047a073e88c218371312a035decc488059eaa
-  data.tar.gz: c4893000d6fc960a84ac93f84e5b4b26ffef9713
+  metadata.gz: 8f433a30233b7bcf02a8334f30a2b70c6e0ff20d
+  data.tar.gz: 4f5024d368825709de09b87c17572cb8e6241fdd
 SHA512:
-  metadata.gz: 3e59b0470032680bf931922fce2ea4e402a75bc430aacc14739e7d02cd44a08f3c3634e7f82009ce457dbb3df691c503cba444b15b52fa58f94e8a4314599a87
-  data.tar.gz: c52b420be49fc23794252e0f68aa9b6d6834e76173f8ca485f02bdf27dd70e80bad07116c206d4cb2b70520c65cd10249f9a23ca0e08bb44a9d3e774d8aa20f7
+  metadata.gz: 1141ad7b9271ee2dc3c4aa26c8263f34d4e15e41ae5fd214ef8d9a2d1c5de2e4fa75c24680a7cca7e880c19b7ea2fb03a8af8371a2cfaf3a8e18d856c601ccfa
+  data.tar.gz: 1b45262da56437de57cafeb959b1227323f329292a5a75cdb1fe9dfe6d19c2608b311476491ff926afdef74f1ad7730352554c2dbf6d4b2fbb8f03861a677b5c

data/.travis.yml

@@ -7,6 +7,10 @@ rvm:
   - 1.8.7
   - ree
 
+#gemfile:
+#  - gemfiles/mongo.gemfile
+#  - gemfiles/moped.gemfile
+
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 before_install:
@@ -26,6 +30,8 @@ before_script:
   - bundle install --without development
   - bundle exec rake compile
 
+script: "bundle exec rake test"
+
 services: 
   - mongodb
   - memcached

data/Appraisals

@@ -1,20 +1,10 @@
 
-appraise "rails2.3" do
-  gem "rails", "~> 2.3.18"
-  gem "oboe", :path => "../"
+appraise "mongo" do
+  gem 'mongo'
 end
 
-appraise "rails3.0" do
-  gem "rails", "~> 3.0.20"
-  gem "oboe", :path => "../"
-end
-
-appraise "rails3.1" do
-  gem "rails", "~> 3.1.12"
-  gem "oboe", :path => "../"
-end
-
-appraise "rails3.2" do
-  gem "rails", "~> 3.2.13"
-  gem "oboe", :path => "../"
+if RUBY_VERSION >= '1.9'
+  appraise "moped" do
+    gem 'moped', "~> 1.5"
+  end
 end

data/CHANGELOG.md

@@ -1,12 +1,28 @@
-# oboe 2.6.5.5 (06/02/14)
+# oboe 2.6.7 (07/14/2014)
+
+This patch release includes better error handling, API clean-up and RUM template improvements.
+
+* [Add RUM helpers](https://github.com/appneta/oboe-ruby/pull/56) for Sinatra and Padrino stacks.  Thanks @tlunter!
+* Prefer [StandardError over Exception](https://github.com/appneta/oboe-ruby/pull/59) for rescue blocks that we handle directly
+* [Clean up Oboe logging API](https://github.com/appneta/oboe-ruby/pull/58): Oboe.log, Oboe::Context.log and Oboe::API.log redundancy
+
+# oboe 2.6.6.1 (06/16/2014)
+
+This patch release adds new instrumentation and a couple fixes:
+
+* [Add instrumentation support](https://github.com/appneta/oboe-ruby/pull/37) for [Grape API Micro Framework](http://intridea.github.io/grape/) (thanks @tlunter!)
+* Important [Mongo find operation with block fix](https://github.com/appneta/oboe-ruby/pull/53) (thanks @rafaelfranca!)
+* Better and more [data independent tests](https://github.com/appneta/oboe-ruby/pull/52) for Travis
+
+# oboe 2.6.5.5 (06/02/2014)
 
 This patch release improves [instrumentation for Mongo](https://github.com/appneta/oboe-ruby/pull/48) version >= 1.10 and fixes TraceView [sample rate reporting](https://github.com/appneta/oboe-ruby/pull/50).
 
-# oboe 2.6.4.1 (04/30/14)
+# oboe 2.6.4.1 (04/30/2014)
 
 This patch release adds detection and support for Redhat [OpenShift](https://www.openshift.com/).  See our OpenShift [TraceView cartridge](https://github.com/appneta/openshift-cartridge-traceview) for base libraries before using this gem on OpenShift.
 
-# oboe 2.6.3.0 (04/07/14)
+# oboe 2.6.3.0 (04/07/2014)
 
 This patch releases fixes a number of smaller issues:
 
@@ -15,18 +31,18 @@ This patch releases fixes a number of smaller issues:
 * fix for incorrectly starting traces when in `through` tracing mode under certain circumstances
 * Expand the test suite to validate sample rates and tracing modes (https://github.com/appneta/oboe-ruby/pull/8)
 
-# oboe 2.6.2.0 (03/24/14)
+# oboe 2.6.2.0 (03/24/2014)
 
 * This patch release improves webserver detection on Heroku and adds in some c extension protections.  A oboe-heroku gem release will follow this release.
 
-# oboe 2.6.1.0 (03/12/14)
+# oboe 2.6.1.0 (03/12/2014)
 
 This is a patch release to address "Unsupported digest algorithm (SHA256)" occurring under certain cases on Heroku. A oboe-heroku gem release will follow this release.
 
 * Support delayed Reporter Initialization for Forking Webservers
 * README syntax fixes
 
-# oboe 2.5.0.7 (02/13/14)
+# oboe 2.5.0.7 (02/2013/2014)
 
 * Added new Redis redis-rb gem (>= 3.0.0) instrumentation
 * Fix a SampleSource bitmask high bit issue
@@ -35,7 +51,7 @@ This is a patch release to address "Unsupported digest algorithm (SHA256)" occur
 * Test against Ruby 2.1.0 on TravisCI
 * Fix errant Oboe::Config warning
 
-# oboe 2.4.0.1 (01/12/13)
+# oboe 2.4.0.1 (01/12/2013)
 
 * Report SampleRate & SampleSource per updated SWIG API
 * Change OboeHeroku __Init Key 
@@ -47,11 +63,11 @@ This is a patch release to address "Unsupported digest algorithm (SHA256)" occur
 * Report the application server used
 * Support Oboe::Config.merge! and warn on non-existent (thanks @adamjt!)
 
-# oboe 2.3.4.1 (11/21/13)
+# oboe 2.3.4.1 (11/21/2013)
 
 * Stacks that use a caching system like Varnish could see corrupted traces; fixed. 
 
-# oboe 2.3.3.7 (11/06/13)
+# oboe 2.3.3.7 (11/06/2013)
 
 * Rename the _Init layer to "rack"
 * Decode URLS when reporting them
@@ -61,7 +77,7 @@ This is a patch release to address "Unsupported digest algorithm (SHA256)" occur
 * Further refactoring for Ruby 2.0 support
 * Track the version of the instrumentation installed
 
-# oboe 2.3.2 (10/22/13)
+# oboe 2.3.2 (10/22/2013)
 
 * Backtrace collection can now be configured to skip certain components if a lighter-weight trace is desired
 * On MRI Ruby the hostname of the Tracelyzer is now configurable via Oboe::Config[:reporter_host] (default is localhost)
@@ -70,7 +86,7 @@ This is a patch release to address "Unsupported digest algorithm (SHA256)" occur
 * Renamed "sampling_rate" to be "sample_rate" for consistency
 * More tests added and documentation in anticipation of our Ruby open-source initiative
 
-# oboe 2.2.6 (09/27/13)
+# oboe 2.2.6 (09/27/2013)
 
 * Query Privacy now fully supported; can configure the app to not send SQL parameters if needed
 * Configuring the local sample rate now supports 1e6 notation
@@ -78,17 +94,17 @@ This is a patch release to address "Unsupported digest algorithm (SHA256)" occur
 * Now reporting HTTPStatus on http client calls
 * Heroku - the start time when a request hits the load balancer now captured
 
-# oboe 2.2.0 (09/12/13)
+# oboe 2.2.0 (09/12/2013)
 
 * Initial support for Rails 4
 * Various internal reporting fixes and improvements
 * Fix for auto sampling rate
 
-# oboe 2.1.4 (08/01/13)
+# oboe 2.1.4 (08/01/2013)
 
 * Integration support for AppView Web
 
-# oboe 2.1.3 (07/16/13)
+# oboe 2.1.3 (07/16/2013)
 
 * Allow _Access Key_ assignment via Environment variable: TRACEVIEW_CUUID
 

data/Gemfile

@@ -5,7 +5,6 @@ group :development, :test do
   gem 'minitest-reporters'
   gem 'rack-test'
   gem 'appraisal'
-  gem 'bson'
 end
 
 group :development do
@@ -22,8 +21,7 @@ gem 'memcache-client'
 gem 'memcached', '1.7.2' if RUBY_VERSION < '2.0.0'
 gem 'cassandra'
 gem 'mongo'
-gem 'bson_ext' # For Mongo, Yours Truly
-gem 'moped' if RUBY_VERSION >= '1.9'
+gem 'moped', '~> 1.5' if RUBY_VERSION >= '1.9'
 gem 'resque'
 gem 'redis'
 
@@ -33,6 +31,9 @@ gem 'sinatra'
 if RUBY_VERSION >= '1.9.3'
   gem 'padrino', '0.12.0'
   gem 'grape'
+  gem 'bson'
+else
+  gem 'bson', '1.10.2'
 end
 
 # Import dependencies from oboe.gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    oboe (2.6.5.5)
+    oboe (2.6.7)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -22,9 +22,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bson (1.10.1)
-    bson_ext (1.10.1)
-      bson (~> 1.10.1)
+    bson (1.10.2)
     builder (3.2.2)
     byebug (3.1.2)
       columnize (~> 0.8)
@@ -48,21 +46,21 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.9)
-    grape (0.7.0)
+    grape (0.8.0)
       activesupport
       builder
-      hashie (>= 1.2.0)
+      hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
       rack (>= 1.3.0)
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    hashie (3.0.0)
+    hashie (3.2.0)
     http_router (0.11.1)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    i18n (0.6.9)
+    i18n (0.6.11)
     ice_nine (0.11.0)
     json (1.8.1)
     linecache (0.46)
@@ -71,18 +69,17 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)
-    memcached (1.7.2)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (5.3.4)
-    minitest-reporters (1.0.4)
+    minitest (5.4.0)
+    minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     moneta (0.7.20)
-    mongo (1.10.1)
-      bson (~> 1.10.1)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mono_logger (1.1.0)
     moped (1.5.2)
     multi_json (1.10.1)
@@ -118,10 +115,10 @@ GEM
       mail (~> 2.5.3)
       padrino-core (= 0.12.0)
     perftools.rb (2.0.1)
-    polyglot (0.3.4)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    polyglot (0.3.5)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rack-accept (0.4.5)
@@ -134,9 +131,9 @@ GEM
       rack (>= 1.0)
     rake (10.3.2)
     rbx-require-relative (0.0.9)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    redis (3.1.0)
+    redis-namespace (1.5.0)
+      redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -164,7 +161,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
     url_mount (0.2.1)
       rack
@@ -182,18 +179,16 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   bson
-  bson_ext
   byebug
   cassandra
   dalli
   debugger
   grape
   memcache-client
-  memcached (= 1.7.2)
   minitest
   minitest-reporters
   mongo
-  moped
+  moped (~> 1.5)
   oboe!
   padrino (= 0.12.0)
   perftools.rb

data/Rakefile

@@ -11,7 +11,11 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+else
+  task :default => :test
+end
 
 desc "Build the gem's c extension"
 task :compile do

data/ext/oboe_metal/extconf.rb

@@ -28,7 +28,7 @@ else
   dir_config('oboe')
 end
 
-if jruby or ENV.has_key?('TRACEVIEW_URL') 
+if jruby or ENV.has_key?('TRACEVIEW_URL')
   # Build the noop extension under JRuby and Heroku.
   # The oboe-heroku gem builds it's own c extension which links to
   # libs specific to a Heroku dyno
@@ -50,7 +50,7 @@ elsif have_library('oboe', 'oboe_config_get_revision', 'oboe/oboe.h')
   end
 
   if RUBY_VERSION < '1.9'
-    cpp_command('g++') 
+    cpp_command('g++')
     $CPPFLAGS << "-I./src/"
   end
   create_makefile('oboe_metal', 'src')

data/gemfiles/mongo.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dalli"
+gem "memcache-client"
+gem "memcached", "1.7.2"
+gem "cassandra"
+gem "mongo"
+gem "bson"
+gem "moped", "~> 1.5"
+gem "resque"
+gem "redis"
+gem "sinatra"
+gem "padrino", "0.12.0"
+gem "grape"
+
+group :development, :test do
+  gem "minitest"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "appraisal"
+end
+
+group :development do
+  gem "ruby-debug", :platform => :mri_18
+  gem "debugger", :platform => :mri_19
+  gem "byebug", :platforms => [:mri_20, :mri_21]
+  gem "perftools.rb", :platforms => [:mri_20, :mri_21], :require => "perftools"
+  gem "pry"
+end
+
+gemspec :name => "oboe", :path => "../"

data/gemfiles/moped.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "dalli"
+gem "memcache-client"
+gem "memcached", "1.7.2"
+gem "cassandra"
+gem "mongo"
+gem "bson"
+gem "moped", "~> 1.5"
+gem "resque"
+gem "redis"
+gem "sinatra"
+gem "padrino", "0.12.0"
+gem "grape"
+
+group :development, :test do
+  gem "minitest"
+  gem "minitest-reporters"
+  gem "rack-test"
+  gem "appraisal"
+end
+
+group :development do
+  gem "ruby-debug", :platform => :mri_18
+  gem "debugger", :platform => :mri_19
+  gem "byebug", :platforms => [:mri_20, :mri_21]
+  gem "perftools.rb", :platforms => [:mri_20, :mri_21], :require => "perftools"
+  gem "pry"
+end
+
+gemspec :name => "oboe", :path => "../"

data/lib/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