Address review feedback

oschaaf · oschaaf · commit 13b5222fc91f · 2020-01-13T23:55:52.000+01:00
Signed-off-by: Otto van der Schaaf &lt;oschaaf@we-amp.com&gt;
diff --git a/source/client/output_formatter_impl.cc b/source/client/output_formatter_impl.cc
@@ -223,7 +223,7 @@ std::string FortioOutputFormatterImpl::formatProto(const nighthawk::client::Outp
   fortio_output.set_jitter(output.options().has_jitter_uniform());
   fortio_output.set_runtype("HTTP");
 
-  // The stock Envoy h2 pool doesn't offer supper for multiple connections here. So we must ignore
+  // The stock Envoy h2 pool doesn't offer support for multiple connections here. So we must ignore
   // the connections setting when h2 is enabled and the experimental h2-pool which supports multiple
   // connections isn't enabled. Also, the number of workers acts as a multiplier.
   const uint32_t number_of_connections =
@@ -269,11 +269,9 @@ std::string FortioOutputFormatterImpl::formatProto(const nighthawk::client::Outp
   nighthawk::client::DurationHistogram fortio_histogram;
   uint64_t prev_fortio_count = 0;
   double prev_fortio_end = 0;
-  const int percentiles_size = nh_stat.percentiles().size();
-  for (int i = 0; i < percentiles_size; i++) {
+  int i = 0;
+  for (const auto& nh_percentile : nh_stat.percentiles()) {
     nighthawk::client::DataEntry fortio_data_entry;
-    const auto& nh_percentile = nh_stat.percentiles().at(i);
-
     // fortio_percent = 100 * nh_percentile
     fortio_data_entry.set_percent(nh_percentile.percentile() * 100);
 
@@ -285,7 +283,7 @@ std::string FortioOutputFormatterImpl::formatProto(const nighthawk::client::Outp
     fortio_data_entry.set_end(nh_percentile_duration_sec);
 
     // fortio_start = prev_fortio_end
-    if (i == 0) {
+    if (i++ == 0) {
       // If this is the first entry, force the start and end time to be the same.
       // This prevents it from starting at 0, making it disproportionally big in the UI.
       prev_fortio_end = nh_percentile_duration_sec;
diff --git a/source/common/version_info.cc b/source/common/version_info.cc
@@ -16,9 +16,8 @@ const std::string& VersionInfo::version() {
 }
 
 const envoy::config::core::v3alpha::BuildVersion& VersionInfo::buildVersion() {
-  static const auto* result = new envoy::config::core::v3alpha::BuildVersion(
-      makeBuildVersion(NIGHTHAWK_BUILD_VERSION_NUMBER));
-  return *result;
+  CONSTRUCT_ON_FIRST_USE(envoy::config::core::v3alpha::BuildVersion,
+                         makeBuildVersion(NIGHTHAWK_BUILD_VERSION_NUMBER));
 }
 
 envoy::config::core::v3alpha::BuildVersion VersionInfo::makeBuildVersion(const char* version) {

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,8 @@ const std::string& VersionInfo::version() {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`const envoy::config::core::v3alpha::BuildVersion& VersionInfo::buildVersion() {`
`19`		`- static const auto* result = new envoy::config::core::v3alpha::BuildVersion(`
`20`		`- makeBuildVersion(NIGHTHAWK_BUILD_VERSION_NUMBER));`
`21`		`- return *result;`
	`19`	`+ CONSTRUCT_ON_FIRST_USE(envoy::config::core::v3alpha::BuildVersion,`
	`20`	`+ makeBuildVersion(NIGHTHAWK_BUILD_VERSION_NUMBER));`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`envoy::config::core::v3alpha::BuildVersion VersionInfo::makeBuildVersion(const char* version) {`