fix memory leak in peformance tests

Author: sbiscigl

tests/performance-tests/include/performance-tests/reporting/JsonReportingMetrics.h

@@ -37,6 +37,18 @@ struct PerformanceMetricRecord {
   Aws::Map<Aws::String, Aws::String> dimensions;
 };
 
+/**
+ * Context will be shared between monitor invocations
+ */
+struct RequestContext {
+  Aws::Utils::UUID requestId{Aws::Utils::UUID::RandomUUID()};
+  Aws::String serviceName;
+  Aws::String requestName;
+  std::shared_ptr<const Aws::Http::HttpRequest> request;
+  std::variant<int64_t, double> durationMs = int64_t(0);
+  bool failed = false;
+};
+
 /**
  * An implementation of the MonitoringInterface that collects performance metrics
  * and reports them in a JSON format.
@@ -150,6 +162,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;

tests/performance-tests/src/reporting/JsonReportingMetrics.cpp

@@ -27,14 +27,6 @@
 
 using namespace PerformanceTest::Reporting;
 
-struct RequestContext {
-  Aws::String serviceName;
-  Aws::String requestName;
-  std::shared_ptr<const Aws::Http::HttpRequest> request;
-  std::variant<int64_t, double> durationMs = int64_t(0);
-  bool failed = false;
-};
-
 JsonReportingMetrics::JsonReportingMetrics(const Aws::Set<Aws::String>& monitoredOperations, const Aws::String& productId,
                                            const Aws::String& sdkVersion, const Aws::String& commitId, const Aws::String& outputFilename)
     : m_monitoredOperations(monitoredOperations),
@@ -107,8 +99,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,
@@ -136,7 +130,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 {
@@ -214,6 +208,7 @@ void JsonReportingMetrics::DumpJson() const {
 void JsonReportingMetrics::WriteJsonToFile(const Aws::Utils::Json::JsonValue& root) const {
   std::ofstream outFile(m_outputFilename.c_str());
   if (outFile.is_open()) {
+    std::cout << root.View().WriteReadable();
     outFile << root.View().WriteReadable();
   }
 }