Merge pull request #2939 from newrelic/half-life

aws-sdk-lambda fix

lib/new_relic/agent/instrumentation/aws_sdk_lambda/instrumentation.rb

@@ -32,13 +32,8 @@ def with_tracing(action, *args)
       # creating any segments that may appear as redundant / confusing
       NewRelic::Agent.disable_all_tracing do
         response = NewRelic::Agent::Tracer.capture_segment_error(segment) { yield }
-        begin
-          process_response(response, segment)
-        rescue => e
-          NewRelic::Agent.logger.error("Error processing aws-sdk-lambda invocation response (action = #{action}): #{e}")
-        ensure
-          response
-        end
+        process_response(response, segment)
+        response
       end
     ensure
       segment&.finish
@@ -47,6 +42,8 @@ def with_tracing(action, *args)
     def process_response(response, segment)
       process_status_code(response, segment) if response.respond_to?(:status_code)
       process_function_error(response) if response.respond_to?(:function_error)
+    rescue => e
+      NewRelic::Agent.logger.error("Error processing aws-sdk-lambda invocation response: #{e}")
     end
 
     def process_status_code(response, segment)

test/multiverse/suites/aws_sdk_lambda/aws_sdk_lambda_instrumentation_test.rb

@@ -66,9 +66,10 @@ def test_client_call_raises_an_exception
 
   def test_errors_in_processing_the_invocation_response_are_logged_but_not_raised_to_the_user_app
     in_transaction do |txn|
-      client = Aws::Lambda::Client.new(region: REGION)
+      response = {status_code: 200}
+      client = Aws::Lambda::Client.new(region: REGION, stub_responses: {invoke: response})
       client.config.account_id = AWS_ACCOUNT_ID
-      def client.process_response(*_args); raise 'kaboom'; end
+      def client.process_status_code(*_args); raise 'kaboom'; end
 
       NewRelic::Agent.stub(:logger, NewRelic::Agent::MemoryLogger.new) do
         client.invoke(function_name: 'Invoke-Me-And-Only-The-Agent-Explodes')