Fix the instrumentation path for failed retriable exceptions

.travis.yml

@@ -13,7 +13,6 @@ before_install:
 - printf "[default]\nregion=us-east-1\noutput=json\n" > /home/travis/.aws/config
 - printf "[default]\naws_access_key_id = FAKE0000000000000000\naws_secret_access_key = FAKE000000000000000000000000000000000000\n" > /home/travis/.aws/credentials
 env:
-  ASYNC_TEST_TIMEOUT: 15
   DYNAMODB_ENDPOINT: http://localhost:7777
 install:
  - pip install -r requires/testing.txt

sprockets_dynamodb/client.py

@@ -1273,7 +1273,9 @@ def execute(self, action, parameters):
                     exceptions.ThrottlingException,
                     exceptions.ThroughputExceeded) as error:
                 if attempt == self._max_retries:
-                    raise error
+                    if self._instrumentation_callback:
+                        self._instrumentation_callback(measurements)
+                    self._on_exception(error)
                 duration = self._sleep_duration(attempt)
                 self.logger.warning('%r on attempt %i, sleeping %.2f seconds',
                                     error, attempt, duration)
@@ -1295,6 +1297,7 @@ def set_error_callback(self, callback):
         :param method callback: The method to invoke
 
         """
+        LOGGER.debug('Setting error callback: %r', callback)
         self._on_error = callback
 
     def set_instrumentation_callback(self, callback):
@@ -1304,6 +1307,7 @@ def set_instrumentation_callback(self, callback):
         :param method callback: The method to invoke
 
         """
+        LOGGER.debug('Setting instrumentation callback: %r', callback)
         self._instrumentation_callback = callback
 
     def _execute(self, action, parameters, attempt, measurements):

tests/api_tests.py

@@ -160,7 +160,7 @@ def instrumentation_check(measurements):
                 self.assertEqual(measurement.attempt, attempt + 1)
                 self.assertEqual(measurement.action, 'CreateTable')
                 self.assertEqual(measurement.table, definition['TableName'])
-                self.assertEqual(measurement.error, None)
+                self.assertEqual(measurement.error, 'RequestException')
             self.assertEqual(len(measurements), 3)
             wait_for_measurements.set()