Merge pull request #1222 from DataDog/fix_resque

hotfix: fix if statement
DataDog · Oct 28, 2020 · c0560d2 · c0560d2
2 parents 984262c + 589c8bc
commit c0560d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ddtrace/tracer.rb b/lib/ddtrace/tracer.rb
@@ -289,7 +289,7 @@ def trace(name, options = {})
         # SignalException::Interrupt would still bubble up.
         # rubocop:disable Metrics/BlockNesting
         rescue Exception => e
-          if (on_error_handler = options[:on_error] && on_error_handler.respond_to?(:call))
+          if (on_error_handler = options[:on_error]) && on_error_handler.respond_to?(:call)
             begin
               on_error_handler.call(span, e)
             rescue

diff --git a/spec/ddtrace/tracer_spec.rb b/spec/ddtrace/tracer_spec.rb
@@ -214,7 +214,7 @@
               end.to raise_error(error)
 
               expect(spans).to have(1).item
-              expect(spans[0]).to have_error
+              expect(spans[0]).to_not have_error
             end
           end