Guard against other Faraday exception response formats

lib/elastic_apm/spies/faraday.rb

@@ -109,8 +109,14 @@ def run_request(method, url, body, headers, &block)
                   yield req if block
                 end
               rescue Faraday::ClientError, Faraday::ServerError => e # Faraday::Response::RaiseError
-                status = e.response_status if e.respond_to?(:response_status)
-                status ||= e.response&.fetch(:status)
+                status =
+                  if e.respond_to?(:response_status)
+                    e.response_status
+                  elsif e.response && e.response.respond_to?(:status)
+                    e.response.status
+                  elsif e.response && e.response.respond_to?(:fetch)
+                    e.response[:status]
+                  end
                 http = span&.context&.http
                 if http && status
                   http.status_code = status.to_s

spec/elastic_apm/spies/faraday_spec.rb

@@ -198,7 +198,7 @@ module ElasticAPM
         end
       end
 
-      it 'should capture status_code' do
+      it 'captures status_code' do
         WebMock.stub_request(:get, 'http://example.com')
           .to_return(status: [404, 'Not Found'])
 
@@ -217,7 +217,7 @@ module ElasticAPM
         expect(http.status_code).to match('404')
       end
 
-      it 'should handle a nil response' do
+      it 'handles a nil response' do
         WebMock.stub_request(:get, 'http://example.com')
           .to_raise(Faraday::ClientError)
 
@@ -235,6 +235,77 @@ module ElasticAPM
         expect(http.status_code).to be nil
       end
 
+      it 'handles faraday response' do
+        class FaradayErrorWithResponseObject < Faraday::ClientError
+          def response
+            Faraday::Response.new(status: 500)
+          end
+          undef response_status
+        end
+        WebMock.stub_request(:get, 'http://example.com')
+          .to_raise(FaradayErrorWithResponseObject.new)
+
+        with_agent do
+          begin
+            ElasticAPM.with_transaction 'Faraday Middleware test' do
+              client.get('http://example.com')
+            end
+          rescue Faraday::ClientError
+          end
+        end
+        span, = @intercepted.spans
+
+        http = span.context.http
+        expect(http.status_code).to eq('500')
+      end
+
+      it 'handles faraday response hash' do
+        class FaradayErrorWithResponseHash < Faraday::ClientError
+          def response
+            { status: 500 }
+          end
+          undef response_status
+        end
+        WebMock.stub_request(:get, 'http://example.com')
+          .to_raise(FaradayErrorWithResponseHash.new)
+
+        with_agent do
+          begin
+            ElasticAPM.with_transaction 'Faraday Middleware test' do
+              client.get('http://example.com')
+            end
+          rescue Faraday::ClientError
+          end
+        end
+        span, = @intercepted.spans
+
+        http = span.context.http
+        expect(http.status_code).to eq('500')
+      end
+
+      it 'does not raise error when response is string' do
+        class FaradayErrorWithResponseString < Faraday::ClientError
+          def response
+            'whatever'
+          end
+          undef response_status
+        end
+        WebMock.stub_request(:get, 'http://example.com')
+          .to_raise(FaradayErrorWithResponseString.new)
+
+        with_agent do
+          begin
+            ElasticAPM.with_transaction 'Faraday Middleware test' do
+              client.get('http://example.com')
+            end
+          rescue Faraday::ClientError
+          end
+        end
+        span, = @intercepted.spans
+
+        http = span.context.http
+        expect(http.status_code).to be nil
+      end
     end
   end
 end