Merge pull request #301 from rollbar/fix-delayed_job-handler_payload

Send correct hash value for delayed job 'handler' object.

lib/rollbar/delayed_job.rb

@@ -1,9 +1,28 @@
+require 'delayed_job'
+
 module Rollbar
  module Delayed
  class << self
  attr_accessor :wrapped
  end
 
+ class JobData
+ attr_reader :job
+
+ def initialize(job)
+ @job = job
+ end
+
+ def to_hash
+ job_data = job.as_json
+ # Here job_data['handler'] is a YAML object comming
+ # from the storage backend
+ job_data['handler'] = job.payload_object.as_json
+
+ job_data
+ end
+ end
+
  self.wrapped = false
 
  def self.wrap_worker
@@ -33,10 +52,15 @@ def self.invoke_job_callback
  def self.report(e, job)
  return unless job.attempts <= ::Rollbar.configuration.dj_threshold
 
- job_data = job.as_json
- data = ::Rollbar.configuration.report_dj_data ? job_data : nil
+ data = build_job_data(job)
 
  ::Rollbar.scope(:request => data).error(e, :use_exception_level_filters => true)
  end
+
+ def self.build_job_data(job)
+ return nil unless ::Rollbar.configuration.report_dj_data
+
+ JobData.new(job).to_hash
+ end
  end
 end

spec/rollbar/delayed_job/job_data.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+require 'rollbar/delayed_job'
+require 'delayed/backend/test'
+
+describe Rollbar::Delayed::JobData do
+ describe '#to_hash' do
+ let(:handler) { { 'foo' => 'bar' } }
+
+ let(:attrs) do
+ {
+ 'id' => 1,
+ 'priority' => 0,
+ 'attempts' => 1,
+ 'handler' => handler.to_yaml
+ }
+ end
+
+ let(:job) do
+ ::Delayed::Backend::Test::Job.new(attrs)
+ end
+
+ subject { described_class.new(job) }
+
+ it 'returns the correct job data' do
+ expected_result = attrs.dup
+ expected_result.delete('id')
+ expected_result['handler'] = handler
+
+ result = subject.to_hash
+
+ expect(result).to be_eql(expected_result)
+ end
+ end
+end

spec/rollbar/delayed_job_spec.rb

@@ -18,18 +18,42 @@ def do_job_please!(a, b)
  Delayed::Backend::Test::Job.delete_all
  end
 
- let(:logger) { Rollbar.logger }
  let(:expected_args) do
  [kind_of(NoMethodError), { :use_exception_level_filters => true }]
  end
 
  context 'with delayed method without arguments failing' do
  it 'sends the exception' do
- expect_any_instance_of(::Delayed::Job).to receive(:as_json).and_call_original
  expect(Rollbar).to receive(:scope).with(kind_of(Hash)).and_call_original
  expect_any_instance_of(Rollbar::Notifier).to receive(:error).with(*expected_args)
 
  FailingJob.new.delay.do_job_please!(:foo, :bar)
  end
  end
+
+
+ describe '.build_job_data' do
+ let(:job) { double(:payload_object => {}) }
+
+ context 'if report_dj_data is disabled' do
+ before do
+ allow(Rollbar.configuration).to receive(:report_dj_data).and_return(false)
+ end
+
+ it 'returns nil' do
+ expect(described_class.build_job_data(job)).to be_nil
+ end
+ end
+
+ context 'with report_dj_data enabled' do
+ before do
+ allow(Rollbar.configuration).to receive(:report_dj_data).and_return(true)
+ end
+
+ it 'returns a hash' do
+ result = described_class.build_job_data(job)
+ expect(result).to be_kind_of(Hash)
+ end
+ end
+ end
 end