Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add retry metric in producer C #214

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add retry metric in producer C #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b269d91
Add retry metric in producer C
disa6302 Dec 16, 2021
4e0c999
Merge branch 'master' into prodc-retry-count-metric
disa6302 Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions canary/producer-c/canary/CanaryStreamUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand Down