Merge pull request #742 from Redapted/master

Use original return values for rake methods
DataDog · Apr 29, 2019 · effb03b · effb03b
2 parents 1380263 + 06d2186
commit effb03b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/ddtrace/contrib/rake/instrumentation.rb b/lib/ddtrace/contrib/rake/instrumentation.rb
@@ -16,8 +16,7 @@ def invoke(*args)
             return super unless enabled?
 
             tracer.trace(Ext::SPAN_INVOKE, span_options) do |span|
-              super
-              annotate_invoke!(span, args)
+              super.tap { annotate_invoke!(span, args) }
             end
           ensure
             shutdown_tracer!
@@ -27,8 +26,7 @@ def execute(args = nil)
             return super unless enabled?
 
             tracer.trace(Ext::SPAN_EXECUTE, span_options) do |span|
-              super
-              annotate_execute!(span, args)
+              super.tap { annotate_execute!(span, args) }
             end
           ensure
             shutdown_tracer!

diff --git a/spec/ddtrace/contrib/rake/instrumentation_spec.rb b/spec/ddtrace/contrib/rake/instrumentation_spec.rb
@@ -131,6 +131,11 @@ def reset_task!(task_name)
 
       before(:each) { define_task! }
 
+      it 'returns task return value' do
+        allow(spy).to receive(:call)
+        expect(task.invoke(*args)).to contain_exactly(task_body)
+      end
+
       context 'without args' do
         it_behaves_like 'a single task execution' do
           describe '\'rake.invoke\' span tags' do