Release 1 3 0 (#274)

* Update readme to include instruction for offline mode

* Update PIC to latest. PIC changes includes adding a utility for exponential backoff retries. (#241)

Update PIC to latest. PIC changes includes adding a utility for exponential backoff retries.
PIC changes - awslabs/amazon-kinesis-video-streams-pic@e4b4666

* updated cmake verison from 2.8 to 3.6.3 (#240)

Co-authored-by: Hassan Sahibzada <[email protected]>

* Update README and travis.yml to acknowledge develop (#236)

* Update README and travis.yml to acknowledge develop

* Mentions of the develop branch in the README are now a codeblock

Co-authored-by: Hassan Sahibzada <[email protected]>

* Sample support for KVS events

* Update PIC git_tag, move event fragment generation to first frame

* Update git_tag to top of develop

* Replace generic STATUS_IOT_FAILED status with more detailed status codes and logging

* Fix unit tests and retriable errors section

* Update producer tests to use PIC state machine retry logic

* remove debug log

* update pic hash

* Update readme to specify using cmake flags with clang and not gcc (#265)

* Update PIC commit

* Updating PIC hash

* update git has to include new service call results for auto clock skew correction (#266)

* Including log fix from PIC

* Pull in retry count (#268)

* Update PIC to current master (release 1.3.0 PIC)

* Update put counts

* specify osx image directly instead of relying on default

* export CPATH for newer mac OS to resolve build issues

* suppress warnings

* use catalina -- tested locally, until we can work out big sur issues in travis

* test with debug logging failed tests only since we cannot repro locally

* Adding debug logs around postReadCallback()

* sleep more accurately taking into account time taken within other API calls

* increse test execution time to make sure we can receive an ack

* increase exec time in other tests as well

* lower log level and extra log statements and reinstate all tests running for mac os

Co-authored-by: Divya Sampath Kumar <[email protected]>
Co-authored-by: Anurag Katey <[email protected]>
Co-authored-by: Niyati Maheshwari <[email protected]>
Co-authored-by: Hassan Sahibzada <[email protected]>
Co-authored-by: Anurag Katey <[email protected]>

Author: 5 people

Diff for: .travis.yml

@@ -46,7 +46,9 @@ matrix:
     # MacOS Builds
     - name: "OSX GCC"
       os: osx
+      osx_image: xcode12
       compiler: gcc
+      env: CPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
       before_script:
         - mkdir build && cd build && cmake .. -DBUILD_TEST=TRUE
       script:
@@ -56,7 +58,9 @@ matrix:
 
     - name: "OSX Clang"
       os: osx
+      osx_image: xcode12
       compiler: clang
+      env: CPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
       before_script:
         - mkdir build && cd build && cmake .. -DBUILD_TEST=TRUE -DCOMPILER_WARNINGS=TRUE
       script:

Diff for: CMake/Dependencies/libcurl-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libcurl-download NONE)
 

Diff for: CMake/Dependencies/libgtest-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libgtest-download NONE)
 

Diff for: CMake/Dependencies/libjsmn-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libjsmn-download NONE)
 

Diff for: CMake/Dependencies/libjsmn-add-cmakelists.patch

@@ -4,7 +4,7 @@ index 0000000..f4a1d44
 --- /dev/null
 +++ b/CMakeLists.txt
 @@ -0,0 +1,11 @@
-+cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.6.3)
 +project(jsmn C)
 +
 +

Diff for: CMake/Dependencies/libkvspic-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libkvspic-download NONE)
 
@@ -7,7 +7,7 @@ include(ExternalProject)
 # clone repo only
 ExternalProject_Add(libkvspic-download
 	GIT_REPOSITORY    https://github.com/awslabs/amazon-kinesis-video-streams-pic.git
-	GIT_TAG           e189514da70c02f430c8069aec9ea11943b74d8c
+	GIT_TAG           04fdbdffa929f7390b946493ce8a995fb09c0ceb
    	SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/kvspic-src"
 	BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/kvspic-build"
 	CMAKE_ARGS

Diff for: CMake/Dependencies/libmbedtls-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libmbedtls-download NONE)
 

Diff for: CMake/Dependencies/libopenssl-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libopenssl-download NONE)
 
@@ -12,9 +12,9 @@ else()
   endif()
 
   if (DEFINED BUILD_OPENSSL_PLATFORM AND NOT BUILD_OPENSSL_PLATFORM STREQUAL OFF)
-    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM})
+    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM} -Wno-nullability-completeness -Wno-expansion-to-defined)
   else()
-    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX})
+    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} -Wno-nullability-completeness -Wno-expansion-to-defined)
   endif()
 endif()
 

Diff for: CMake/Dependencies/libwebsockets-CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(libwebsocket-download NONE)
 

Diff for: CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
 include(Utilities)
 project(KinesisVideoProducerC LANGUAGES C)

Diff for: README.md

@@ -58,6 +58,16 @@ You can pass the following options to `cmake ..`.
 * `-DUNDEFINED_BEHAVIOR_SANITIZER` Build with UndefinedBehaviorSanitizer
 * `-DALIGNED_MEMORY_MODEL` Build for aligned memory model only devices. Default is OFF.
 
+
+DMEMORY_SANITIZER, DTHREAD_SANITIZER etc. flags works only with clang compiler 
+and not with gcc compiler. For using clang (on Ubuntu), do the following - 
+```
+sudo apt-get install clang
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
+cmake .. -DMEMORY_SANITIZER=TRUE
+```
+
 ### Build
 To build the library run make in the build directory you executed CMake.
 
@@ -78,10 +88,12 @@ The last three arguments are optional. By default,
 * `audio-codec` is `aac`
 
 If you want to use the sample for `PCM_ALAW/G.711` frames, run 
-`./kvsAudioVideoStreamingSample <channel-name> <streaming_duration> <sample_location> alaw`
+`./kvsAudioVideoStreamingSample <channel-name> <streaming_duration> <sample_location> alaw 0`
 
 This will stream the video/audio files from the `samples/h264SampleFrames` and `samples/aacSampleFrames` or `samples/alawSampleFrames` (as per the choice of audio codec in the last argument) respectively. 
 
+If you want to enable KVS events in fragment metadata, change the 5th parameter from 0 -> 1. This feature is found only in the audio/video sample, but can be written into the video only sample as well.
+
 For video only, run `./kvsVideoOnlyStreamingSample <channel-name>`
 
 This will stream the video files from the `samples/h264SampleFrames`. 
@@ -97,9 +109,17 @@ export AWS_ACCESS_KEY_ID=<YourAWSAccessKey>
 Now you can execute the unit tests from the `build` directory as follows:
 `./tst/producer_test`
 
-## Development
+### Offline mode
+The samples run in near real time mode by default. In order to set up offline mode, the following APIs can be used in the samples instead of the realtime variant:
+
+For video only: `createOfflineVideoStreamInfoProviderWithCodecs()`
+For video and audio: `createOfflineAudioVideoStreamInfoProviderWithCodecs()`
+
+The 2 APIs are available in [this](https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/blob/412aab82c99a72f9dbde975f5fea81ffdc844ae5/src/include/com/amazonaws/kinesis/video/cproducer/Include.h) header file.
 
-The repository is using `develop` branch as the aggregation and all of the feature development is done in appropriate feature branches. The PRs (Pull Requests) are cut on a feature branch and once approved with all the checks passed they can be merged by a click of a button on the PR tool. The master branch should always be build-able and all the tests should be passing. We are welcoming any contribution to the code base. The master branch contains our most recent release cycle from develop.
+
+## Development
+The repository is using `develop` branch as the aggregation and all of the feature development is done in appropriate feature branches. The PRs (Pull Requests) are cut on a feature branch and once approved with all the checks passed they can be merged by a click of a button on the PR tool. The master branch should always be build-able and all the tests should be passing. We are welcoming any contribution to the code base. The master branch contains our most recent release cycle from `develop`.
 
 ### Release
 The repository is under active development and even with incremental unit test coverage where some of the tests are actually full integration tests, we require more rigorous internal testing in order to 'cut' release versions. The release is cut against a particular commit that gets approved. The general philosophy is to cut a release when a set of commits contribute to a self-containing feature or when we add major internal functionality improvements.

Diff for: samples/KvsAudioVideoStreamingSample.c

@@ -22,6 +22,8 @@
 #define FILE_LOGGING_BUFFER_SIZE (100 * 1024)
 #define MAX_NUMBER_OF_LOG_FILES  5
 
+UINT8 gEventsEnabled = 0;
+
 typedef struct {
     PBYTE buffer;
     UINT32 size;
@@ -69,6 +71,10 @@ PVOID putVideoFrameRoutine(PVOID args)
             startUpLatency = (DOUBLE)(GETTIME() - data->startTime) / (DOUBLE) HUNDREDS_OF_NANOS_IN_A_MILLISECOND;
             DLOGD("Start up latency: %lf ms", startUpLatency);
             data->firstFrame = FALSE;
+            if(gEventsEnabled) {
+                //generate an image and notification event at the start of the video stream.
+                putKinesisVideoEventMetadata(data->streamHandle, STREAM_EVENT_TYPE_NOTIFICATION | STREAM_EVENT_TYPE_IMAGE_GENERATION, NULL);
+            }
         }
 
         ATOMIC_STORE_BOOL(&data->firstVideoFramePut, TRUE);
@@ -182,7 +188,12 @@ INT32 main(INT32 argc, CHAR* argv[])
 
     STRNCPY(audioCodec, AUDIO_CODEC_NAME_AAC, STRLEN(AUDIO_CODEC_NAME_AAC)); //aac audio by default
 
-    if (argc == 5) {
+    if (argc == 6) {
+        if (STRCMP(argv[5], "1")){
+            gEventsEnabled = 1;
+        }
+    }
+    if (argc >= 5) {
         if (!STRCMP(argv[4], AUDIO_CODEC_NAME_ALAW)){
             STRNCPY(audioCodec, AUDIO_CODEC_NAME_ALAW, STRLEN(AUDIO_CODEC_NAME_ALAW));
         } 

Diff for: src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project(KinesisVideoProducerC LANGUAGES C)
 

Diff for: src/include/com/amazonaws/kinesis/video/common/Include.h

@@ -50,14 +50,19 @@ extern "C" {
 #define STATUS_FILE_CREDENTIAL_PROVIDER_OPEN_FILE_FAILED    STATUS_COMMON_PRODUCER_BASE + 0x00000022
 #define STATUS_FILE_CREDENTIAL_PROVIDER_INVALID_FILE_LENGTH STATUS_COMMON_PRODUCER_BASE + 0x00000023
 #define STATUS_FILE_CREDENTIAL_PROVIDER_INVALID_FILE_FORMAT STATUS_COMMON_PRODUCER_BASE + 0x00000024
+#define STATUS_CURL_PERFORM_FAILED                          STATUS_COMMON_PRODUCER_BASE + 0x00000025
+#define STATUS_IOT_INVALID_RESPONSE_LENGTH                  STATUS_COMMON_PRODUCER_BASE + 0x00000026
+#define STATUS_IOT_NULL_AWS_CREDS                           STATUS_COMMON_PRODUCER_BASE + 0x00000027
+#define STATUS_IOT_INVALID_URI_LEN                          STATUS_COMMON_PRODUCER_BASE + 0x00000028
 /*!@} */
 
 /**
  * Macro for checking whether the status code should be retried by the continuous retry logic
  */
 #define IS_RETRIABLE_COMMON_LIB_ERROR(error)                                                                                                         \
     ((error) == STATUS_INVALID_API_CALL_RETURN_JSON || (error) == STATUS_CURL_INIT_FAILED || (error) == STATUS_CURL_LIBRARY_INIT_FAILED ||           \
-     (error) == STATUS_HMAC_GENERATION_ERROR || (error) == STATUS_IOT_FAILED || (error) == STATUS_IOT_EXPIRATION_OCCURS_IN_PAST ||                   \
+     (error) == STATUS_HMAC_GENERATION_ERROR || (error) == STATUS_CURL_PERFORM_FAILED || (error) == STATUS_IOT_INVALID_RESPONSE_LENGTH ||            \
+     (error) == STATUS_IOT_NULL_AWS_CREDS || (error) == STATUS_IOT_INVALID_URI_LEN || (error) == STATUS_IOT_EXPIRATION_OCCURS_IN_PAST ||                   \
      (error) == STATUS_IOT_EXPIRATION_PARSING_FAILED || (error) == STATUS_IOT_CREATE_LWS_CONTEXT_FAILED ||                                           \
      (error) == STATUS_FILE_CREDENTIAL_PROVIDER_OPEN_FILE_FAILED || (error) == STATUS_FILE_CREDENTIAL_PROVIDER_INVALID_FILE_LENGTH ||                \
      (error) == STATUS_FILE_CREDENTIAL_PROVIDER_INVALID_FILE_FORMAT)

Diff for: src/source/Common/Curl/CurlCall.c

@@ -76,12 +76,11 @@ STATUS blockingCurlCall(PRequestInfo pRequestInfo, PCallInfo pCallInfo)
 
     if (res != CURLE_OK) {
         curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url);
-        DLOGE("Curl perform failed for url %s with result %s : %s ", url, curl_easy_strerror(res), errorBuffer);
-        CHK(FALSE, STATUS_IOT_FAILED);
+        CHK_ERR(FALSE, STATUS_CURL_PERFORM_FAILED, "Curl perform failed for url %s with result %s : %s ", url, curl_easy_strerror(res), errorBuffer);
     }
 
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpStatusCode);
-    CHK_ERR(httpStatusCode == HTTP_STATUS_CODE_OK, STATUS_IOT_FAILED, "Curl call response failed with http status %lu", httpStatusCode);
+    CHK_ERR(httpStatusCode == HTTP_STATUS_CODE_OK, STATUS_CURL_PERFORM_FAILED, "Curl call response failed with http status %lu", httpStatusCode);
 
 CleanUp:
 

Diff for: src/source/Common/IotCredentialProvider.c

@@ -130,8 +130,8 @@ STATUS parseIotResponse(PIotCredentialProvider pIotCredentialProvider, PCallInfo
     CHK(pIotCredentialProvider != NULL && pCallInfo != NULL, STATUS_NULL_ARG);
 
     resultLen = pCallInfo->responseDataLen;
+    CHK_ERR(resultLen > 0, STATUS_IOT_INVALID_RESPONSE_LENGTH, "IoT response has a length of 0");
     pResponseStr = pCallInfo->responseData;
-    CHK(resultLen > 0, STATUS_IOT_FAILED);
 
     jsmn_init(&parser);
     tokenCount = jsmn_parse(&parser, pResponseStr, resultLen, tokens, SIZEOF(tokens) / SIZEOF(jsmntok_t));
@@ -165,7 +165,7 @@ STATUS parseIotResponse(PIotCredentialProvider pIotCredentialProvider, PCallInfo
         }
     }
 
-    CHK(accessKeyId != NULL && secretKey != NULL && sessionToken != NULL, STATUS_IOT_FAILED);
+    CHK(accessKeyId != NULL && secretKey != NULL && sessionToken != NULL, STATUS_IOT_NULL_AWS_CREDS);
 
     currentTime = pIotCredentialProvider->getCurrentTimeFn(pIotCredentialProvider->customData);
     CHK_STATUS(convertTimestampToEpoch(expirationTimestampStr, currentTime / HUNDREDS_OF_NANOS_IN_A_SECOND, &expiration));
@@ -211,7 +211,7 @@ STATUS iotCurlHandler(PIotCredentialProvider pIotCredentialProvider)
 
     formatLen = SNPRINTF(serviceUrl, MAX_URI_CHAR_LEN, "%s%s%s%c%s%s", CONTROL_PLANE_URI_PREFIX, pIotCredentialProvider->iotGetCredentialEndpoint,
                          ROLE_ALIASES_PATH, '/', pIotCredentialProvider->roleAlias, CREDENTIAL_SERVICE);
-    CHK(formatLen > 0 && formatLen < MAX_URI_CHAR_LEN, STATUS_IOT_FAILED);
+    CHK(formatLen > 0 && formatLen < MAX_URI_CHAR_LEN, STATUS_IOT_INVALID_URI_LEN);
 
     // Form a new request info based on the params
     CHK_STATUS(createRequestInfo(serviceUrl, NULL, DEFAULT_AWS_REGION, pIotCredentialProvider->caCertPath, pIotCredentialProvider->certPath,

Diff for: tst/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6.3)
 
 project (producerTest)
 

Diff for: tst/CallbacksProviderPublicApiTest.cpp

@@ -81,7 +81,7 @@ TEST_F(CallbacksProviderPublicApiTest, createDefaultCallbacksProviderWithIotCert
             NULL,
             &pClientCallbacks));
 
-    EXPECT_EQ(STATUS_IOT_FAILED, createDefaultCallbacksProviderWithIotCertificate(
+    EXPECT_EQ(STATUS_CURL_PERFORM_FAILED, createDefaultCallbacksProviderWithIotCertificate(
             TEST_IOT_ENDPOINT,
             TEST_IOT_CERT_PATH,
             TEST_IOT_ROLE_ALIAS,
@@ -153,7 +153,7 @@ TEST_F(CallbacksProviderPublicApiTest, createDefaultCallbacksProviderWithIotCert
             NULL,
             &pClientCallbacks));
 
-    EXPECT_EQ(STATUS_IOT_FAILED, createDefaultCallbacksProviderWithIotCertificate(
+    EXPECT_EQ(STATUS_CURL_PERFORM_FAILED, createDefaultCallbacksProviderWithIotCertificate(
             TEST_IOT_ENDPOINT,
             TEST_IOT_CERT_PATH,
             TEST_IOT_CERT_PRIVATE_KEY_PATH,

Diff for: tst/ProducerClientBasicTest.cpp

@@ -347,6 +347,7 @@ PVOID ProducerClientTestBase::basicProducerRoutine(STREAM_HANDLE streamHandle, S
 
     UINT32 index = 0, persistentMetadataIndex = 0;
     UINT64 timestamp = GETTIME();
+    UINT64 diffTime;
     Frame frame;
     std::string persistentMetadataName;
     TID tid = GETTID();
@@ -449,7 +450,10 @@ EXPECT_TRUE(kinesis_video_stream->putFrame(eofr));
 
         // Sleep a while for non-offline modes
         if (streamingType != STREAMING_TYPE_OFFLINE) {
-            THREAD_SLEEP(TEST_FRAME_DURATION);
+            diffTime = GETTIME()-timestamp;
+            if (diffTime < TEST_FRAME_DURATION) {
+                THREAD_SLEEP(TEST_FRAME_DURATION-diffTime);
+            }
         }
     }
 
@@ -516,7 +520,7 @@ TEST_F(ProducerClientBasicTest, create_produce_stream)
 #endif
 
     // Wait for some time to produce
-    THREAD_SLEEP(TEST_EXECUTION_DURATION);
+    THREAD_SLEEP(2*TEST_EXECUTION_DURATION);
 
     // Indicate the cancel for the threads
     mStopProducer = TRUE;
@@ -571,7 +575,7 @@ TEST_F(ProducerClientBasicTest, create_produce_stream_parallel)
     }
 
     // Wait for some time to produce
-    THREAD_SLEEP(TEST_EXECUTION_DURATION);
+    THREAD_SLEEP(2*TEST_EXECUTION_DURATION);
 
     // Indicate the cancel for the threads
     mStopProducer = TRUE;
@@ -617,7 +621,7 @@ TEST_F(ProducerClientBasicTest, create_produce_client_parallel)
     }
 
     // Wait for some time to produce
-    THREAD_SLEEP(TEST_EXECUTION_DURATION);
+    THREAD_SLEEP(2*TEST_EXECUTION_DURATION);
 
     // Indicate the cancel for the threads
     mStopProducer = TRUE;
@@ -675,13 +679,13 @@ TEST_F(ProducerClientBasicTest, cachingEndpointProvider_Returns_EndpointFromCach
     EXPECT_TRUE(mProducerStopped) << "Producer thread failed to stop cleanly";
 
     // Expect the number of calls
-    EXPECT_EQ((ITERATION_COUNT + 1) * TEST_STREAM_COUNT, mPutStreamFnCount);
-    EXPECT_EQ((ITERATION_COUNT + 1) * TEST_STREAM_COUNT, mGetStreamingEndpointFnCount);
+    EXPECT_EQ((ITERATION_COUNT + 2) * TEST_STREAM_COUNT, mPutStreamFnCount);
+    EXPECT_EQ((ITERATION_COUNT + 2) * TEST_STREAM_COUNT, mGetStreamingEndpointFnCount);
     EXPECT_EQ(0, mCurlCreateStreamCount);
     EXPECT_EQ(0, mCurlDescribeStreamCount);
     EXPECT_EQ(0, mCurlTagResourceCount);
     EXPECT_EQ(1 * TEST_STREAM_COUNT, mCurlGetDataEndpointCount);
-    EXPECT_EQ((ITERATION_COUNT + 1) * TEST_STREAM_COUNT, mCurlPutMediaCount);
+    EXPECT_EQ((ITERATION_COUNT + 2) * TEST_STREAM_COUNT, mCurlPutMediaCount);
 
     // We will block for some time due to an incorrect implementation of the awaiting code
     // NOTE: The proper implementation should use synchronization primitives to await for the

Diff for: tst/ProducerContinuousRetryTest.cpp

@@ -268,7 +268,7 @@ TEST_F(ProducerContinuousRetryTest, recover_on_retriable_common_lib_error) {
 
     // Inject a fault
     pAuth = (PRotatingStaticAuthCallbacks) mAuthCallbacks;
-    pAuth->retStatus = STATUS_IOT_FAILED;
+    pAuth->retStatus = STATUS_CURL_PERFORM_FAILED;
     pAuth->failCount = 0;
     pAuth->recoverCount = 3; // 1 for main token, 1 for the security token for the first session
     // and only then should fail for the last token.

Diff for: tst/ProducerTestFixture.cpp

@@ -278,6 +278,11 @@ ProducerClientTestBase::ProducerClientTestBase() :
     mDeviceInfo.clientInfo.loggerLogLevel = this->loggerLogLevel;
     mDeviceInfo.clientInfo.logMetric = TRUE;
 
+    mDeviceInfo.clientInfo.kvsRetryStrategyCallbacks.createRetryStrategyFn = createRetryStrategyFn;
+    mDeviceInfo.clientInfo.kvsRetryStrategyCallbacks.getCurrentRetryAttemptNumberFn = getCurrentRetryAttemptNumberFn;
+    mDeviceInfo.clientInfo.kvsRetryStrategyCallbacks.freeRetryStrategyFn = freeRetryStrategyFn;
+    mDeviceInfo.clientInfo.kvsRetryStrategyCallbacks.executeRetryStrategyFn = executeRetryStrategyFn;
+
     mDefaultRegion[0] = '\0';
     mStreamingRotationPeriod = TEST_STREAMING_TOKEN_DURATION;
 
@@ -837,6 +842,35 @@ VOID ProducerClientTestBase::printFrameInfo(PFrame pFrame)
           pFrame->presentationTs);
 }
 
+STATUS ProducerClientTestBase::createRetryStrategyFn(PKvsRetryStrategy pKvsRetryStrategy) {
+    STATUS retStatus = STATUS_SUCCESS;
+    PExponentialBackoffRetryStrategyState pExponentialBackoffRetryStrategyState = NULL;
+
+    CHK_STATUS(exponentialBackoffRetryStrategyCreate(pKvsRetryStrategy));
+    CHK(pKvsRetryStrategy->retryStrategyType == KVS_RETRY_STRATEGY_EXPONENTIAL_BACKOFF_WAIT, STATUS_INTERNAL_ERROR);
+
+    pExponentialBackoffRetryStrategyState = TO_EXPONENTIAL_BACKOFF_STATE(pKvsRetryStrategy->pRetryStrategy);
+
+    // Overwrite retry config to avoid slow long running tests
+    pExponentialBackoffRetryStrategyState->exponentialBackoffRetryStrategyConfig.retryFactorTime = HUNDREDS_OF_NANOS_IN_A_MILLISECOND * 5;
+    pExponentialBackoffRetryStrategyState->exponentialBackoffRetryStrategyConfig.maxRetryWaitTime = HUNDREDS_OF_NANOS_IN_A_MILLISECOND * 75;
+
+CleanUp:
+    return retStatus;
+}
+
+STATUS ProducerClientTestBase::getCurrentRetryAttemptNumberFn(PKvsRetryStrategy pKvsRetryStrategy, PUINT32 pRetryCount) {
+    return getExponentialBackoffRetryCount(pKvsRetryStrategy, pRetryCount);
+}
+
+STATUS ProducerClientTestBase::freeRetryStrategyFn(PKvsRetryStrategy pKvsRetryStrategy) {
+    return exponentialBackoffRetryStrategyFree(pKvsRetryStrategy);
+}
+
+STATUS ProducerClientTestBase::executeRetryStrategyFn(PKvsRetryStrategy pKvsRetryStrategy, PUINT64 retryWaitTime) {
+    return getExponentialBackoffRetryStrategyWaitTime(pKvsRetryStrategy, retryWaitTime);
+}
+
 }  // namespace video
 }  // namespace kinesis
 }  // namespace amazonaws