traceview 3.4.1-java → 3.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed57ebd3157574cebbe079d0334d432df5fab32
-  data.tar.gz: 1c3255424e1e52a1da52d014096f8f1702f3eae0
+  metadata.gz: 60acff05dba3ac97c12c212603c2055a1e866d5d
+  data.tar.gz: c92f3b700e4f410feacd4835b9dbe9f26ed79ec2
 SHA512:
-  metadata.gz: bab8f3cc81f2db88d973f204359a930065ee23be2f89c3e2e608f15171ca1f378f61f4d37454703d949f0ed0af3c78d1d4a1ef6ac483115e06a5991bc59fc593
-  data.tar.gz: fed0ca424618fb3363f63cf633122f4ba52c4d85263ca676df4d4e1a657c989aa99eb4d105fae903cecb9e50beb74e528564cb13cefe0211c7e3322e4b8e4393
+  metadata.gz: 7e10ef76df5b9cec31dc7b13f498da2748a0b4c97b5975cc5f780f0e964aa3715f6d319c7900fafe6ba6ab4b1f0bae663ee6d1dcdb79050fb57c123301938abc
+  data.tar.gz: 5e99e735b24c55801d5dde15a45b0087a8a82161628e77eb75caeb34ae91e3498b6690805dbce46f14f6ad3ec2aed48d67a0c05fcb982047d6bbd32cd4335245

data/CHANGELOG.md

@@ -4,6 +4,18 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.4.2
+
+This patch release includes the following fixes:
+
+* bson dependency breaks Ruby 1.8.7 install: #158
+* Resque worker automatic tracing: #157
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.4.2
+https://rubygems.org/gems/traceview/versions/3.4.2-java
+
 # traceview 3.4.1
 
 This patch release includes the following fixes:

data/README.md

@@ -150,9 +150,11 @@ You can send deploy notifications to TraceView and have the events show up on yo
 
 # Custom Tracing
 
+You can add even more visibility into any part of your application or scripts by adding custom instrumentation.  If you want to see the performance of an existing method see Method Profiling.  To trace blocks of code see the Tracing API.
+
 ## The Tracing API
 
-You can instrument any arbitrary block of code using `TraceView::API.trace`:
+You can instrument any arbitrary block of code using `TraceView::API.trace`.  The code and any supported calls for libraries that we support, will automatically get traced and reported to your dashboard.
 
 ```ruby
 # layer_name will show up in the TraceView app dashboard
@@ -181,27 +183,15 @@ Find more details in the [RubyDoc page](http://rdoc.info/gems/traceview/TraceVie
 
 ## Tracing Methods
 
-By using class level declarations, it's possible to automatically have certain methods on that class instrumented and reported to your TraceView dashboard automatically.
+With TraceView, you can profile any method in your application or even in the Ruby language using `TraceView::API.profile_method`.
 
-The pattern for Method Profiling is as follows:
+If, for example, you wanted to see the performance for the `Array::sort`, you could simply call the following in your startup code:
 
-```ruby
-# 'profile_name' is similar to a layer name.
-# It identifies this custom trace in your dashboard.
-#
-class Engine
-    def processor()
-        # body of method
-    end
-    
-    include TraceViewMethodProfiling
-    
-    # call syntax: profile_method <method>, <profile_name>
-    profile_method :processor, 'processor'
-end
+```
+TraceView::API.profile_method(Array, :sort)
 ```
 
-This example demonstrates method profiling of instance methods.  Class methods are profiled slightly differently.  See the TraceView [documentation portal](https://docs.appneta.com/ruby#customizing-ruby-instrumentation) for full details.
+For full documentation, options and reporting custom KVs, see our documentation on [method profiling](http://docs.appneta.com/ruby#profiling-ruby-methods).
 
 # Support
 

data/gemfiles/delayed_job.gemfile

@@ -7,7 +7,7 @@ group :development, :test do
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
   gem 'puma'
-  gem 'bson'
+  gem 'bson', '< 4.0'
 end
 
 if defined?(JRUBY_VERSION)

data/gemfiles/frameworks.gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
   else
-    gem 'bson'
+    gem 'bson', '< 4.0'
   end
 end
 

data/gemfiles/libraries.gemfile

@@ -20,7 +20,7 @@ group :development, :test do
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
   else
-    gem 'bson'
+    gem 'bson', '< 4.0'
   end
 end
 

data/gemfiles/rails32.gemfile

@@ -23,7 +23,7 @@ group :development, :test do
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
   else
-    gem 'bson'
+    gem 'bson', '< 4.0'
   end
 end
 

data/gemfiles/rails42.gemfile

@@ -7,7 +7,7 @@ group :development, :test do
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
   gem 'puma'
-  gem 'bson'
+  gem 'bson', '< 4.0'
 end
 
 if defined?(JRUBY_VERSION)

data/lib/traceview/base.rb

@@ -142,7 +142,7 @@ module TraceViewBase
   # DelayedJob or Sidekiq workers.
   #
   def entry_layer?(layer)
-    %w(delayed_job-worker sidekiq-worker).include?(layer.to_s)
+    %w(delayed_job-worker sidekiq-worker resque-worker).include?(layer.to_s)
   end
 
   ##

data/lib/traceview/version.rb

@@ -8,7 +8,7 @@ module TraceView
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/instrumentation/rest-client_test.rb

@@ -191,16 +191,14 @@ if RUBY_VERSION >= '1.9.3'
       response = nil
 
       TraceView::API.start_trace('rest_client_test') do
-        resource = RestClient::Resource.new 'http://www.appneta.com/products/traceview?a=1'
+        resource = RestClient::Resource.new 'http://127.0.0.1:8101/redirectme?redirect_test'
         response = resource.get
       end
 
       traces = get_all_traces
-      traces.count.must_equal 12
+      traces.count.must_equal 18
 
-      # FIXME: We need to switch from making external calls to an internal test
-      # stack instead so we can validate cross-app traces.
-      # valid_edges?(traces).must_equal true
+      valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rest_client_test')
 
       traces[1]['Layer'].must_equal 'rest-client'
@@ -209,43 +207,43 @@ if RUBY_VERSION >= '1.9.3'
       traces[2]['Layer'].must_equal 'net-http'
       traces[2]['Label'].must_equal 'entry'
 
-      traces[3]['Layer'].must_equal 'net-http'
-      traces[3]['Label'].must_equal 'info'
-      traces[3]['IsService'].must_equal 1
-      traces[3]['RemoteProtocol'].must_equal 'HTTP'
-      traces[3]['RemoteHost'].must_equal 'www.appneta.com'
-      traces[3]['ServiceArg'].must_equal '/products/traceview?a=1'
-      traces[3]['HTTPMethod'].must_equal 'GET'
-      traces[3]['HTTPStatus'].must_equal "301"
-      traces[3].key?('Backtrace').must_equal TraceView::Config[:nethttp][:collect_backtraces]
+      traces[6]['Layer'].must_equal 'net-http'
+      traces[6]['Label'].must_equal 'info'
+      traces[6]['IsService'].must_equal 1
+      traces[6]['RemoteProtocol'].must_equal 'HTTP'
+      traces[6]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[6]['ServiceArg'].must_equal '/redirectme?redirect_test'
+      traces[6]['HTTPMethod'].must_equal 'GET'
+      traces[6]['HTTPStatus'].must_equal "301"
+      traces[6].key?('Backtrace').must_equal TraceView::Config[:nethttp][:collect_backtraces]
+
+      traces[7]['Layer'].must_equal 'net-http'
+      traces[7]['Label'].must_equal 'exit'
 
-      traces[4]['Layer'].must_equal 'net-http'
-      traces[4]['Label'].must_equal 'exit'
+      traces[8]['Layer'].must_equal 'rest-client'
+      traces[8]['Label'].must_equal 'entry'
 
-      traces[5]['Layer'].must_equal 'rest-client'
-      traces[5]['Label'].must_equal 'entry'
+      traces[9]['Layer'].must_equal 'net-http'
+      traces[9]['Label'].must_equal 'entry'
 
-      traces[6]['Layer'].must_equal 'net-http'
-      traces[6]['Label'].must_equal 'entry'
+      traces[13]['Layer'].must_equal 'net-http'
+      traces[13]['Label'].must_equal 'info'
+      traces[13]['IsService'].must_equal 1
+      traces[13]['RemoteProtocol'].must_equal 'HTTP'
+      traces[13]['RemoteHost'].must_equal '127.0.0.1:8101'
+      traces[13]['ServiceArg'].must_equal '/'
+      traces[13]['HTTPMethod'].must_equal 'GET'
+      traces[13]['HTTPStatus'].must_equal "200"
+      traces[13].key?('Backtrace').must_equal TraceView::Config[:nethttp][:collect_backtraces]
 
-      traces[7]['Layer'].must_equal 'net-http'
-      traces[7]['Label'].must_equal 'info'
-      traces[7]['IsService'].must_equal 1
-      traces[7]['RemoteProtocol'].must_equal 'HTTP'
-      traces[7]['RemoteHost'].must_equal 'www.appneta.com'
-      traces[7]['ServiceArg'].must_equal '/products/traceview/?a=1'
-      traces[7]['HTTPMethod'].must_equal 'GET'
-      traces[7]['HTTPStatus'].must_equal "200"
-      traces[7].key?('Backtrace').must_equal TraceView::Config[:nethttp][:collect_backtraces]
-
-      traces[8]['Layer'].must_equal 'net-http'
-      traces[8]['Label'].must_equal 'exit'
+      traces[14]['Layer'].must_equal 'net-http'
+      traces[14]['Label'].must_equal 'exit'
 
-      traces[9]['Layer'].must_equal 'rest-client'
-      traces[9]['Label'].must_equal 'exit'
+      traces[15]['Layer'].must_equal 'rest-client'
+      traces[15]['Label'].must_equal 'exit'
 
-      traces[10]['Layer'].must_equal 'rest-client'
-      traces[10]['Label'].must_equal 'exit'
+      traces[16]['Layer'].must_equal 'rest-client'
+      traces[16]['Label'].must_equal 'exit'
     end
 
     it 'should trace and capture raised exceptions' do

data/test/servers/rackapp_8101.rb

@@ -9,9 +9,17 @@ TraceView.logger.info "[traceview/info] Starting background utility rack app on
 Thread.new do
   app = Rack::Builder.new {
     use TraceView::Rack
-    run Proc.new { |env|
-      [200, {"Content-Type" => "text/html"}, ['Hello TraceView!']]
-    }
+    map "/" do
+      run Proc.new { |env|
+        [200, {"Content-Type" => "text/html"}, ['Hello TraceView!']]
+      }
+    end
+
+    map "/redirectme" do
+      run Proc.new { |env|
+        [301, {"Location" => "/", "Content-Type" => "text/html"}, ['']]
+      }
+    end
   }
 
   Rack::Handler::Puma.run(app, {:Host => '127.0.0.1', :Port => 8101})

data/test/support/auto_tracing_test.rb

@@ -15,11 +15,13 @@ class AutoTraceTest  < Minitest::Test
   def test_entry_layers
     TraceView.entry_layer?('delayed_job-worker').must_equal true
     TraceView.entry_layer?('sidekiq-worker').must_equal true
+    TraceView.entry_layer?('resque-worker').must_equal true
     TraceView.entry_layer?('asdf-worker').must_equal false
   end
 
   def test_entry_layers_supports_symbols
     TraceView.entry_layer?(:'delayed_job-worker').must_equal true
+    TraceView.entry_layer?(:'resque-worker').must_equal true
     TraceView.entry_layer?(:asdfworker).must_equal false
   end
 
@@ -39,6 +41,14 @@ class AutoTraceTest  < Minitest::Test
     end
   end
 
+  def test_trace_when_default_tm_resque
+    TraceView::Config[:tracing_mode] = :through
+
+    TV::API.start_trace('resque-worker') do
+      TraceView.tracing?.must_equal true
+    end
+  end
+
   def test_dont_trace_when_never
     TraceView::Config[:tracing_mode] = :never
 

data/traceview.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/oboe_metal/extconf.rb'] unless defined?(JRUBY_VERSION)
 
   s.add_runtime_dependency('json', '>= 0')
-  s.add_runtime_dependency('bson', '< 4.0')
 
   # Development dependencies used in gem development & testing
   s.add_development_dependency('rake', '>= 0.9.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,20 +25,6 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bson
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement