oboe 2.6.4.1 → 2.6.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3169ea3038b6293a945efb858b06d37de67546
-  data.tar.gz: d1ea231c855de19561bf20a7fe6fc468ac26c990
+  metadata.gz: de480d62f58bc7fc1264f2200e2a6b9e2bd795dc
+  data.tar.gz: 674039622538fafb9f96b2c757d272e87502e261
 SHA512:
-  metadata.gz: 2ca6ed914c0622b9aae98bf859500b7a08cd012c67f63b493914c2bdd1bc8663082aa75635efbde97aa966f3f39deb1b9c290169544b8ecf0547243e1c939a63
-  data.tar.gz: 97db5fa26ea2233bb9da5723ff4675874d8590868dd7a2e22e8aa3339fe9d4da066662c1ef679a1c1f122f36d73ea62ede976c5d3214c0d0fca185e03034a3a0
+  metadata.gz: 857f1e991c9ce93e6fafdc945869c9fb55444b088a07c43887b2570d16c14a7fde1a671f6960177ec0a82aab4b9bcce5297421146d457907c1cf2e27b003392f
+  data.tar.gz: 4e26b5b965178772d41e7304245d9ff8f62d6034e7afbebfee97bdf21f012cad8bbb4d367aa2710f93dde5ae0eab322cee9200d4a275afbbf1bd05f9ccdeb120

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.1
   - 2.0.0
   - 1.9.3
   - 1.9.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# oboe 2.6.5.5 (06/02/14)
+
+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)
 
 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.

data/Gemfile

@@ -19,17 +19,20 @@ end
 # Instrumented gems
 gem 'dalli'
 gem 'memcache-client'
-gem 'memcached' if (RUBY_VERSION =~ /^1./) == 0
+gem 'memcached', '1.7.2' if RUBY_VERSION < '2.0.0'
 gem 'cassandra'
 gem 'mongo'
 gem 'bson_ext' # For Mongo, Yours Truly
-gem 'moped' unless (RUBY_VERSION =~ /^1.8/) == 0
+gem 'moped' if RUBY_VERSION >= '1.9'
 gem 'resque'
 gem 'redis'
 
 # Instrumented Frameworks
 gem 'sinatra'
-gem 'padrino', '0.12.0' unless (RUBY_VERSION =~ /^1.8/) == 0
+
+if RUBY_VERSION >= '1.9.3'
+  gem 'padrino', '0.12.0' 
+end
 
 # Import dependencies from oboe.gemspec
 gemspec :name => 'oboe'

data/Gemfile.lock

@@ -1,27 +1,30 @@
 PATH
   remote: .
   specs:
-    oboe (2.6.3.dev8)
+    oboe (2.6.5.5)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
     ansi (1.4.3)
     appraisal (1.0.0)
       bundler
       rake
       thor (>= 0.14.0)
     archive-tar-minitar (0.5.2)
-    bson (1.9.2)
-    bson_ext (1.9.2)
-      bson (~> 1.9.2)
+    bson (1.10.1)
+    bson_ext (1.10.1)
+      bson (~> 1.10.1)
     builder (3.2.2)
-    byebug (2.7.0)
-      columnize (~> 0.3)
+    byebug (3.1.2)
+      columnize (~> 0.8)
       debugger-linecache (~> 1.2)
     cassandra (0.23.0)
       json
@@ -29,10 +32,9 @@ GEM
       simple_uuid (~> 0.3)
       thrift_client (~> 0.7, < 0.9)
     coderay (1.1.0)
-    columnize (0.3.6)
-    dalli (2.7.0)
+    columnize (0.8.9)
+    dalli (2.7.2)
     debugger-linecache (1.2.0)
-    hashie (2.0.5)
     http_router (0.11.1)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
@@ -48,18 +50,18 @@ GEM
     memcache-client (1.8.5)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (5.3.2)
-    minitest-reporters (1.0.2)
+    minitest (5.3.4)
+    minitest-reporters (1.0.4)
       ansi
       builder
       minitest (>= 5.0)
-      powerbar
+      ruby-progressbar
     moneta (0.7.20)
-    mongo (1.9.2)
-      bson (~> 1.9.2)
+    mongo (1.10.1)
+      bson (~> 1.10.1)
     mono_logger (1.1.0)
     moped (1.5.2)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     padrino (0.12.0)
       padrino-admin (= 0.12.0)
       padrino-cache (= 0.12.0)
@@ -92,19 +94,16 @@ GEM
       padrino-core (= 0.12.0)
     perftools.rb (2.0.1)
     polyglot (0.3.4)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.2.2)
+    rake (10.3.2)
     rbx-require-relative (0.0.9)
     redis (3.0.7)
     redis-namespace (1.4.1)
@@ -128,15 +127,17 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
+    ruby-progressbar (1.5.1)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     simple_uuid (0.4.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.5.0)
     thor (0.17.0)
+    thread_safe (0.3.4)
     thrift (0.8.0)
     thrift_client (0.8.4)
       thrift (~> 0.8.0)
@@ -144,6 +145,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    tzinfo (1.2.0)
+      thread_safe (~> 0.1)
     url_mount (0.2.1)
       rack
     vegas (0.1.11)

data/lib/oboe/inst/mongo.rb

@@ -39,9 +39,17 @@ if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
               report_kvs[:Flavor] = Oboe::Inst::Mongo::FLAVOR
 
               report_kvs[:Database] = @name
-              report_kvs[:RemoteHost] = @connection.host
-              report_kvs[:RemotePort] = @connection.port
-              
+
+              # Mongo >= 1.10 uses @client instead of @connection
+              # Avoid the nil
+              if @connection
+                report_kvs[:RemoteHost] = @connection.host
+                report_kvs[:RemotePort] = @connection.port
+              elsif @client
+                report_kvs[:RemoteHost] = @client.host
+                report_kvs[:RemotePort] = @client.port
+              end
+
               report_kvs[:QueryOp] = m 
 
               report_kvs[:New_Collection_Name] = args[0] if m == :create_collection

data/lib/oboe/inst/rack.rb

@@ -15,12 +15,6 @@ module Oboe
       report_kvs = {}
 
       begin
-        if Oboe.always?
-          # Only report these KVs under tracing_mode 'always' (never for 'through')
-          report_kvs[:SampleRate]        = Oboe.sample_rate
-          report_kvs[:SampleSource]      = Oboe.sample_source
-        end
-
         report_kvs['HTTP-Host']        = req.host
         report_kvs['Port']             = req.port
         report_kvs['Proto']            = req.scheme
@@ -55,6 +49,12 @@ module Oboe
 
       report_kvs = {}
       report_kvs[:URL] = URI.unescape(req.path)
+      
+      if Oboe.always?
+        # Only report these KVs under tracing_mode 'always' (never for 'through')
+        report_kvs[:SampleRate]        = Oboe.sample_rate
+        report_kvs[:SampleSource]      = Oboe.sample_source
+      end
 
       xtrace = env.is_a?(Hash) ? env['HTTP_X_TRACE'] : nil
 

data/lib/oboe/version.rb

@@ -5,8 +5,8 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 6 
-    PATCH = 4
-    BUILD = 1
+    PATCH = 5
+    BUILD = 5
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/oboe.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
   s.test_files  = Dir.glob("{test}/**/*.rb")
     
   s.extensions = ['ext/oboe_metal/extconf.rb']
-   
-  s.add_development_dependency 'rake'
 
   s.add_runtime_dependency('json', '>= 0')
+  s.add_development_dependency('rake', '>= 0')
+
+  s.required_ruby_version = '>= 1.8.6'
 end
 

data/test/frameworks/padrino_test.rb

@@ -1,4 +1,4 @@
-unless (RUBY_VERSION =~ /^1.8/) == 0
+if RUBY_VERSION >= '1.9.3'
   require "minitest_helper"
   require File.expand_path(File.dirname(__FILE__) + '/apps/padrino_simple')
 

data/test/instrumentation/memcached_test.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-if (RUBY_VERSION =~ /^1./) == 0
+if RUBY_VERSION < '2.0'
   describe Oboe::Inst::Memcached do
     require 'memcached'
     require 'memcached/rails'

data/test/instrumentation/moped_test.rb

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-if (RUBY_VERSION =~ /(^1.9.3|^2)/) == 0
+if RUBY_VERSION >= '1.9.3'
   # Moped is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
 
   describe Oboe::Inst::Moped do

data/test/instrumentation/rack_test.rb

@@ -30,13 +30,13 @@ class RackTestApp < Minitest::Test
 
     kvs = {} 
     kvs["Label"] = "entry"
+    kvs["SampleRate"] = "1000000"
+    kvs["SampleSource"] = "1"
     validate_event_keys(traces[0], kvs)
 
     kvs.clear
     kvs["Label"] = "info"
     kvs["Status"] = "200"
-    kvs["SampleRate"] = "1000000"
-    kvs["SampleSource"] = "1"
     kvs["HTTP-Host"] = "example.org"
     kvs["Port"] = "80"
     kvs["Proto"] = "http"

data/test/support/liboboe_settings_test.rb

@@ -34,7 +34,7 @@ class RackTestApp < Minitest::Test
     kvs = {} 
     kvs["SampleRate"] = "1000000"
     kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE.to_s
-    validate_event_keys(traces[1], kvs)
+    validate_event_keys(traces[0], kvs)
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.6.4.1
+  version: 2.6.5.5
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The oboe gem provides TraceView instrumentation for Ruby and Ruby frameworks.
@@ -47,8 +47,8 @@ extensions:
 extra_rdoc_files:
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -161,17 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
@@ -201,4 +201,3 @@ test_files:
 - test/support/liboboe_settings_test.rb
 - test/support/config_test.rb
 - test/support/xtrace_test.rb
-has_rdoc: