traceview 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6660066c10caaa82692450f3cb605aaf60246058
-  data.tar.gz: e35fb9b72aa97cee508e5c94ec45352af8db210c
+  metadata.gz: 9bce2db884c7669355052ec8cf1156e02f7df096
+  data.tar.gz: f12451f6e875c3d90f0eb65834a3e8c8d179ebc9
 SHA512:
-  metadata.gz: 225128b2074fe06f2129fd8402a8ece3a544b70c1958db4023f51292f0a68ef25800ee24cdcee88597f3ed86d2876edd93e0f9865dd9d76356998b059d8c4c85
-  data.tar.gz: 098564e82e0f401224f12693a79ad40e77ff7fa3382d439026232366d61998cd26ac702999ef0fb3002d28ce9cb77dd1b17ca532897ba6733139df63d9d64251
+  metadata.gz: 3febee7ee82908a0b25cae1286d328381878aed9cbc3f9c5d78efe83e9770abf621a135c45f5505a1baa1efd40d2998d9c2f74f7e57c84f8bd7e5a60af4c9e9a
+  data.tar.gz: e90d83f0e19d4021cb0d7c57263c0e9ff11067ea63cd56ed3ac9be4ecc09ef0d0eb3d6deb29fc34309246e2544457790048fc1b0b23a7a11fc25026edc7b2905

data/.travis.yml

@@ -16,6 +16,7 @@ gemfile:
   - gemfiles/frameworks.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
   - gemfiles/delayed_job.gemfile
 
 matrix:
@@ -24,6 +25,12 @@ matrix:
     - rvm: 1.8.7
       gemfile: gemfiles/rails42.gemfile
 
+    # Rails 5.0+ requires Ruby 2.2.2 or higher
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails50.gemfile
+
     # Don't test DelayedJob under MRI 1.8 and JRuby
     - rvm: 1.8.7
       gemfile: gemfiles/delayed_job.gemfile
@@ -31,6 +38,10 @@ matrix:
     - rvm: jruby-9.0.4.0
       gemfile: gemfiles/delayed_job.gemfile
 
+    # Skip testing on JRuby until activerecord-jdbc supports Rails 5.0
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/rails50.gemfile
+
     # Other frameworks tested on Ruby 1.9.3 or higher
     - rvm: 1.8.7
       gemfile: gemfiles/frameworks.gemfile
@@ -38,7 +49,7 @@ matrix:
 # 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:
-  - gem update --system
+  - gem update --system '2.6.1'
   - gem update bundler
   - gem --version
   - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /usr/local/cassandra/conf/cassandra-env.sh"

data/CHANGELOG.md

@@ -4,6 +4,17 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.7.0
+
+This minor release includes the following new feature:
+
+* New Ruby on Rails 5 instrumentation: #165
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.7.0
+https://rubygems.org/gems/traceview/versions/3.7.0-java
+
 # traceview 3.6.0
 
 This minor release includes the following new feature:

data/CONFIG.md

@@ -2,11 +2,28 @@
 
 ## Environment Variables
 
-The following environment variables are detected by the traceview gem:
-
-* `IGNORE_TRACEVIEW_WARNING` - tells the traceview gem to __not__ output the _missing TraceView libraries_ message on stack initialization
-
-* `TRACEVIEW_GEM_VERBOSE` - sets the verbose flag (`TraceView::Config[:verbose]`) early in the gem loading process which may output valuable information
+The following environment variables are detected by the traceview gem and affect how the gem functions.
+
+### General
+
+Name | Description | Default
+---- | ----------- | -------
+`IGNORE_TRACEVIEW_WARNING` | tells the traceview gem to __not__ output the _missing TraceView libraries_ message on stack initialization | `false`
+`TRACEVIEW_GEM_VERBOSE` | sets the verbose flag (`TraceView::Config[:verbose]`) early in the gem loading process which may output valuable information | `false`
+`TRACEVIEW_CUUID` | Allows specifying the customer ID via environment variable to override/bypass the value in `/etc/tracelytics.conf` | `nil`
+
+# Related to Tests
+
+Name | Description | Default
+---- | ----------- | -------
+`TRACEVIEW_GEM_TEST` | puts the gem in test mode.  Traces are written to /tmp/trace_output.bson. | `false`
+`DBTYPE` | For tests on Ruby on Rails, specifies the database type to test against.  `postgres`, `mysql` and `mysql2` are valid options. | `postgres`
+`TV_CASSANDRA_SERVER` | specifies the Cassandra server to test against. | `127.0.0.1:9160`
+`TV_MONGO_SERVER` | specifies the Mongo server to test against. | `127.0.0.1:27017`
+`TV_RABBITMQ_SERVER` | specifies the RabbitMQ server to test against. | `127.0.0.1`
+`TV_RABBITMQ_PORT` | port for the RabbitMQ connection. | `5672`
+`TV_RABBITMQ_USERNAME` | username for the RabbitMQ connection | `guest`
+`TV_RABBITMQ_PASSWORD` | password for the RabbitMQ connection | `guest`
 
 ## TraceView::Config
 

data/Rakefile

@@ -6,7 +6,8 @@ require 'rake/testtask'
 require 'traceview/test'
 
 Rake::TestTask.new do |t|
-  t.verbose = true
+  t.verbose = false
+  t.warning = false
   t.ruby_opts = []
   t.libs << "test"
 
@@ -36,7 +37,6 @@ Rake::TestTask.new do |t|
                    FileList['test/profiling/*_test.rb']
   end
 
-  # t.ruby_opts << ['-w']
   if defined?(JRUBY_VERSION)
     t.ruby_opts << ["-J-javaagent:/usr/local/tracelytics/tracelyticsagent.jar"]
   end

data/gemfiles/delayed_job.gemfile

@@ -6,7 +6,7 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
+  gem 'puma', '< 3.1.0'
   gem 'bson', '< 4.0'
 end
 

data/gemfiles/frameworks.gemfile

@@ -6,7 +6,7 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
+  gem 'puma', '< 3.1.0'
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
   else

data/gemfiles/libraries.gemfile

@@ -5,23 +5,24 @@ if RUBY_VERSION >= '1.9.3'
   # ruby 1.9.3 and up
   gem 'rest-client'
   gem 'moped'
-  gem 'eventmachine'
+  gem 'eventmachine', '< 1.2.0'
   gem 'em-synchrony'
   gem 'em-http-request'
 end
 
 group :development, :test do
-  gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
   if RUBY_VERSION < '1.9.3'
+    gem 'rake', '< 11.0'
     gem 'bson', '<= 1.12.3'
     gem 'puma', '< 3.0'
   else
+    gem 'rake'
     gem 'bson', '< 4.0'
-    gem 'puma'
+    gem 'puma', '< 3.1.0'
   end
 end
 

data/gemfiles/rails31.gemfile

@@ -34,6 +34,8 @@ if defined?(JRUBY_VERSION)
 else
   gem 'sinatra'
   gem 'pg', '< 0.17'
+  gem 'mysql'
+  gem 'mysql2', '< 0.4.0'
 end
 
 gem "rails", "~> 3.1.12"

data/gemfiles/rails32.gemfile

@@ -14,17 +14,18 @@ if RUBY_VERSION < '2.0.0'
 end
 
 group :development, :test do
-  gem 'rake'
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
   if RUBY_VERSION < '1.9.3'
+    gem 'rake', '< 11.0'
     gem 'bson', '<= 1.12.3'
     gem 'puma', '< 3.0'
   else
+    gem 'rake'
     gem 'bson', '< 4.0'
-    gem 'puma'
+    gem 'puma', '< 3.1.0'
   end
 end
 
@@ -35,6 +36,8 @@ if defined?(JRUBY_VERSION)
 else
   gem 'sinatra'
   gem 'pg', '< 0.17'
+  gem 'mysql'
+  gem 'mysql2', '< 0.4.0'
 end
 
 if RUBY_VERSION < '1.9'

data/gemfiles/rails40.gemfile

@@ -6,8 +6,8 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
-  gem 'bson'
+  gem 'puma', '< 3.1.0'
+  gem 'bson', '< 4.0'
 end
 
 if defined?(JRUBY_VERSION)
@@ -16,7 +16,9 @@ if defined?(JRUBY_VERSION)
   gem 'jdbc-postgresql'
 else
   gem 'sinatra'
-  gem 'pg', '< 0.17'
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2', '< 0.4.0'
 end
 
 gem "rails", "~> 4.0.13"

data/gemfiles/rails41.gemfile

@@ -6,8 +6,8 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
-  gem 'bson'
+  gem 'puma', '< 3.1.0'
+  gem 'bson', '< 4.0'
 end
 
 if defined?(JRUBY_VERSION)
@@ -16,10 +16,12 @@ if defined?(JRUBY_VERSION)
   gem 'jdbc-postgresql'
 else
   gem 'sinatra'
-  gem 'pg', '< 0.17'
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
 end
 
-gem "rails", "~> 4.1.14"
+gem "rails", "~> 4.1.15"
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/rails42.gemfile

@@ -6,7 +6,7 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
+  gem 'puma', '< 3.1.0'
   gem 'bson', '< 4.0'
 end
 
@@ -17,6 +17,8 @@ if defined?(JRUBY_VERSION)
 else
   gem 'sinatra'
   gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
 end
 
 gem "rails", "~> 4.2.5"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,43 @@
+source "https://rubygems.org"
+
+gem 'rails', '>= 5.0.0.beta3', '< 5.1'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails', '~> 4.1.0'
+gem 'therubyracer', platforms: :ruby
+gem 'jquery-rails'
+gem 'turbolinks', '~> 5.x'
+gem 'jbuilder', '~> 2.0'
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> in views
+  gem 'web-console', '~> 3.0'
+  gem 'listen', '~> 3.0.5'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest'
+  gem 'minitest-reporters', '< 1.0.18'
+  gem 'minitest-debugger', :require => false
+  gem 'rack-test'
+  gem 'puma', '< 3.1.0'
+  gem 'bson', '< 4.0'
+end
+
+if defined?(JRUBY_VERSION)
+  gem 'activerecord-jdbc-adapter'
+  gem 'jdbc-postgresql'
+else
+  gem 'pg'
+  gem 'mysql2'
+end
+
+gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
+# vim:syntax=ruby

data/lib/rails/generators/traceview/templates/traceview_initializer.rb

@@ -86,6 +86,48 @@ if defined?(TraceView::Config)
   # TraceView::Config[:report_rescued_errors] = false
   #
 
+  # By default, the curb instrumentation will not link
+  # outgoing requests with remotely instrumented
+  # webservers (aka cross host tracing).  This is because the
+  # instrumentation can't detect if the independent libcurl
+  # instrumentation is in use or not.
+  #
+  # If you're sure that it's not in use/installed, then you can
+  # enable cross host tracing for the curb HTTP client
+  # here.  Set TraceView::Config[:curb][:cross_host] to true
+  # to enable.
+  #
+  # Alternatively, if you would like to install the separate
+  # libcurl instrumentation, see here:
+  # http://docs.appneta.com/installing-libcurl-instrumentation
+  #
+  # TraceView::Config[:curb][:cross_host] = false
+  #
+
+  # The bunny (Rabbitmq) instrumentation can optionally report
+  # Controller and Action values to allow filtering of bunny
+  # message handling in # the UI.  Use of Controller and Action
+  # for filters is temporary until the UI is updated with
+  # additional filters.
+  #
+  # These values identify which properties of
+  # Bunny::MessageProperties to report as Controller
+  # and Action.  The defaults are to report :app_id (as
+  # Controller) and :type (as Action).  If these values
+  # are not specified in the publish, then nothing
+  # will be reported here.
+  #
+  # TraceView::Config[:bunnyconsumer][:controller] = :app_id
+  # TraceView::Config[:bunnyconsumer][:action] = :type
+  #
+
+  #
+  # Resque Options
+  #
+  # Set to true to disable Resque argument logging (Default: false)
+  # TraceView::Config[:resque][:log_args] = false
+  #
+
   #
   # Enabling/Disabling Instrumentation
   #
@@ -96,13 +138,17 @@ if defined?(TraceView::Config)
   # TraceView::Config[:action_controller][:enabled] = true
   # TraceView::Config[:action_view][:enabled] = true
   # TraceView::Config[:active_record][:enabled] = true
-  # TraceView::Config[:bunny][:enabled] = true
+  # TraceView::Config[:bunnyclient][:enabled] = true
+  # TraceView::Config[:bunnyconsumer][:enabled] = true
   # TraceView::Config[:cassandra][:enabled] = true
   # TraceView::Config[:curb][:enabled] = true
   # TraceView::Config[:dalli][:enabled] = true
+  # TraceView::Config[:delayed_jobclient][:enabled] = true
+  # TraceView::Config[:delayed_jobworker][:enabled] = true
   # TraceView::Config[:excon][:enabled] = true
   # TraceView::Config[:em_http_request][:enabled] = true
   # TraceView::Config[:faraday][:enabled] = true
+  # TraceView::Config[:grape][:enabled] = true
   # TraceView::Config[:httpclient][:enabled] = true
   # TraceView::Config[:memcache][:enabled] = true
   # TraceView::Config[:memcached][:enabled] = true
@@ -113,6 +159,8 @@ if defined?(TraceView::Config)
   # TraceView::Config[:resque][:enabled] = true
   # TraceView::Config[:rest_client][:enabled] = true
   # TraceView::Config[:sequel][:enabled] = true
+  # TraceView::Config[:sidekiqclient][:enabled] = true
+  # TraceView::Config[:sidekiqworker][:enabled] = true
   # TraceView::Config[:typhoeus][:enabled] = true
   #
 
@@ -127,13 +175,17 @@ if defined?(TraceView::Config)
   # TraceView::Config[:action_controller][:collect_backtraces] = true
   # TraceView::Config[:action_view][:collect_backtraces] = true
   # TraceView::Config[:active_record][:collect_backtraces] = true
-  # TraceView::Config[:bunny][:collect_backtraces] = true
+  # TraceView::Config[:bunnyclient][:collect_backtraces] = true
+  # TraceView::Config[:bunnyconsumer][:collect_backtraces] = true
   # TraceView::Config[:cassandra][:collect_backtraces] = true
   # TraceView::Config[:curb][:collect_backtraces] = true
   # TraceView::Config[:dalli][:collect_backtraces] = false
+  # TraceView::Config[:delayed_jobclient][:collect_backtraces] = false
+  # TraceView::Config[:delayed_jobworker][:collect_backtraces] = false
   # TraceView::Config[:excon][:collect_backtraces] = false
   # TraceView::Config[:em_http_request][:collect_backtraces] = true
   # TraceView::Config[:faraday][:collect_backtraces] = false
+  # TraceView::Config[:grape][:collect_backtraces] = false
   # TraceView::Config[:httpclient][:collect_backtraces] = false
   # TraceView::Config[:memcache][:collect_backtraces] = false
   # TraceView::Config[:memcached][:collect_backtraces] = false
@@ -144,36 +196,8 @@ if defined?(TraceView::Config)
   # TraceView::Config[:resque][:collect_backtraces] = true
   # TraceView::Config[:rest_client][:collect_backtraces] = true
   # TraceView::Config[:sequel][:collect_backtraces] = true
+  # TraceView::Config[:sidekiqclient][:collect_backtraces] = true
+  # TraceView::Config[:sidekiqworker][:collect_backtraces] = true
   # TraceView::Config[:typhoeus][:collect_backtraces] = false
   #
-
-  # By default, the curb instrumentation will not link
-  # outgoing requests with remotely instrumented
-  # webservers (aka cross host tracing).  This is because the
-  # instrumentation can't detect if the independent libcurl
-  # instrumentation is in use or not.
-  #
-  # If you're sure that it's not in use/installed, then you can
-  # enable cross host tracing for the curb HTTP client
-  # here.  Set TraceView::Config[:curb][:cross_host] to true
-  # to enable.
-  #
-  # Alternatively, if you would like to install the separate
-  # libcurl instrumentation, see here:
-  # http://docs.appneta.com/installing-libcurl-instrumentation
-  # TraceView::Config[:curb][:cross_host] = false
-
-  #
-  # Resque Options
-  #
-  # :link_workers - associates Resque enqueue operations with the jobs they queue by piggybacking
-  #                 an additional argument on the Redis queue that is stripped prior to job
-  #                 processing
-  #                 !!! Note: Make sure both the enqueue side and the Resque workers are instrumented
-  #                 before enabling this or jobs will fail !!!
-  #                 (Default: false)
-  # TraceView::Config[:resque][:link_workers] = false
-  #
-  # Set to true to disable Resque argument logging (Default: false)
-  # TraceView::Config[:resque][:log_args] = false
 end