traceview 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86278e19d054dffabfc5f5734f2ee9dde2b2d199
-  data.tar.gz: 545d93bba409db72f8d6ddef5006d00a41430963
+  metadata.gz: 6660066c10caaa82692450f3cb605aaf60246058
+  data.tar.gz: e35fb9b72aa97cee508e5c94ec45352af8db210c
 SHA512:
-  metadata.gz: 450ce8d0870dd1533f531850ccd2a362cb1b689e33b45405e7e0d9c55405ed5606070211642a459fd311d2112ff19cde65b45ea17dac0e2d822bd31aa7cad260
-  data.tar.gz: f6f47a46528799f165227a38a917322896d150dcb5263901a5ace00d2b9b7343e2830542f904f418efd81fbb6d0baad83737835cb90f9179989d7a805d98ba67
+  metadata.gz: 225128b2074fe06f2129fd8402a8ece3a544b70c1958db4023f51292f0a68ef25800ee24cdcee88597f3ed86d2876edd93e0f9865dd9d76356998b059d8c4c85
+  data.tar.gz: 098564e82e0f401224f12693a79ad40e77ff7fa3382d439026232366d61998cd26ac702999ef0fb3002d28ce9cb77dd1b17ca532897ba6733139df63d9d64251

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

data/gemfiles/libraries.gemfile

@@ -16,11 +16,12 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
+    gem 'puma', '< 3.0'
   else
     gem 'bson', '< 4.0'
+    gem 'puma'
   end
 end
 

data/gemfiles/rails32.gemfile

@@ -19,11 +19,12 @@ group :development, :test do
   gem 'minitest-reporters', '< 1.0.18'
   gem 'minitest-debugger', :require => false
   gem 'rack-test'
-  gem 'puma'
   if RUBY_VERSION < '1.9.3'
     gem 'bson', '<= 1.12.3'
+    gem 'puma', '< 3.0'
   else
     gem 'bson', '< 4.0'
+    gem 'puma'
   end
 end
 

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 resque-worker).include?(layer.to_s)
+    %w(delayed_job-worker sidekiq-worker resque-worker rabbitmq-consumer).include?(layer.to_s)
   end
 
   ##

data/lib/traceview/config.rb

@@ -11,13 +11,14 @@ module TraceView
   module Config
     @@config = {}
 
-    @@instrumentation = [:action_controller, :action_view, :active_record, :bunny,
-                         :cassandra, :curb, :dalli, :delayed_jobclient,
-                         :delayed_jobworker, :em_http_request, :excon,
-                         :faraday, :grape, :httpclient, :nethttp, :memcached,
-                         :memcache, :mongo, :moped, :rack, :redis, :resqueclient,
-                         :resqueworker, :rest_client, :sequel, :sidekiqclient,
-                         :sidekiqworker, :typhoeus]
+    @@instrumentation = [:action_controller, :action_view, :active_record,
+                         :bunnyclient, :bunnyconsumer, :cassandra, :curb,
+                         :dalli, :delayed_jobclient, :delayed_jobworker,
+                         :em_http_request, :excon, :faraday, :grape,
+                         :httpclient, :nethttp, :memcached,
+                         :memcache, :mongo, :moped, :rack, :redis,
+                         :resqueclient, :resqueworker, :rest_client,
+                         :sequel, :sidekiqclient, :sidekiqworker, :typhoeus]
 
     # Subgrouping of instrumentation
     @@http_clients = [:curb, :excon, :em_http_request, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
@@ -44,7 +45,8 @@ 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[:bunnyclient][:collect_backtraces] = false
+      TraceView::Config[:bunnyconsumer][:collect_backtraces] = false
       TraceView::Config[:action_view][:collect_backtraces] = true
       TraceView::Config[:cassandra][:collect_backtraces] = true
       TraceView::Config[:curb][:collect_backtraces] = true
@@ -61,6 +63,7 @@ module TraceView
       TraceView::Config[:mongo][:collect_backtraces] = true
       TraceView::Config[:moped][:collect_backtraces] = true
       TraceView::Config[:nethttp][:collect_backtraces] = true
+      TraceView::Config[:rack][:collect_backtraces] = false
       TraceView::Config[:redis][:collect_backtraces] = false
       TraceView::Config[:resqueclient][:collect_backtraces] = true
       TraceView::Config[:resqueworker][:collect_backtraces] = false
@@ -147,6 +150,7 @@ module TraceView
       # <tt>rescue_from</tt> are not reported to the TraceView
       # dashboard by default.  Setting this value to true will
       # report all raised exception regardless.
+      #
       @@config[:report_rescued_errors] = false
 
       # By default, the curb instrumentation will not link
@@ -163,8 +167,25 @@ module TraceView
       # Alternatively, if you would like to install the separate
       # libcurl instrumentation, see here:
       # http://docs.appneta.com/installing-libcurl-instrumentation
+      #
       @@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.
+      #
+      @@config[:bunnyconsumer][:controller] = :app_id
+      @@config[:bunnyconsumer][:action] = :type
+
       # Environment support for OpenShift.
       if ENV.key?('OPENSHIFT_TRACEVIEW_TLYZER_IP')
         # We're running on OpenShift

data/lib/traceview/inst/{bunny.rb → bunny-client.rb}

@@ -55,6 +55,7 @@ module TraceView
           kvs[:RemoteHost] = @connection.host
           kvs[:RemotePort] = @connection.port.to_i
           kvs[:VirtualHost] = @connection.vhost
+          kvs[:Backtrace] = TV::API.backtrace if TV::Config[:bunnyclient][:collect_backtraces]
           kvs
         rescue => e
           TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
@@ -68,9 +69,7 @@ module TraceView
         return basic_publish_without_traceview(payload, exchange, routing_key, opts) if !TraceView.tracing?
 
         begin
-          kvs = {}
-          kvs[:Spec] = :pushq
-          kvs[:Flavor] = :rabbitmq # broker name?
+          kvs = collect_channel_kvs
 
           if exchange.respond_to?(:name)
             kvs[:ExchangeName] = exchange.name
@@ -80,16 +79,16 @@ module TraceView
             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
+          kvs[:Queue]       = opts[:queue] if opts.key?(:queue)
+          kvs[:RoutingKey]  = routing_key if routing_key
+          kvs[:Op]          = :publish
 
           TraceView::API.log_entry('rabbitmq-client')
 
+          # Pass the tracing context as a header
+          opts[:headers] ||= {}
+          opts[:headers][:SourceTrace] = TraceView::Context.toString if TraceView.tracing?
+
           basic_publish_without_traceview(payload, exchange, routing_key, opts)
         rescue => e
           TraceView::API.log_exception(nil, e)
@@ -142,8 +141,8 @@ module TraceView
   end
 end
 
-if TraceView::Config[:bunny][:enabled] && defined?(::Bunny)
-  ::TraceView.logger.info '[traceview/loading] Instrumenting bunny' if TraceView::Config[:verbose]
+if TraceView::Config[:bunnyclient][:enabled] && defined?(::Bunny)
+  ::TraceView.logger.info '[traceview/loading] Instrumenting bunny client' 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/inst/bunny-consumer.rb

@@ -0,0 +1,92 @@
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    module BunnyConsumer
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :call, ::Bunny::Consumer)
+      end
+
+      def collect_consumer_kvs(args)
+        begin
+          kvs = {}
+          kvs[:Spec] = :job
+          kvs[:Flavor] = :rabbitmq
+          kvs[:RemoteHost]  = @channel.connection.host
+          kvs[:RemotePort]  = @channel.connection.port.to_i
+          kvs[:VirtualHost] = @channel.connection.vhost
+
+          mp = args[1]
+          kvs[:RoutingKey] = args[0].routing_key if args[0].routing_key
+          kvs[:MsgID]      = args[1].message_id  if mp.message_id
+          kvs[:AppID]      = args[1].app_id      if mp.app_id
+          kvs[:Priority]   = args[1].priority    if mp.priority
+
+          if @queue.respond_to?(:name)
+            kvs[:Queue] = @queue.name
+          else
+            kvs[:Queue] = @queue
+          end
+
+          # Report configurable Controller/Action KVs
+          # See TraceView::Config[:bunny] in lib/traceview/config.rb
+          # Used for dashboard trace filtering
+          controller_key = TV::Config[:bunnyconsumer][:controller]
+          if mp.respond_to?(controller_key)
+            value = mp.method(controller_key).call
+            kvs[:Controller] = value if value
+          end
+
+          action_key = TV::Config[:bunnyconsumer][:action]
+          if mp.respond_to?(action_key)
+            value = mp.method(action_key).call
+            kvs[:Action] = value if value
+          end
+
+          if kvs[:Queue]
+            kvs[:URL] = "/bunny/#{kvs[:Queue]}"
+          else
+            kvs[:URL] = "/bunny/consumer"
+          end
+
+          if TV::Config[:bunnyconsumer][:log_args] && @arguments
+            kvs[:Args] = @arguments.to_s
+          end
+
+          kvs[:Backtrace] = TV::API.backtrace if TV::Config[:bunnyconsumer][:collect_backtraces]
+
+          kvs
+        rescue => e
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if TraceView::Config[:verbose]
+        ensure
+          return kvs
+        end
+      end
+
+      def call_with_traceview(*args)
+        report_kvs = collect_consumer_kvs(args)
+
+        # If SourceTrace was passed, capture and report it
+        headers = args[1][:headers]
+
+        if headers && headers['SourceTrace']
+          report_kvs[:SourceTrace] = headers['SourceTrace']
+
+          # Remove SourceTrace
+          headers.delete('SourceTrace')
+        end
+
+        result = TraceView::API.start_trace('rabbitmq-consumer', nil, report_kvs) do
+          call_without_traceview(*args)
+        end
+        result[0]
+      end
+    end
+  end
+end
+
+if TraceView::Config[:bunnyconsumer][:enabled] && defined?(::Bunny)
+  ::TraceView.logger.info '[traceview/loading] Instrumenting bunny consumer' if TraceView::Config[:verbose]
+  ::TraceView::Util.send_include(::Bunny::Consumer, ::TraceView::Inst::BunnyConsumer)
+end

data/lib/traceview/version.rb

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

data/test/instrumentation/{bunny_exchange_test.rb → bunny_client_test.rb}

@@ -4,7 +4,7 @@
 require 'minitest_helper'
 
 unless defined?(JRUBY_VERSION)
-  class BunnyTest < Minitest::Test
+  class BunnyClientTest < 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']

data/test/instrumentation/bunny_consumer_test.rb

@@ -0,0 +1,204 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+unless defined?(JRUBY_VERSION)
+  class BunnyConsumerTest < 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_consume
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @queue = @ch.queue("tv.ruby.consumer.test", :exclusive => true)
+      @exchange  = @ch.default_exchange
+
+      @queue.subscribe(:block => false, :manual_ack => true) do |delivery_info, properties, payload|
+        # Make an http call to spice things up
+        uri = URI('http://127.0.0.1:8101/')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.get('/?q=1').read_body
+      end
+
+      TraceView::API.start_trace('bunny_consume_test') do
+        @exchange.publish("The Tortoise and the Hare", :routing_key => @queue.name, :app_id => "msg_app", :type => :generic)
+      end
+
+      sleep 1
+
+      traces = get_all_traces
+
+      traces.count.must_equal 12
+      valid_edges?(traces)
+
+      traces[5]['Layer'].must_equal "net-http"
+      traces[5]['Label'].must_equal "entry"
+      traces[10]['Layer'].must_equal "net-http"
+      traces[10]['Label'].must_equal "exit"
+
+      traces[4]['Spec'].must_equal "job"
+      traces[4]['Flavor'].must_equal "rabbitmq"
+      traces[4]['Queue'].must_equal "tv.ruby.consumer.test"
+      traces[4]['RemoteHost'].must_equal @connection_params[:host]
+      traces[4]['RemotePort'].must_equal @connection_params[:port].to_i
+      traces[4]['VirtualHost'].must_equal @connection_params[:vhost]
+      traces[4]['RoutingKey'].must_equal "tv.ruby.consumer.test"
+      traces[4]['Controller'].must_equal "msg_app"
+      traces[4]['Action'].must_equal "generic"
+      traces[4]['URL'].must_equal "/bunny/tv.ruby.consumer.test"
+      traces[4].key?('SourceTrace').must_equal true
+      traces[4].key?('Backtrace').must_equal false
+
+      @conn.close
+    end
+
+    def test_blocking_consume
+      skip if RUBY_VERSION < '2.0'
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @queue = @ch.queue("tv.ruby.consumer.blocking.test", :exclusive => true)
+      @exchange  = @ch.default_exchange
+
+      Thread.new {
+        @queue.subscribe(:block => true, :manual_ack => true) do |delivery_info, properties, payload|
+          # Make an http call to spice things up
+          uri = URI('http://127.0.0.1:8101/')
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.get('/?q=1').read_body
+        end
+      }
+
+      @exchange.publish("The Tortoise and the Hare", :routing_key => @queue.name, :app_id => "msg_app", :type => :generic)
+
+      sleep 1
+
+      traces = get_all_traces
+      traces.count.must_equal 8
+
+      validate_outer_layers(traces, "rabbitmq-consumer")
+      valid_edges?(traces)
+
+      traces[1]['Layer'].must_equal "net-http"
+      traces[1]['Label'].must_equal "entry"
+      traces[6]['Layer'].must_equal "net-http"
+      traces[6]['Label'].must_equal "exit"
+
+      traces[0]['Spec'].must_equal "job"
+      traces[0]['Flavor'].must_equal "rabbitmq"
+      traces[0]['Queue'].must_equal "tv.ruby.consumer.blocking.test"
+      traces[0]['RemoteHost'].must_equal @connection_params[:host]
+      traces[0]['RemotePort'].must_equal @connection_params[:port].to_i
+      traces[0]['VirtualHost'].must_equal @connection_params[:vhost]
+      traces[0]['RoutingKey'].must_equal "tv.ruby.consumer.blocking.test"
+      traces[0]['Controller'].must_equal "msg_app"
+      traces[0]['Action'].must_equal "generic"
+      traces[0]['URL'].must_equal "/bunny/tv.ruby.consumer.blocking.test"
+      traces[0].key?('Backtrace').must_equal false
+
+      @conn.close
+    end
+
+    def test_consume_error_handling
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @queue = @ch.queue("tv.ruby.consumer.error.test", :exclusive => true)
+      @exchange  = @ch.default_exchange
+
+      @queue.subscribe(:block => false, :manual_ack => true) do |delivery_info, properties, payload|
+        raise "blah"
+      end
+
+      @exchange.publish("The Tortoise and the Hare", :routing_key => @queue.name, :app_id => "msg_app", :type => :generic)
+
+      sleep 1
+
+      traces = get_all_traces
+      traces.count.must_equal 3
+
+      validate_outer_layers(traces, "rabbitmq-consumer")
+      valid_edges?(traces)
+
+      traces[0]['Spec'].must_equal "job"
+      traces[0]['Flavor'].must_equal "rabbitmq"
+      traces[0]['Queue'].must_equal "tv.ruby.consumer.error.test"
+      traces[0]['RemoteHost'].must_equal @connection_params[:host]
+      traces[0]['RemotePort'].must_equal @connection_params[:port].to_i
+      traces[0]['VirtualHost'].must_equal @connection_params[:vhost]
+      traces[0]['RoutingKey'].must_equal "tv.ruby.consumer.error.test"
+      traces[0]['Controller'].must_equal "msg_app"
+      traces[0]['Action'].must_equal "generic"
+      traces[0]['URL'].must_equal "/bunny/tv.ruby.consumer.error.test"
+      traces[0].key?('Backtrace').must_equal false
+
+      traces[1]['Layer'].must_equal "rabbitmq-consumer"
+      traces[1]['Label'].must_equal "error"
+      traces[1]['ErrorClass'].must_equal "RuntimeError"
+      traces[1]['ErrorMsg'].must_equal "blah"
+      traces[1].key?('Backtrace').must_equal true
+
+      traces[2]['Layer'].must_equal "rabbitmq-consumer"
+      traces[2]['Label'].must_equal "exit"
+    end
+
+    def test_message_id_capture
+      @conn = Bunny.new(@connection_params)
+      @conn.start
+      @ch = @conn.create_channel
+      @queue = @ch.queue("tv.ruby.consumer.msgid.test", :exclusive => true)
+      @exchange  = @ch.default_exchange
+
+      @queue.subscribe(:block => false, :manual_ack => true) do |delivery_info, properties, payload|
+        # Make an http call to spice things up
+        uri = URI('http://127.0.0.1:8101/')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.get('/?q=1').read_body
+      end
+
+      TraceView::API.start_trace('bunny_consume_test') do
+        @exchange.publish("The Tortoise and the Hare", :message_id => "1234", :routing_key => @queue.name, :app_id => "msg_app", :type => :generic)
+      end
+
+      sleep 1
+
+      traces = get_all_traces
+
+      traces.count.must_equal 12
+      valid_edges?(traces)
+
+      traces[4]['Spec'].must_equal "job"
+      traces[4]['Flavor'].must_equal "rabbitmq"
+      traces[4]['Queue'].must_equal "tv.ruby.consumer.msgid.test"
+      traces[4]['RemoteHost'].must_equal @connection_params[:host]
+      traces[4]['RemotePort'].must_equal @connection_params[:port].to_i
+      traces[4]['VirtualHost'].must_equal @connection_params[:vhost]
+      traces[4]['RoutingKey'].must_equal "tv.ruby.consumer.msgid.test"
+      traces[4]['Controller'].must_equal "msg_app"
+      traces[4]['Action'].must_equal "generic"
+      traces[4]['URL'].must_equal "/bunny/tv.ruby.consumer.msgid.test"
+      traces[4]['MsgID'].must_equal "1234"
+      traces[4].key?('SourceTrace').must_equal true
+      traces[4].key?('Backtrace').must_equal false
+
+      @conn.close
+    end
+  end
+end

data/test/support/auto_tracing_test.rb

@@ -16,12 +16,14 @@ class AutoTraceTest  < Minitest::Test
     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?('rabbitmq-consumer').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?(:'rabbitmq-consumer').must_equal true
     TraceView.entry_layer?(:asdfworker).must_equal false
   end
 
@@ -49,6 +51,14 @@ class AutoTraceTest  < Minitest::Test
     end
   end
 
+  def test_trace_when_default_tm_rabbitmq
+    TraceView::Config[:tracing_mode] = :through
+
+    TV::API.start_trace('rabbitmq-consumer') do
+      TraceView.tracing?.must_equal true
+    end
+  end
+
   def test_dont_trace_when_never
     TraceView::Config[:tracing_mode] = :never
 

data/test/support/config_test.rb

@@ -30,12 +30,13 @@ describe "TraceView::Config" do
     instrumentation = TraceView::Config.instrumentation
 
     # Verify the number of individual instrumentations
-    instrumentation.count.must_equal 28
+    instrumentation.count.must_equal 29
 
     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[:bunnyclient][:enabled].must_equal true
+    TraceView::Config[:bunnyconsumer][: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
@@ -64,7 +65,8 @@ 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[:bunnyclient][:log_args].must_equal true
+    TraceView::Config[:bunnyconsumer][: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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,7 +164,8 @@ 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/bunny-client.rb
+- lib/traceview/inst/bunny-consumer.rb
 - lib/traceview/inst/curb.rb
 - lib/traceview/inst/dalli.rb
 - lib/traceview/inst/delayed_job.rb
@@ -207,7 +208,8 @@ files:
 - test/frameworks/rails3x_test.rb
 - test/frameworks/rails4x_test.rb
 - test/frameworks/sinatra_test.rb
-- test/instrumentation/bunny_exchange_test.rb
+- test/instrumentation/bunny_client_test.rb
+- test/instrumentation/bunny_consumer_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/curb_test.rb
 - test/instrumentation/dalli_test.rb
@@ -304,6 +306,7 @@ test_files:
 - test/servers/rackapp_8101.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/sequel_pg_test.rb
+- test/instrumentation/bunny_client_test.rb
 - test/instrumentation/moped_test.rb
 - test/instrumentation/httpclient_test.rb
 - test/instrumentation/sequel_mysql_test.rb
@@ -314,9 +317,9 @@ 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/bunny_consumer_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/redis_misc_test.rb
 - test/instrumentation/faraday_test.rb