oboe 2.3.4.1 → 2.4.0.1

data/test/instrumentation/http_test.rb

@@ -23,10 +23,10 @@ describe Oboe::Inst do
 
   it "should trace a Net::HTTP request to an instr'd app" do
     Oboe::API.start_trace('net-http_test', '', {}) do
-      uri = URI('https://www.appneta.com')
+      uri = URI('http://www.appneta.com')
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.get('/?q=test').read_body
+      http.use_ssl = false
+      http.get('/?q=ruby_test_suite').read_body
     end
 
     traces = get_all_traces
@@ -36,9 +36,9 @@ describe Oboe::Inst do
 
     traces[1]['Layer'].must_equal 'net-http'
     traces[2]['IsService'].must_equal "1"
-    traces[2]['RemoteProtocol'].must_equal "HTTPS"
+    traces[2]['RemoteProtocol'].must_equal "HTTP"
     traces[2]['RemoteHost'].must_equal "www.appneta.com"
-    traces[2]['ServiceArg'].must_equal "/?q=test"
+    traces[2]['ServiceArg'].must_equal "/?q=ruby_test_suite"
     traces[2]['HTTPMethod'].must_equal "GET"
     traces[2]['HTTPStatus'].must_equal "200"
     traces[2].has_key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
@@ -49,7 +49,7 @@ describe Oboe::Inst do
       uri = URI('https://www.google.com')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
-      http.get('/?q=test').read_body
+      http.get('/?q=ruby_test_suite').read_body
     end
 
     traces = get_all_traces
@@ -61,7 +61,7 @@ describe Oboe::Inst do
     traces[2]['IsService'].must_equal "1"
     traces[2]['RemoteProtocol'].must_equal "HTTPS"
     traces[2]['RemoteHost'].must_equal "www.google.com"
-    traces[2]['ServiceArg'].must_equal "/?q=test"
+    traces[2]['ServiceArg'].must_equal "/?q=ruby_test_suite"
     traces[2]['HTTPMethod'].must_equal "GET"
     traces[2]['HTTPStatus'].must_equal "200"
     traces[2].has_key?('Backtrace').must_equal Oboe::Config[:nethttp][:collect_backtraces]
@@ -71,10 +71,10 @@ describe Oboe::Inst do
     Oboe::Config[:nethttp][:collect_backtraces] = true
 
     Oboe::API.start_trace('nethttp_test', '', {}) do
-      uri = URI('https://www.appneta.com')
+      uri = URI('http://www.appneta.com')
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.get('/?q=test').read_body
+      http.use_ssl = false
+      http.get('/?q=ruby_test_suite').read_body
     end
 
     traces = get_all_traces
@@ -85,10 +85,10 @@ describe Oboe::Inst do
     Oboe::Config[:nethttp][:collect_backtraces] = false
 
     Oboe::API.start_trace('nethttp_test', '', {}) do
-      uri = URI('https://www.appneta.com')
+      uri = URI('http://www.appneta.com')
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.get('/?q=test').read_body
+      http.use_ssl = false
+      http.get('/?q=ruby_test_suite').read_body
     end
 
     traces = get_all_traces

data/test/support/config_test.rb

@@ -12,8 +12,6 @@ describe Oboe::Config do
     Oboe::Config.initialize
 
     Oboe::Config[:verbose].must_equal false
-    Oboe::Config[:sample_source].must_equal 2
-    Oboe::Config[:sample_rate].must_equal 300000
     Oboe::Config[:tracing_mode].must_equal "through"
     Oboe::Config[:reporter_host].must_equal "127.0.0.1"
   end

data/test/support/srv1_localset_test.rb

@@ -0,0 +1,41 @@
+require 'minitest_helper'
+require 'rack/test'
+require 'rack/lobster'
+require 'oboe/inst/rack'
+
+Oboe::Config[:tracing_mode] = 'always'
+Oboe::Config[:sample_rate] = 1e6
+    
+class RackTestApp < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    @app = Rack::Builder.new {
+      use Rack::CommonLogger
+      use Rack::ShowExceptions
+      use Oboe::Rack
+      map "/lobster" do
+        use Rack::Lint
+        run Rack::Lobster.new
+      end
+    }
+  end
+
+  def test_localset_sample_source
+    clear_all_traces 
+
+    get "/lobster"
+
+    traces = get_all_traces
+    traces.count.must_equal 3
+
+    validate_outer_layers(traces, 'rack')
+
+    kvs = {} 
+    kvs["SampleRate"] = "1000000"
+    kvs["SampleSource"] = OBOE_SAMPLE_RATE_SOURCE_FILE.to_s
+    validate_event_keys(traces[1], kvs)
+
+  end
+end
+

metadata

@@ -1,75 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oboe
-version: !ruby/object:Gem::Version 
-  hash: 101
-  prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 4
-  - 1
-  version: 2.3.4.1
+version: !ruby/object:Gem::Version
+  version: 2.4.0.1
 platform: ruby
-authors: 
+authors:
 - Peter Giacomo Lombardo
 - Spiros Eliopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bson
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
+  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.
 email: traceviewsupport@appneta.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oboe_metal/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -138,12 +115,10 @@ files:
 - lib/oboe/util.rb
 - lib/oboe/version.rb
 - lib/oboe/xtrace.rb
-- lib/oboe_fu.rb
 - lib/oboe_metal.rb
 - lib/rails/generators/oboe/install_generator.rb
 - lib/rails/generators/oboe/templates/oboe_initializer.rb
 - oboe.gemspec
-- oboe_fu.gemspec
 - release.sh
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/dalli_test.rb
@@ -157,51 +132,44 @@ files:
 - test/minitest_helper.rb
 - test/profiling/method_test.rb
 - test/support/config_test.rb
+- test/support/srv1_localset_test.rb
 - test/support/xtrace_test.rb
-homepage: http://www.appneta.com/application-performance-management
-licenses: []
-
+homepage: http://www.appneta.com/products/traceview/
+licenses:
+- AppNeta Open License, Version 1.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
-test_files: 
+test_files:
 - test/minitest_helper.rb
-- test/support/config_test.rb
-- test/support/xtrace_test.rb
-- test/profiling/method_test.rb
-- test/instrumentation/memcached_test.rb
-- test/instrumentation/memcache_test.rb
+- test/instrumentation/mongo_test.rb
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/http_test.rb
-- test/instrumentation/cassandra_test.rb
 - test/instrumentation/resque_test.rb
-- test/instrumentation/rack_test.rb
 - test/instrumentation/moped_test.rb
-- test/instrumentation/mongo_test.rb
+- test/instrumentation/rack_test.rb
+- test/instrumentation/memcache_test.rb
+- test/instrumentation/cassandra_test.rb
+- test/instrumentation/memcached_test.rb
+- test/profiling/method_test.rb
+- test/support/srv1_localset_test.rb
+- test/support/config_test.rb
+- test/support/xtrace_test.rb

data/lib/oboe_fu.rb

@@ -1,6 +0,0 @@
-# Copyright (c) 2013 AppNeta, Inc.
-# All rights reserved.
-
-puts "[oboe_fu] This gem has been deprecated.  Please use the 'oboe' gem instead."
-require 'oboe'
-

data/oboe_fu.gemspec

@@ -1,13 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{oboe_fu}
-  s.version = "1.3.0"
-  s.date = %{2012-09-19}
-  s.authors = ["Tracelytics, Inc."]
-  s.email = %q{contact@tracelytics.com}
-  s.summary = %q{(Deprecated) Oboe instrumentation for Ruby frameworks}
-  s.homepage = %q{http://tracelytics.com}
-  s.description = %q{This gem has been replace by the 'oboe' gem.  Please update.}
-  s.extra_rdoc_files = ["LICENSE"]
-  s.files = ['lib/oboe_fu.rb'] + ['LICENSE']
-  s.add_dependency('oboe', '= 1.3.0')
-end