Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ struct PerformanceMetricRecord {
Aws::Map<Aws::String, Aws::String> dimensions;
};

/**
* Context will be shared between monitor invocations.
*/
struct RequestContext;

/**
* An implementation of the MonitoringInterface that collects performance metrics
* and reports them in a JSON format.
Expand Down Expand Up @@ -150,6 +155,7 @@ class JsonReportingMetrics : public Aws::Monitoring::MonitoringInterface {
void WriteJsonToFile(const Aws::Utils::Json::JsonValue& root) const;

mutable Aws::Vector<PerformanceMetricRecord> m_performanceRecords;
mutable Aws::UnorderedMap<Aws::String, Aws::UniquePtr<RequestContext>> m_requestContexts;
Aws::Set<Aws::String> m_monitoredOperations;
Aws::String m_productId;
Aws::String m_sdkVersion;
Expand Down
11 changes: 7 additions & 4 deletions tests/performance-tests/src/reporting/JsonReportingMetrics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@

using namespace PerformanceTest::Reporting;

struct RequestContext {
struct PerformanceTest::Reporting::RequestContext {
Aws::Utils::UUID requestId{Aws::Utils::UUID::RandomUUID()};
Aws::String serviceName;
Aws::String requestName;
std::shared_ptr<const Aws::Http::HttpRequest> request;
Expand Down Expand Up @@ -107,8 +108,10 @@ void JsonReportingMetrics::AddPerformanceRecord(const Aws::String& serviceName,

void* JsonReportingMetrics::OnRequestStarted(const Aws::String&, const Aws::String&,
const std::shared_ptr<const Aws::Http::HttpRequest>&) const {
auto context = Aws::New<RequestContext>("RequestContext");
return context;
auto context = Aws::MakeUnique<RequestContext>("RequestContext");
auto requestID = context->requestId;
m_requestContexts.emplace(requestID, std::move(context));
return m_requestContexts[requestID].get();
}

void JsonReportingMetrics::OnRequestSucceeded(const Aws::String& serviceName, const Aws::String& requestName,
Expand Down Expand Up @@ -136,7 +139,7 @@ void JsonReportingMetrics::OnFinish(const Aws::String&, const Aws::String&, cons
AddPerformanceRecord(requestContext->serviceName, requestContext->requestName, requestContext->request, requestContext->durationMs);
}

Aws::Delete(requestContext);
m_requestContexts.erase(requestContext->requestId);
}

void JsonReportingMetrics::DumpJson() const {
Expand Down