traceview 3.4.2-java → 3.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60acff05dba3ac97c12c212603c2055a1e866d5d
-  data.tar.gz: c92f3b700e4f410feacd4835b9dbe9f26ed79ec2
+  metadata.gz: 77802e768eb34458ea448fc981134b53f0d21404
+  data.tar.gz: 8ff989b243a87e6a0f88d5dbc4fea44b68eaa316
 SHA512:
-  metadata.gz: 7e10ef76df5b9cec31dc7b13f498da2748a0b4c97b5975cc5f780f0e964aa3715f6d319c7900fafe6ba6ab4b1f0bae663ee6d1dcdb79050fb57c123301938abc
-  data.tar.gz: 5e99e735b24c55801d5dde15a45b0087a8a82161628e77eb75caeb34ae91e3498b6690805dbce46f14f6ad3ec2aed48d67a0c05fcb982047d6bbd32cd4335245
+  metadata.gz: c0dc967ebf9e9dc670cd918c6fb895ec046f2bcfc14b4ebdb2a6c8fe85fc97ae17360f1c10a685e960c430ae8b4215751967afac963a651b77c012193dfacdf3
+  data.tar.gz: 69a42bbbeace02a2a12a870787ce769d83b61c76e968c8e0296afa9bf1e683ff5eb3cda969448756cc8fe95f953297d03c85bde938f94879ce8bcfc2e657b356

data/.travis.yml

@@ -65,3 +65,4 @@ services:
   - memcached
   - cassandra
   - redis
+  - rabbitmq

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.5.0
+
+This minor release includes the following new feature:
+
+* New [bunny](https://github.com/ruby-amqp/bunny) (Rabbitmq) client instrumentation: #129
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.5.0
+https://rubygems.org/gems/traceview/versions/3.5.0-java
+
 # traceview 3.4.2
 
 This patch release includes the following fixes:

data/gemfiles/libraries.gemfile

@@ -30,6 +30,12 @@ else
   gem 'sinatra'
 end
 
+if RUBY_VERSION < '2.0.0'
+  gem 'bunny', '< 2.0.0'
+else
+  gem 'bunny'
+end
+
 gem 'cassandra'
 gem 'curb' unless defined?(JRUBY_VERSION)
 gem 'dalli' if RUBY_VERSION > '1.8.7'

data/gemfiles/rails32.gemfile

@@ -36,7 +36,12 @@ else
   gem 'pg', '< 0.17'
 end
 
-gem "rails", "~> 3.2.22"
+if RUBY_VERSION < '1.9'
+  # Newer Rails is incompatible with Ruby 1.8.7
+  gem "rails", "3.2.19"
+else
+  gem "rails", "~> 3.2.22"
+end
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

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

@@ -94,8 +94,9 @@ if defined?(TraceView::Config)
   # value to false:
   #
   # TraceView::Config[:action_controller][:enabled] = true
-  # TraceView::Config[:active_record][:enabled] = true
   # TraceView::Config[:action_view][:enabled] = true
+  # TraceView::Config[:active_record][:enabled] = true
+  # TraceView::Config[:bunny][:enabled] = true
   # TraceView::Config[:cassandra][:enabled] = true
   # TraceView::Config[:curb][:enabled] = true
   # TraceView::Config[:dalli][:enabled] = true
@@ -124,8 +125,9 @@ if defined?(TraceView::Config)
   # a certain call or operation.
   #
   # TraceView::Config[:action_controller][:collect_backtraces] = true
-  # TraceView::Config[:active_record][: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[:cassandra][:collect_backtraces] = true
   # TraceView::Config[:curb][:collect_backtraces] = true
   # TraceView::Config[:dalli][:collect_backtraces] = false

data/lib/traceview/config.rb

@@ -11,7 +11,7 @@ module TraceView
   module Config
     @@config = {}
 
-    @@instrumentation = [:action_controller, :action_view, :active_record,
+    @@instrumentation = [:action_controller, :action_view, :active_record, :bunny,
                          :cassandra, :curb, :dalli, :delayed_jobclient,
                          :delayed_jobworker, :em_http_request, :excon,
                          :faraday, :grape, :httpclient, :nethttp, :memcached,
@@ -44,6 +44,7 @@ module TraceView
       # Set collect_backtraces defaults
       TraceView::Config[:action_controller][:collect_backtraces] = true
       TraceView::Config[:active_record][:collect_backtraces] = true
+      TraceView::Config[:bunny][:collect_backtraces] = true
       TraceView::Config[:action_view][:collect_backtraces] = true
       TraceView::Config[:cassandra][:collect_backtraces] = true
       TraceView::Config[:curb][:collect_backtraces] = true

data/lib/traceview/inst/bunny.rb

@@ -0,0 +1,147 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    module BunnyExchange
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :delete, ::Bunny::Exchange)
+      end
+
+      def delete_with_traceview(opts = {})
+        # If we're not tracing, just do a fast return.
+        return delete_without_traceview(opts) if !TraceView.tracing?
+
+        begin
+          kvs = {}
+          kvs[:Spec] = :pushq
+          kvs[:Flavor] = :rabbitmq
+          kvs[:Op] = :delete
+          kvs[:ExchangeType]   = @type
+          kvs[:RemoteHost]     = channel.connection.host
+          kvs[:RemotePort]     = channel.connection.port.to_i
+          kvs[:VirtualHost] = channel.connection.vhost
+
+          if @name.is_a?(String) && !@name.empty?
+            kvs[:ExchangeName] = @name
+          else
+            kvs[:ExchangeName] = :default
+          end
+
+          TraceView::API.log_entry('rabbitmq-client')
+
+          delete_without_traceview(opts)
+        rescue => e
+          TraceView::API.log_exception(nil, e)
+          raise e
+        ensure
+          TraceView::API.log_exit('rabbitmq-client', kvs)
+        end
+      end
+    end
+
+    module BunnyChannel
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :basic_publish,     ::Bunny::Channel)
+        ::TraceView::Util.method_alias(klass, :queue,             ::Bunny::Channel)
+        ::TraceView::Util.method_alias(klass, :wait_for_confirms, ::Bunny::Channel)
+      end
+
+      def collect_channel_kvs
+        begin
+          kvs = {}
+          kvs[:Spec] = :pushq
+          kvs[:Flavor] = :rabbitmq
+          kvs[:RemoteHost] = @connection.host
+          kvs[:RemotePort] = @connection.port.to_i
+          kvs[:VirtualHost] = @connection.vhost
+          kvs
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+        end
+      end
+
+      def basic_publish_with_traceview(payload, exchange, routing_key, opts = {})
+        # If we're not tracing, just do a fast return.
+        return basic_publish_without_traceview(payload, exchange, routing_key, opts) if !TraceView.tracing?
+
+        begin
+          kvs = {}
+          kvs[:Spec] = :pushq
+          kvs[:Flavor] = :rabbitmq # broker name?
+
+          if exchange.respond_to?(:name)
+            kvs[:ExchangeName] = exchange.name
+          elsif exchange.respond_to?(:empty?) && !exchange.empty?
+            kvs[:ExchangeName] = exchange
+          else
+            kvs[:ExchangeName] = :default
+          end
+
+          kvs[:Queue]          = opts[:queue] if opts.key?(:queue)
+          kvs[:RoutingKey]     = routing_key if routing_key
+          kvs[:RemoteHost]     = @connection.host
+          kvs[:RemotePort]     = @connection.port.to_i
+
+          kvs[:Op] = :publish
+          kvs[:VirtualHost] = @connection.vhost
+
+          TraceView::API.log_entry('rabbitmq-client')
+
+          basic_publish_without_traceview(payload, exchange, routing_key, opts)
+        rescue => e
+          TraceView::API.log_exception(nil, e)
+          raise e
+        ensure
+          TraceView::API.log_exit('rabbitmq-client', kvs)
+        end
+      end
+
+      def queue_with_traceview(name = AMQ::Protocol::EMPTY_STRING, opts = {})
+        # If we're not tracing, just do a fast return.
+        return queue_without_traceview(name, opts) if !TraceView.tracing?
+
+        begin
+          kvs = collect_channel_kvs
+          kvs[:Op] = :queue
+
+          TraceView::API.log_entry('rabbitmq-client')
+
+          result = queue_without_traceview(name, opts)
+          kvs[:Queue] = result.name
+          result
+        rescue => e
+          TraceView::API.log_exception(nil, e)
+          raise e
+        ensure
+          TraceView::API.log_exit('rabbitmq-client', kvs)
+        end
+      end
+
+      def wait_for_confirms_with_traceview
+        # If we're not tracing, just do a fast return.
+        return wait_for_confirms_without_traceview if !TraceView.tracing?
+
+        begin
+          kvs = collect_channel_kvs
+          kvs[:Op] = :wait_for_confirms
+
+          TraceView::API.log_entry('rabbitmq-client')
+
+          wait_for_confirms_without_traceview
+        rescue => e
+          TraceView::API.log_exception(nil, e)
+          raise e
+        ensure
+          TraceView::API.log_exit('rabbitmq-client', kvs)
+        end
+      end
+    end
+  end
+end
+
+if TraceView::Config[:bunny][:enabled] && defined?(::Bunny)
+  ::TraceView.logger.info '[traceview/loading] Instrumenting bunny' if TraceView::Config[:verbose]
+  ::TraceView::Util.send_include(::Bunny::Exchange, ::TraceView::Inst::BunnyExchange)
+  ::TraceView::Util.send_include(::Bunny::Channel, ::TraceView::Inst::BunnyChannel)
+end

data/lib/traceview/version.rb

@@ -7,8 +7,8 @@ module TraceView
   # traceview.gemspec during gem build process
   module Version
     MAJOR = 3
-    MINOR = 4
-    PATCH = 2
+    MINOR = 5
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/instrumentation/bunny_exchange_test.rb

@@ -0,0 +1,276 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+unless defined?(JRUBY_VERSION)
+  class BunnyTest < Minitest::Test
+    def setup
+      # Support specific environment variables to support remote rabbitmq servers
+      ENV['TV_RABBITMQ_SERVER'] = "127.0.0.1"      unless ENV['TV_RABBITMQ_SERVER']
+      ENV['TV_RABBITMQ_PORT'] = "5672"             unless ENV['TV_RABBITMQ_PORT']
+      ENV['TV_RABBITMQ_USERNAME'] = "guest"        unless ENV['TV_RABBITMQ_USERNAME']
+      ENV['TV_RABBITMQ_PASSWORD'] = "guest"        unless ENV['TV_RABBITMQ_PASSWORD']
+      ENV['TV_RABBITMQ_VHOST'] = "/"               unless ENV['TV_RABBITMQ_VHOST']
+
+      @connection_params = {}
+      @connection_params[:host]   = ENV['TV_RABBITMQ_SERVER']
+      @connection_params[:port]   = ENV['TV_RABBITMQ_PORT']
+      @connection_params[:vhost]  = ENV['TV_RABBITMQ_VHOST']
+      @connection_params[:user]   = ENV['TV_RABBITMQ_USERNAME']
+      @connection_params[:pass]   = ENV['TV_RABBITMQ_PASSWORD']
+
+      clear_all_traces
+    end
+
+    def test_publish_default_exchange
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @queue = @ch.queue("tv.ruby.test")
+      @exchange  = @ch.default_exchange
+
+      TraceView::API.start_trace('bunny_tests') do
+        @exchange.publish("The Tortoise and the Hare", :routing_key => @queue.name)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, "bunny_tests")
+      valid_edges?(traces)
+
+      traces[1]['Layer'].must_equal "rabbitmq-client"
+      traces[1]['Label'].must_equal "entry"
+      traces[2]['Layer'].must_equal "rabbitmq-client"
+      traces[2]['Label'].must_equal "exit"
+      traces[2]['Spec'].must_equal "pushq"
+      traces[2]['Flavor'].must_equal "rabbitmq"
+      traces[2]['ExchangeName'].must_equal "default"
+      traces[2]['RoutingKey'].must_equal "tv.ruby.test"
+      traces[2]['Op'].must_equal "publish"
+      traces[2]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      @conn.close
+    end
+
+    def test_publish_fanout_exchange
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @exchange = @ch.fanout("tv.ruby.fanout.tests")
+
+      TraceView::API.start_trace('bunny_tests') do
+        @exchange.publish("The Tortoise and the Hare in the fanout exchange.", :routing_key => 'tv.ruby.test').publish("And another...")
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 6
+
+      validate_outer_layers(traces, "bunny_tests")
+      valid_edges?(traces)
+
+      traces[1]['Layer'].must_equal "rabbitmq-client"
+      traces[1]['Label'].must_equal "entry"
+      traces[2]['Layer'].must_equal "rabbitmq-client"
+      traces[2]['Label'].must_equal "exit"
+      traces[2]['Spec'].must_equal "pushq"
+      traces[2]['Flavor'].must_equal "rabbitmq"
+      traces[2]['ExchangeName'].must_equal "tv.ruby.fanout.tests"
+      traces[2]['RoutingKey'].must_equal "tv.ruby.test"
+      traces[2]['Op'].must_equal "publish"
+      traces[2]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      traces[3]['Layer'].must_equal "rabbitmq-client"
+      traces[3]['Label'].must_equal "entry"
+      traces[4]['Layer'].must_equal "rabbitmq-client"
+      traces[4]['Label'].must_equal "exit"
+      traces[4]['Spec'].must_equal "pushq"
+      traces[4]['Flavor'].must_equal "rabbitmq"
+      traces[4]['ExchangeName'].must_equal "tv.ruby.fanout.tests"
+      traces[4].key?('RoutingKey').must_equal false
+      traces[4]['Op'].must_equal "publish"
+      traces[4]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[4]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[4]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      @conn.close
+    end
+
+    def test_publish_topic_exchange
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @exchange = @ch.topic("tv.ruby.topic.tests", :auto_delete => true)
+
+      TraceView::API.start_trace('bunny_tests') do
+        @exchange.publish("The Tortoise and the Hare in the topic exchange.", :routing_key => 'tv.ruby.test.1').publish("And another...", :routing_key => 'tv.ruby.test.2' )
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 6
+
+      validate_outer_layers(traces, "bunny_tests")
+      valid_edges?(traces)
+
+      traces[1]['Layer'].must_equal "rabbitmq-client"
+      traces[1]['Label'].must_equal "entry"
+      traces[2]['Layer'].must_equal "rabbitmq-client"
+      traces[2]['Label'].must_equal "exit"
+      traces[2]['Spec'].must_equal "pushq"
+      traces[2]['Flavor'].must_equal "rabbitmq"
+      traces[2]['ExchangeName'].must_equal "tv.ruby.topic.tests"
+      traces[2]['RoutingKey'].must_equal "tv.ruby.test.1"
+      traces[2]['Op'].must_equal "publish"
+      traces[2]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      traces[3]['Layer'].must_equal "rabbitmq-client"
+      traces[3]['Label'].must_equal "entry"
+      traces[4]['Layer'].must_equal "rabbitmq-client"
+      traces[4]['Label'].must_equal "exit"
+      traces[4]['Spec'].must_equal "pushq"
+      traces[4]['Flavor'].must_equal "rabbitmq"
+      traces[4]['ExchangeName'].must_equal "tv.ruby.topic.tests"
+      traces[4]['RoutingKey'].must_equal "tv.ruby.test.2"
+      traces[4]['Op'].must_equal "publish"
+      traces[4]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[4]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[4]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      @conn.close
+    end
+
+    def test_publish_error_handling
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+
+      begin
+        TraceView::API.start_trace('bunny_tests') do
+          @exchange = @ch.topic("tv.ruby.error.1", :auto_delete => true)
+          @exchange = @ch.fanout("tv.ruby.error.1", :auto_delete => true)
+          @exchange.publish("The Tortoise and the Hare in the topic exchange.", :routing_key => 'tv.ruby.test.1').publish("And another...", :routing_key => 'tv.ruby.test.2' )
+        end
+      rescue
+        # Capture intentional redeclaration error
+      end
+
+      traces = get_all_traces
+      assert_equal traces.count, 3
+
+      validate_outer_layers(traces, "bunny_tests")
+      valid_edges?(traces)
+
+      traces[1]['Label'].must_equal "error"
+      traces[1]['ErrorClass'].must_equal "Bunny::PreconditionFailed"
+      traces[1]['ErrorMsg'].must_match(/PRECONDITION_FAILED/)
+      traces[1].key?('Backtrace').must_equal true
+
+      @conn.close
+    end
+
+    def test_delete_exchange
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @exchange = @ch.fanout("tv.delete_exchange.test")
+      @queue = @ch.queue("", :exclusive => true).bind(@exchange)
+
+      @ch.confirm_select
+      @exchange.publish("", :routing_key => 'tv.ruby.test')
+
+      TraceView::API.start_trace('bunny_tests') do
+        @exchange.delete
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, "bunny_tests")
+
+      traces[2]['Spec'].must_equal "pushq"
+      traces[2]['Flavor'].must_equal "rabbitmq"
+      traces[2]['ExchangeName'].must_equal "tv.delete_exchange.test"
+      traces[2]['ExchangeType'].must_equal "fanout"
+      traces[2]['Op'].must_equal "delete"
+      traces[2]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+    end
+
+    def test_wait_for_confirms
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @exchange = @ch.fanout("tv.ruby.wait_for_confirm.tests")
+      @queue = @ch.queue("", :exclusive => true).bind(@exchange)
+
+      @ch.confirm_select
+
+      TraceView::API.start_trace('bunny_tests') do
+        1000.times do
+          @exchange.publish("", :routing_key => 'tv.ruby.test')
+        end
+
+        @ch.wait_for_confirms
+      end
+
+      traces = get_all_traces
+      assert_equal traces.count, 2004
+
+      validate_outer_layers(traces, "bunny_tests")
+
+      traces[2000]['Spec'].must_equal "pushq"
+      traces[2000]['Flavor'].must_equal "rabbitmq"
+      traces[2000]['ExchangeName'].must_equal "tv.ruby.wait_for_confirm.tests"
+      traces[2000]['RoutingKey'].must_equal "tv.ruby.test"
+      traces[2000]['Op'].must_equal "publish"
+      traces[2000]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2000]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2000]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      traces[2001]['Layer'].must_equal "rabbitmq-client"
+      traces[2001]['Label'].must_equal "entry"
+      traces[2002]['Layer'].must_equal "rabbitmq-client"
+      traces[2002]['Label'].must_equal "exit"
+      traces[2002]['Spec'].must_equal "pushq"
+      traces[2002]['Flavor'].must_equal "rabbitmq"
+      traces[2002]['Op'].must_equal "wait_for_confirms"
+      traces[2002]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2002]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2002]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+
+      @conn.close
+    end
+
+    def test_channel_queue
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @exchange = @ch.fanout("tv.queue.test")
+
+      TraceView::API.start_trace('bunny_tests') do
+        @queue = @ch.queue("blah", :exclusive => true).bind(@exchange)
+      end
+
+      traces = get_all_traces
+      traces.count.must_equal 4
+
+      validate_outer_layers(traces, "bunny_tests")
+
+      traces[2]['Spec'].must_equal "pushq"
+      traces[2]['Flavor'].must_equal "rabbitmq"
+      traces[2]['Op'].must_equal "queue"
+      traces[2]['Queue'].must_equal "blah"
+      traces[2]['RemoteHost'].must_equal ENV['TV_RABBITMQ_SERVER']
+      traces[2]['RemotePort'].must_equal ENV['TV_RABBITMQ_PORT'].to_i
+      traces[2]['VirtualHost'].must_equal ENV['TV_RABBITMQ_VHOST']
+    end
+  end
+end

data/test/support/config_test.rb

@@ -30,11 +30,12 @@ describe "TraceView::Config" do
     instrumentation = TraceView::Config.instrumentation
 
     # Verify the number of individual instrumentations
-    instrumentation.count.must_equal 27
+    instrumentation.count.must_equal 28
 
     TraceView::Config[:action_controller][:enabled].must_equal true
     TraceView::Config[:action_view][:enabled].must_equal true
     TraceView::Config[:active_record][:enabled].must_equal true
+    TraceView::Config[:bunny][:enabled].must_equal true
     TraceView::Config[:cassandra][:enabled].must_equal true
     TraceView::Config[:curb][:enabled].must_equal true
     TraceView::Config[:dalli][:enabled].must_equal true
@@ -63,6 +64,7 @@ describe "TraceView::Config" do
     TraceView::Config[:action_controller][:log_args].must_equal true
     TraceView::Config[:action_view][:log_args].must_equal true
     TraceView::Config[:active_record][:log_args].must_equal true
+    TraceView::Config[:bunny][:log_args].must_equal true
     TraceView::Config[:cassandra][:log_args].must_equal true
     TraceView::Config[:curb][:log_args].must_equal true
     TraceView::Config[:dalli][:log_args].must_equal true

data/traceview.gemspec

@@ -26,17 +26,21 @@ Gem::Specification.new do |s|
   # Development dependencies used in gem development & testing
   s.add_development_dependency('rake', '>= 0.9.0')
 
-  case RUBY_VERSION
-  when /^1\.8/
-    s.add_development_dependency('ruby-debug', '>= 0.10.1')
-    s.add_development_dependency('pry', '>= 0.9.12.4')
-  when /^1\.9/
-    s.add_development_dependency('debugger', '>= 1.6.7')
+  unless defined?(JRUBY_VERSION)
+    case RUBY_VERSION
+    when /^1\.8/
+      s.add_development_dependency('ruby-debug', '>= 0.10.1')
+      s.add_development_dependency('pry', '>= 0.9.12.4')
+    when /^1\.9/
+      s.add_development_dependency('debugger', '>= 1.6.7')
+      s.add_development_dependency('pry', '>= 0.10.0')
+    when /^2\./
+      s.add_development_dependency('byebug', '>= 8.0.0')
+      s.add_development_dependency('pry', '>= 0.10.0')
+      s.add_development_dependency('pry-byebug', '>= 3.0.0')
+    end
+  else
     s.add_development_dependency('pry', '>= 0.10.0')
-  when /^2\./
-    s.add_development_dependency('byebug', '>= 8.0.0')
-    s.add_development_dependency('pry', '>= 0.10.0')
-    s.add_development_dependency('pry-byebug', '>= 3.0.0')
   end
 
   s.required_ruby_version = '>= 1.8.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,20 +39,6 @@ dependencies:
         version: 0.9.0
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: byebug
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: pry
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
         version: 0.10.0
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  prerelease: false
-  type: :development
 description: The TraceView gem provides performance instrumentation for MRI Ruby, JRuby and related frameworks.
 email: traceviewsupport@appneta.com
 executables: []
@@ -162,6 +134,7 @@ files:
 - lib/traceview/frameworks/rails/inst/connection_adapters/utils.rb
 - lib/traceview/frameworks/sinatra.rb
 - lib/traceview/frameworks/sinatra/templates.rb
+- lib/traceview/inst/bunny.rb
 - lib/traceview/inst/curb.rb
 - lib/traceview/inst/dalli.rb
 - lib/traceview/inst/delayed_job.rb
@@ -204,6 +177,7 @@ files:
 - test/frameworks/rails3x_test.rb
 - test/frameworks/rails4x_test.rb
 - test/frameworks/sinatra_test.rb
+- test/instrumentation/bunny_exchange_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/curb_test.rb
 - test/instrumentation/dalli_test.rb
@@ -310,6 +284,7 @@ test_files:
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/redis_strings_test.rb
+- test/instrumentation/bunny_exchange_test.rb
 - test/instrumentation/typhoeus_test.rb
 - test/instrumentation/sequel_mysql2_test.rb
 - test/instrumentation/sidekiq-worker_test.rb