hutch 0.23.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e335b78e14abc9ebf9a6d027b52b10100dfa5c
-  data.tar.gz: 39013b71c53646886336d89718c67e056d3f3e04
+  metadata.gz: fb197fc767359bc60d35790ec650c9c077120d0d
+  data.tar.gz: e1152a8d434fdc9a4752c095ad5fdce4871ffd9e
 SHA512:
-  metadata.gz: 2d3d9acd8724e4882d272d63adee132f308fd8d134cdb58c2b0228342f2e67fd22904dcac8d7bed61a50b2a7254ac9e935ba38e65b7978317d32139c522f37fd
-  data.tar.gz: e1c695a9e83d0de05678d11cfbba783388968b8cfa68d287856f6f2f481e149833c043a6a46185e1c7e0552f350f8a0d1db873cb5ebe22670d37e36b668f9777
+  metadata.gz: c34020a830413a6e970bfae9e59fecdaebbe770aaf7df753a7f263af6d7dc98b0ae4433a4aafc27d9d8f45689168d0b39a64d3ba4086c05187fc7b0e352d9814
+  data.tar.gz: cc24d3e6ab11c4979455c06ba057760b00cffae9dd577a39f4f89bfe7b45a33378c2190362c2d003a5418b3e64238d2997610c8b4f8f52a5287d0765563109ad

data/.travis.yml

@@ -1,19 +1,17 @@
 language: ruby
 cache: bundler
-before_install: gem i bundler
+before_install:
+  - gem update --system
+  - gem install bundler
 matrix:
   include:
-    - rvm: 2.3.0
-      gemfile: gemfiles/Gemfile.activesupport5
+    - rvm: 2.4.0
+    - rvm: 2.3.3
     - rvm: 2.2
-      gemfile: gemfiles/Gemfile.activesupport4
     - rvm: 2.1
-      gemfile: gemfiles/Gemfile.activesupport4
     - rvm: 2.0
-      gemfile: gemfiles/Gemfile.activesupport4
-    - rvm: jruby-9.1.5.0
+    - rvm: jruby-9.1.7.0
       jdk: oraclejdk8
-      gemfile: gemfiles/Gemfile.activesupport5
       env:
         - JRUBY_OPTS='--debug'
 

data/CHANGELOG.md

@@ -1,9 +1,43 @@
 ## 0.24.0 — (unreleased)
 
-No changes yet.
+### Configurable Consumer Prefixes
 
+Hutch consumers now can use user-provided prefixes for consumer tags.
 
-## 0.23.0 — October 20th, 2016
+Contributed by Dávid Lantos.
+
+GitHub issue: [#265](https://github.com/gocardless/hutch/pull/265)
+
+### Signal Handling in Workers
+
+Hutch will now handle several OS signals:
+
+ * `USR2` will log stack traces of all alive VM threads
+ * `QUIT` (except on JRuby), `INT`, `TERM` will cause Hutch daemon to shut down
+ 
+ Contributed by Olle Jonsson.
+
+GitHub issues: [#263](https://github.com/gocardless/hutch/pull/263), [#271](https://github.com/gocardless/hutch/pull/271)
+
+### Opbeat Tracer
+
+Hutch now provides a tracer implementation for [Opbeat](https://opbeat.com/).
+
+Contributed by Olle Jonsson.
+
+GitHub issue: [#262](https://github.com/gocardless/hutch/pull/262)
+
+### `HUTCH_URI` Support
+
+The `HUTCH_URI` environment variable now can be used to configure
+Hutch connection URI.
+
+Contributed by Sam Stickland.
+
+GitHub issue: [#270](https://github.com/gocardless/hutch/pull/270)
+
+
+## 0.23.1 — October 20th, 2016
 
 This release contains a **breaking change** in the error
 handlers interface.

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby RUBY_VERSION
+
 gemspec
 
 group :development do
@@ -14,7 +16,7 @@ group :development do
 end
 
 group :development, :test do
-  gem "rspec", "~> 3.0"
+  gem "rspec", "~> 3.5"
   gem "simplecov", "~> 0.12"
 
   gem "sentry-raven"

data/README.md

@@ -1,29 +1,47 @@
 ![](http://cl.ly/image/3h0q3F3G142K/hutch.png)
 
-Hutch is a Ruby library for enabling asynchronous inter-service communication
-in a service-oriented architecture, using RabbitMQ.
-
 [![Gem Version](https://badge.fury.io/rb/hutch.svg)](http://badge.fury.io/rb/hutch)
 [![Build Status](https://travis-ci.org/gocardless/hutch.svg?branch=master)](https://travis-ci.org/gocardless/hutch)
 [![Dependency Status](https://gemnasium.com/gocardless/hutch.svg)](https://gemnasium.com/gocardless/hutch)
 [![Code Climate](https://codeclimate.com/github/gocardless/hutch.svg)](https://codeclimate.com/github/gocardless/hutch)
 
+Hutch is a Ruby library for enabling asynchronous inter-service communication
+in a service-oriented architecture, using RabbitMQ.
+
 To install with RubyGems:
 
 ```
 gem install hutch
 ```
 
-## Project Maturity
+<!-- Tocer[start]: Auto-generated, don't remove. -->
 
-Hutch is a moderately mature project (started in early 2013)
-that was extracted from production systems.
+### Table of Contents
 
+  - [Requirements](#requirements)
+  - [Overview](#overview)
+    - [Project Maturity](#project-maturity)
+  - [Consumers](#consumers)
+    - [Message Processing Tracers](#message-processing-tracers)
+  - [Running Hutch](#running-hutch)
+    - [Loading Consumers](#loading-consumers)
+    - [Stopping Hutch](#stopping-hutch)
+  - [Producers](#producers)
+    - [Producer Configuration](#producer-configuration)
+    - [Publisher Confirms](#publisher-confirms)
+    - [Writing Well-Behaved Publishers](#writing-well-behaved-publishers)
+  - [Configuration](#configuration)
+    - [Config File](#config-file)
+    - [Environment variables](#environment-variables)
+    - [Configuration precedence](#configuration-precedence)
+    - [Generated list of configuration options](#generated-list-of-configuration-options)
 
-## Supported Ruby Versions
+<!-- Tocer[finish]: Auto-generated, don't remove. -->
 
-Hutch requires CRuby 2.0+ or JRuby 9K.
+## Requirements
 
+- Hutch requires Ruby 2.0+ or JRuby 9K.
+- Hutch requires RabbitMQ 3.3 or later.
 
 ## Overview
 
@@ -39,8 +57,12 @@ and so on. Publishers connect to RabbitMQ via `Hutch.connect` and publish using
 Hutch uses [Bunny](http://rubybunny.info) or [March Hare](http://rubymarchhare.info)
 (on JRuby) under the hood.
 
+### Project Maturity
+
+Hutch is a moderately mature project (started in early 2013)
+that was extracted from production systems.
 
-## Defining Consumers
+## Consumers
 
 Consumers receive messages from a RabbitMQ queue. That queue may be bound to
 one or more topics (represented by routing keys).
@@ -136,11 +158,13 @@ to learn more.
 
 Tracers allow you to track message processing.
 
-#### NewRelic
+This will enable NewRelic custom instrumentation:
+
 ```ruby
 Hutch::Config.set(:tracer, Hutch::Tracers::NewRelic)
 ```
-This will enable NewRelic custom instrumentation. Batteries included! Screenshoots available [here](https://monosnap.com/list/557020a000779174f23467e3).
+
+Batteries included! 
 
 ## Running Hutch
 
@@ -279,7 +303,7 @@ end
 If using publisher confirms with amqp gem, see [this issue][pc-issue]
 and [this gist][pc-gist] for more info.
 
-## Configuration Reference
+## Configuration
 
 ### Config File
 
@@ -334,7 +358,12 @@ In order from lowest to highest precedence:
 
 ### Generated list of configuration options
 
-<table border="1" class="settings">
+Generate with
+
+0. `yard doc lib/hutch/config.rb`
+0. Copy the _Configuration_ section from `doc/Hutch/Config.html` here, with the anchor tags stripped.
+
+<table border="1" class="settings" style="overflow:visible;">
   <thead>
     <tr>
       <th>
@@ -401,6 +430,15 @@ In order from lowest to highest precedence:
 </td>
     </tr>
   
+    <tr>
+      <td><tt>uri</tt></td>
+      <td>nil</td>
+      <td>String</td>
+      <td><tt>HUTCH_URI</tt></td>
+      <td><p>RabbitMQ URI (takes precedence over MQ username, password, host, port and vhost settings)</p>
+</td>
+    </tr>
+  
     <tr>
       <td><tt>mq_api_host</tt></td>
       <td>127.0.0.1</td>
@@ -571,15 +609,20 @@ In order from lowest to highest precedence:
       <td><p>Should Bunny's consumer work pool threads abort on exception.</p>
 </td>
     </tr>
+
+    <tr>
+      <td><tt>consumer_tag_prefix</tt></td>
+      <td>hutch</td>
+      <td>String</td>
+      <td><tt>HUTCH_CONSUMER_TAG_PREFIX</tt></td>
+      <td><p>Prefix displayed on the consumers tags.</p>
+</td>
+    </tr>
   
   </tbody>
 </table>
 
 
-## Supported RabbitMQ Versions
-
-Hutch requires RabbitMQ 3.3 or later.
-
 ---
 
 GoCardless ♥ open source. If you do too, come [join us](https://gocardless.com/jobs/backend_developer).

data/hutch.gemspec

@@ -3,18 +3,18 @@ require File.expand_path('../lib/hutch/version', __FILE__)
 Gem::Specification.new do |gem|
   if defined?(JRUBY_VERSION)
     gem.platform = 'java'
-    gem.add_runtime_dependency 'march_hare', '>= 2.16.0'
+    gem.add_runtime_dependency 'march_hare', '>= 2.22.0'
   else
     gem.platform = Gem::Platform::RUBY
-    gem.add_runtime_dependency 'bunny', '>= 2.6.0'
+    gem.add_runtime_dependency 'bunny', '>= 2.6.3'
   end
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.12'
-  gem.add_runtime_dependency 'activesupport'
+  gem.add_runtime_dependency 'activesupport', '>= 4.2', '< 6'
 
   gem.name = 'hutch'
   gem.summary = 'Easy inter-service communication using RabbitMQ.'
-  gem.description = 'Hutch is a Ruby library for enabling asynchronous ' +
+  gem.description = 'Hutch is a Ruby library for enabling asynchronous ' \
                     'inter-service communication using RabbitMQ.'
   gem.version = Hutch::VERSION.dup
   gem.required_ruby_version = '>= 2.0'

data/lib/hutch/config.rb

@@ -60,6 +60,9 @@ module Hutch
     # RabbitMQ password
     string_setting :mq_password, 'guest'
 
+    # RabbitMQ URI (takes precedence over MQ username, password, host, port and vhost settings)
+    string_setting :uri, nil
+
     # RabbitMQ HTTP API hostname
     string_setting :mq_api_host, '127.0.0.1'
 
@@ -130,6 +133,9 @@ module Hutch
     # The option is ignored on JRuby.
     boolean_setting :consumer_pool_abort_on_exception, false
 
+    # Prefix displayed on the consumers tags.
+    string_setting :consumer_tag_prefix, 'hutch'
+
     # Set of all setting keys
     ALL_KEYS = @boolean_keys + @number_keys + @string_keys
 
@@ -267,4 +273,4 @@ module Hutch
     end
   end
 end
-Hutch::Config.initialize
+Hutch::Config.initialize

data/lib/hutch/logging.rb

@@ -9,13 +9,12 @@ module Hutch
       end
     end
 
-    def self.setup_logger(target = $stdout)
+    def self.setup_logger
       require 'hutch/config'
-      Hutch::Config.initialize
-      @logger = Logger.new(target)
-      @logger.level = Hutch::Config.log_level
-      @logger.formatter = HutchFormatter.new
-      @logger
+      @logger = Logger.new($stdout).tap do |l|
+        l.level = Hutch::Config.log_level
+        l.formatter = HutchFormatter.new
+      end
     end
 
     def self.logger

data/lib/hutch/tracers/opbeat.rb

@@ -0,0 +1,37 @@
+require 'opbeat'
+
+module Hutch
+  module Tracers
+    # Tracer for Opbeat, which traces each message processed.
+    class Opbeat
+      KIND = 'messaging.hutch'.freeze
+
+      # @param klass [Consumer] Consumer instance (!)
+      def initialize(klass)
+        @klass = klass
+      end
+
+      # @param message [Message]
+      def handle(message)
+        ::Opbeat.transaction(sig, KIND, extra: extra_from(message)) do
+          @klass.process(message)
+        end.done(true)
+      end
+
+      private
+
+      def sig
+        @klass.class.name
+      end
+
+      def extra_from(message)
+        {
+          body: message.body.to_s,
+          message_id: message.message_id,
+          timestamp: message.timestamp,
+          routing_key: message.routing_key
+        }
+      end
+    end
+  end
+end

data/lib/hutch/tracers.rb

@@ -2,5 +2,6 @@ module Hutch
   module Tracers
     autoload :NullTracer, 'hutch/tracers/null_tracer'
     autoload :NewRelic,   'hutch/tracers/newrelic'
+    autoload :Opbeat,     'hutch/tracers/opbeat'
   end
 end

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.23.1'.freeze
+  VERSION = '0.24.0'.freeze
 end
 

data/lib/hutch/waiter.rb

@@ -1,10 +1,26 @@
 require 'hutch/logging'
 
 module Hutch
+  # Signal-handling class.
+  #
+  # Currently, the signal USR2 performs a thread dump,
+  # while QUIT, TERM and INT all perform a graceful shutdown.
   class Waiter
     include Logging
 
-    SHUTDOWN_SIGNALS = %w(QUIT TERM INT).keep_if { |s| Signal.list.keys.include? s }.freeze
+    class ContinueProcessingSignals < RuntimeError
+    end
+
+    def self.supported_signals_of(list)
+      list.keep_if { |s| Signal.list.keys.include?(s) }.tap do |result|
+        result.delete('QUIT') if defined?(JRUBY_VERSION)
+      end
+    end
+
+    SHUTDOWN_SIGNALS = supported_signals_of(%w(QUIT TERM INT)).freeze
+    # We have chosen a JRuby-supported signal
+    USER_SIGNALS = supported_signals_of(%w(USR2)).freeze
+    REGISTERED_SIGNALS = (SHUTDOWN_SIGNALS + USER_SIGNALS).freeze
 
     def self.wait_until_signaled
       new.wait_until_signaled
@@ -14,14 +30,57 @@ module Hutch
       self.sig_read, self.sig_write = IO.pipe
 
       register_signal_handlers
-      wait_for_signal
 
-      sig = sig_read.gets.strip.downcase
-      logger.info "caught sig#{sig}, stopping hutch..."
+      begin
+        wait_for_signal
+
+        sig = sig_read.gets.strip
+        handle_signal(sig)
+      rescue ContinueProcessingSignals
+        retry
+      end
+    end
+
+    def handle_signal(sig)
+      raise ContinueProcessingSignals unless REGISTERED_SIGNALS.include?(sig)
+      if user_signal?(sig)
+        handle_user_signal(sig)
+      else
+        handle_shutdown_signal(sig)
+      end
+    end
+
+    # @raises ContinueProcessingSignals
+    def handle_user_signal(sig)
+      case sig
+      when 'USR2' then log_thread_backtraces
+      else raise "Assertion failed - unhandled signal: #{sig.inspect}"
+      end
+      raise ContinueProcessingSignals
+    end
+
+    def handle_shutdown_signal(sig)
+      logger.info "caught SIG#{sig}, stopping hutch..."
     end
 
     private
 
+    def log_thread_backtraces
+      logger.info 'Requested a VM-wide thread stack trace dump...'
+      Thread.list.each do |thread|
+        logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
+        logger.info backtrace_for(thread)
+      end
+    end
+
+    def backtrace_for(thread)
+      if thread.backtrace
+        thread.backtrace.join("\n")
+      else
+        '<no backtrace available>'
+      end
+    end
+
     attr_accessor :sig_read, :sig_write
 
     def wait_for_signal
@@ -29,7 +88,7 @@ module Hutch
     end
 
     def register_signal_handlers
-      SHUTDOWN_SIGNALS.each do |sig|
+      REGISTERED_SIGNALS.each do |sig|
         # This needs to be reentrant, so we queue up signals to be handled
         # in the run loop, rather than acting on signals here
         trap(sig) do
@@ -37,5 +96,9 @@ module Hutch
         end
       end
     end
+
+    def user_signal?(sig)
+      USER_SIGNALS.include?(sig)
+    end
   end
 end

data/lib/hutch/worker.rb

@@ -4,6 +4,7 @@ require 'hutch/broker'
 require 'hutch/acknowledgements/nack_on_all_failures'
 require 'hutch/waiter'
 require 'carrot-top'
+require 'securerandom'
 
 module Hutch
   class Worker
@@ -44,7 +45,7 @@ module Hutch
       queue = @broker.queue(consumer.get_queue_name, consumer.get_arguments)
       @broker.bind_queue(queue, consumer.routing_keys)
 
-      queue.subscribe(manual_ack: true) do |*args|
+      queue.subscribe(consumer_tag: unique_consumer_tag, manual_ack: true) do |*args|
         delivery_info, properties, payload = Hutch::Adapter.decode_message(*args)
         handle_message(consumer, delivery_info, properties, payload)
       end
@@ -103,5 +104,13 @@ module Hutch
     private
 
     attr_accessor :setup_procs
+
+    def unique_consumer_tag
+      prefix = Hutch::Config[:consumer_tag_prefix]
+      unique_part = SecureRandom.uuid
+      "#{prefix}-#{unique_part}".tap do |tag|
+        raise "Tag must be 255 bytes long at most, current one is #{tag.bytesize} ('#{tag}')" if tag.bytesize > 255
+      end
+    end
   end
 end

data/spec/hutch/waiter_spec.rb

@@ -12,25 +12,39 @@ RSpec.describe Hutch::Waiter do
       end
     end
 
-    described_class::SHUTDOWN_SIGNALS.each do |signal|
-      # JRuby does not support QUIT:
-      # The signal QUIT is in use by the JVM and will not work correctly on this platform
-      next if signal == 'QUIT' && defined?(JRUBY_VERSION)
-
-      context "a #{signal} signal is received" do
-        it "logs that hutch is stopping" do
-          expect(Hutch::Logging.logger).to receive(:info)
-            .with("caught sig#{signal.downcase}, stopping hutch...")
-
-          start_kill_thread(signal)
-          described_class.wait_until_signaled
-        end
+    context 'a QUIT signal is received', if: RSpec::Support::Ruby.mri? do
+      it 'logs that hutch is stopping' do
+        expect(Hutch::Logging.logger).to receive(:info)
+          .with('caught SIGQUIT, stopping hutch...')
+
+        start_kill_thread('QUIT')
+        described_class.wait_until_signaled
+      end
+    end
+
+    context 'a TERM signal is received' do
+      it 'logs that hutch is stopping' do
+        expect(Hutch::Logging.logger).to receive(:info)
+          .with('caught SIGTERM, stopping hutch...')
+
+        start_kill_thread('TERM')
+        described_class.wait_until_signaled
+      end
+    end
+
+    context 'a INT signal is received' do
+      it 'logs that hutch is stopping' do
+        expect(Hutch::Logging.logger).to receive(:info)
+          .with('caught SIGINT, stopping hutch...')
+
+        start_kill_thread('INT')
+        described_class.wait_until_signaled
       end
     end
   end
 
   describe described_class::SHUTDOWN_SIGNALS do
-    it "includes only things in Signal.list.keys" do
+    it 'includes only things in Signal.list.keys' do
       expect(described_class).to eq(described_class & Signal.list.keys)
     end
   end

data/spec/hutch/worker_spec.rb

@@ -45,9 +45,27 @@ describe Hutch::Worker do
     end
 
     it 'sets up a subscription' do
-      expect(queue).to receive(:subscribe).with(manual_ack: true)
+      expect(queue).to receive(:subscribe).with(consumer_tag: %r(^hutch\-.{36}$), manual_ack: true)
       worker.setup_queue(consumer)
     end
+
+    context 'with a configured consumer tag prefix' do
+      before { Hutch::Config.set(:consumer_tag_prefix, 'appname') }
+
+      it 'sets up a subscription with the configured tag prefix' do
+        expect(queue).to receive(:subscribe).with(consumer_tag: %r(^appname\-.{36}$), manual_ack: true)
+        worker.setup_queue(consumer)
+      end
+    end
+
+    context 'with a configured consumer tag prefix that is too long' do
+      let(:maximum_size) { 255 - SecureRandom.uuid.size - 1 }
+      before { Hutch::Config.set(:consumer_tag_prefix, 'a'.*(maximum_size + 1)) }
+
+      it 'raises an error' do
+        expect { worker.setup_queue(consumer) }.to raise_error(/Tag must be 255 bytes long at most/)
+      end
+    end
   end
 
   describe '#handle_message' do

data/spec/tracers/opbeat_spec.rb

@@ -0,0 +1,44 @@
+require 'hutch/message'
+require 'hutch/serializers/identity'
+require 'hutch/tracers'
+
+RSpec.describe Hutch::Tracers::Opbeat do
+  let(:consumer) { double('the-consumer') }
+
+  subject(:tracer) { described_class.new(consumer) }
+
+  let(:message) do
+    Hutch::Message.new(double('the-delivery-info', routing_key: 'foo.bar',
+                                                   exchange: 'foo'),
+                       double('the-properties', message_id: 'the-id',
+                                                timestamp: 'the-time'),
+                       double('the-payload', to_s: 'the-body'),
+                       Hutch::Serializers::Identity)
+  end
+
+  it 'formats messages as extra information' do
+    expected_extra = {
+      body: 'the-body',
+      message_id: 'the-id',
+      timestamp: 'the-time',
+      routing_key: 'foo.bar'
+    }
+    expect(Opbeat).to receive(:transaction).with(anything,
+                                           'messaging.hutch',
+                                           extra: expected_extra) {
+                                             double('done-callback', done: true)
+                                           }
+
+    tracer.handle(message)
+  end
+
+  it 'presents consumer class name as Opbeat tracing signature' do
+    expect(Opbeat).to receive(:transaction).with(consumer.class.name,
+                                           'messaging.hutch',
+                                           anything) {
+                                             double('done-callback', done: true)
+                                           }
+
+    tracer.handle(message)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Hutch is a Ruby library for enabling asynchronous inter-service communication
   using RabbitMQ.
 email:
@@ -88,8 +94,6 @@ files:
 - bin/hutch
 - examples/consumer.rb
 - examples/producer.rb
-- gemfiles/Gemfile.activesupport4
-- gemfiles/Gemfile.activesupport5
 - hutch.gemspec
 - lib/hutch.rb
 - lib/hutch/acknowledgements/base.rb
@@ -116,6 +120,7 @@ files:
 - lib/hutch/tracers.rb
 - lib/hutch/tracers/newrelic.rb
 - lib/hutch/tracers/null_tracer.rb
+- lib/hutch/tracers/opbeat.rb
 - lib/hutch/version.rb
 - lib/hutch/waiter.rb
 - lib/hutch/worker.rb
@@ -137,6 +142,7 @@ files:
 - spec/hutch/worker_spec.rb
 - spec/hutch_spec.rb
 - spec/spec_helper.rb
+- spec/tracers/opbeat_spec.rb
 - templates/default/class/html/settings.erb
 - templates/default/class/setup.rb
 - templates/default/fulldoc/html/css/hutch.css
@@ -166,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy inter-service communication using RabbitMQ.
@@ -187,3 +193,4 @@ test_files:
 - spec/hutch/worker_spec.rb
 - spec/hutch_spec.rb
 - spec/spec_helper.rb
+- spec/tracers/opbeat_spec.rb

data/gemfiles/Gemfile.activesupport4

@@ -1,2 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'activesupport', '~> 4.0'

data/gemfiles/Gemfile.activesupport5

@@ -1,2 +0,0 @@
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-gem 'activesupport', '>= 4.0'