Add retry metric in producer C

Author: disa6302

canary/producer-c/CMake/Dependencies/libkvsProducerC-CMakeLists.txt

@@ -6,7 +6,7 @@ include(ExternalProject)
 
 ExternalProject_Add(libkvsProducerC-download
     GIT_REPOSITORY    https://github.com/awslabs/amazon-kinesis-video-streams-producer-c.git
-    GIT_TAG           3a5faed415bee295feed3371860cd19b6b34a4a1
+    GIT_TAG           18ab7ffc0e8f078f586d4e249dc6907b0366b8eb
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX} -DBUILD_COMMON_LWS=ON -DBUILD_COMMON_CURL=ON -DBUILD_DEPENDENCIES=TRUE -DOPEN_SRC_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
     BUILD_ALWAYS      TRUE

canary/producer-c/canary/CanaryStreamUtils.cpp

@@ -336,7 +336,7 @@ STATUS computeStreamMetricsFromCanary(STREAM_HANDLE streamHandle, PCanaryStreamC
     STATUS retStatus = STATUS_SUCCESS;
     StreamMetrics canaryStreamMetrics;
     canaryStreamMetrics.version = STREAM_METRICS_CURRENT_VERSION;
-    Aws::CloudWatch::Model::MetricDatum streamDatum, aggStreamDatum, currentViewDatum, aggCurrentViewDatum;
+    Aws::CloudWatch::Model::MetricDatum streamDatum, currentViewDatum, streamApiCallRetryCountDatum;
     CHK_STATUS(getKinesisVideoStreamMetrics(streamHandle, &canaryStreamMetrics));
 
     streamDatum.SetMetricName("FrameRate");
@@ -348,8 +348,13 @@ STATUS computeStreamMetricsFromCanary(STREAM_HANDLE streamHandle, PCanaryStreamC
     pushMetric(pCanaryStreamCallbacks, currentViewDatum, Aws::CloudWatch::Model::StandardUnit::Milliseconds,
                canaryStreamMetrics.currentViewDuration / HUNDREDS_OF_NANOS_IN_A_MILLISECOND);
 
+    streamApiCallRetryCountDatum.SetMetricName("StreamRetryCount");
+    streamApiCallRetryCountDatum.AddDimensions(pCanaryStreamCallbacks->dimensionPerStream);
+    pushMetric(pCanaryStreamCallbacks, streamApiCallRetryCountDatum, Aws::CloudWatch::Model::StandardUnit::Count,
+               canaryStreamMetrics.streamApiCallRetryCount);
+
     if (pCanaryStreamCallbacks->aggregateMetrics) {
-        Aws::CloudWatch::Model::MetricDatum aggStreamDatum, aggCurrentViewDatum;
+        Aws::CloudWatch::Model::MetricDatum aggStreamDatum, aggCurrentViewDatum, aggStreamApiCallRetryCountDatum;
         aggStreamDatum.SetMetricName("FrameRate");
         aggStreamDatum.AddDimensions(pCanaryStreamCallbacks->aggregatedDimension);
         pushMetric(pCanaryStreamCallbacks, aggStreamDatum, Aws::CloudWatch::Model::StandardUnit::Count_Second, canaryStreamMetrics.currentFrameRate);
@@ -359,6 +364,11 @@ STATUS computeStreamMetricsFromCanary(STREAM_HANDLE streamHandle, PCanaryStreamC
         pushMetric(pCanaryStreamCallbacks, aggCurrentViewDatum, Aws::CloudWatch::Model::StandardUnit::Milliseconds,
                    canaryStreamMetrics.currentViewDuration / HUNDREDS_OF_NANOS_IN_A_MILLISECOND);
 
+        aggStreamApiCallRetryCountDatum.SetMetricName("StreamRetryCount");
+        aggStreamApiCallRetryCountDatum.AddDimensions(pCanaryStreamCallbacks->aggregatedDimension);
+        pushMetric(pCanaryStreamCallbacks, aggStreamApiCallRetryCountDatum, Aws::CloudWatch::Model::StandardUnit::Count,
+                   canaryStreamMetrics.streamApiCallRetryCount);
+
     }
 CleanUp:
     return retStatus;
@@ -369,20 +379,30 @@ STATUS computeClientMetricsFromCanary(CLIENT_HANDLE clientHandle, PCanaryStreamC
     STATUS retStatus = STATUS_SUCCESS;
     ClientMetrics canaryClientMetrics;
     canaryClientMetrics.version = CLIENT_METRICS_CURRENT_VERSION;
-    Aws::CloudWatch::Model::MetricDatum clientDatum, aggClientDatum;
+    Aws::CloudWatch::Model::MetricDatum storageSizeDatum, avgApiRetryCountDatum;
     CHK_STATUS(getKinesisVideoMetrics(clientHandle, &canaryClientMetrics));
 
-    clientDatum.SetMetricName("StorageSizeAvailable");
-    clientDatum.AddDimensions(pCanaryStreamCallbacks->dimensionPerStream);
-    pushMetric(pCanaryStreamCallbacks, clientDatum, Aws::CloudWatch::Model::StandardUnit::Kilobytes,
+    storageSizeDatum.SetMetricName("StorageSizeAvailable");
+    storageSizeDatum.AddDimensions(pCanaryStreamCallbacks->dimensionPerStream);
+    pushMetric(pCanaryStreamCallbacks, storageSizeDatum, Aws::CloudWatch::Model::StandardUnit::Kilobytes,
                canaryClientMetrics.contentStoreAvailableSize / 1024);
 
+    avgApiRetryCountDatum.SetMetricName("AvgClientApiCallRetryCount");
+    avgApiRetryCountDatum.AddDimensions(pCanaryStreamCallbacks->dimensionPerStream);
+    pushMetric(pCanaryStreamCallbacks, avgApiRetryCountDatum, Aws::CloudWatch::Model::StandardUnit::Count,
+               canaryClientMetrics.clientAvgApiCallRetryCount);
+
     if (pCanaryStreamCallbacks->aggregateMetrics) {
-        Aws::CloudWatch::Model::MetricDatum aggClientDatum;
-        aggClientDatum.SetMetricName("StorageSizeAvailable");
-        aggClientDatum.AddDimensions(pCanaryStreamCallbacks->aggregatedDimension);
-        pushMetric(pCanaryStreamCallbacks, aggClientDatum, Aws::CloudWatch::Model::StandardUnit::Kilobytes,
+        Aws::CloudWatch::Model::MetricDatum aggStorageSizeDatum, aggAvgApiRetryCountDatum;
+        aggStorageSizeDatum.SetMetricName("StorageSizeAvailable");
+        aggStorageSizeDatum.AddDimensions(pCanaryStreamCallbacks->aggregatedDimension);
+        pushMetric(pCanaryStreamCallbacks, aggStorageSizeDatum, Aws::CloudWatch::Model::StandardUnit::Kilobytes,
                    canaryClientMetrics.contentStoreAvailableSize / 1024);
+
+        aggAvgApiRetryCountDatum.SetMetricName("AvgClientApiCallRetryCount");
+        aggAvgApiRetryCountDatum.AddDimensions(pCanaryStreamCallbacks->aggregatedDimension);
+        pushMetric(pCanaryStreamCallbacks, aggAvgApiRetryCountDatum, Aws::CloudWatch::Model::StandardUnit::Count,
+                   canaryClientMetrics.clientAvgApiCallRetryCount);
     }
 CleanUp:
     return retStatus;