add new metric correct connect time in curl.

Author: sbiscigl

src/aws-cpp-sdk-core/include/aws/core/monitoring/HttpClientMetrics.h

@@ -35,11 +35,7 @@ namespace Aws
             ConnectionReused,
 
             /**
-             * Requires the SDK to recognize that a new connection was established to make the request,
-             * contains the time interval (in milliseconds) between the construction of the http request and when a connection was fully established.
-             * If the SDK is able to estimate this time despite not having a perfectly accurate callback for the specific event, then it should.
-             * For example, if the http client includes user-level data write functions that are guaranteed to be called shortly after connection establishment,
-             * then the first call could be used as a reasonable time marker for ConnectLatency
+             * Deprecated, maintained for backwards compatibility, use TimeToConnect instead,
              */
             ConnectLatency,
 
@@ -84,7 +80,21 @@ namespace Aws
             /**
              * Unknow Metrics Type
              */
-            Unknown
+            Unknown,
+
+            /**
+             * Time between http client initialization and first byte transferred.
+             */
+            TimeToFirstByte,
+
+            /**
+             * Requires the SDK to recognize that a new connection was established to make the request,
+             * contains the time interval (in milliseconds) between the construction of the http request and when a connection was fully established.
+             * If the SDK is able to estimate this time despite not having a perfectly accurate callback for the specific event, then it should.
+             * For example, if the http client includes user-level data write functions that are guaranteed to be called shortly after connection establishment,
+             * then the first call could be used as a reasonable time marker for ConnectLatency
+             */
+            TimeToConnect,
         };
 
         typedef Aws::Map<Aws::String, int64_t> HttpClientMetricsCollection;

src/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp

@@ -933,6 +933,13 @@ std::shared_ptr<HttpResponse> CurlHttpClient::MakeRequest(const std::shared_ptr<
         if (ret == CURLE_OK)
         {
             request->AddRequestMetric(GetHttpClientMetricNameByType(HttpClientMetricsType::ConnectLatency), static_cast<int64_t>(timep * 1000));
+            request->AddRequestMetric(GetHttpClientMetricNameByType(HttpClientMetricsType::TimeToFirstByte), static_cast<int64_t>(timep * 1000));
+        }
+
+        ret = curl_easy_getinfo(connectionHandle, CURLINFO_PRETRANSFER_TIME, &timep);
+        if (ret == CURLE_OK)
+        {
+          request->AddRequestMetric(GetHttpClientMetricNameByType(HttpClientMetricsType::TimeToConnect), static_cast<int64_t>(timep * 1000));
         }
 
 #if LIBCURL_VERSION_NUM >= 0x073D00 // 7.61.0

src/aws-cpp-sdk-core/source/monitoring/DefaultMonitoring.cpp

@@ -187,6 +187,8 @@ namespace Aws
             ExportHttpMetricsToJson(json, metricsFromCore.httpClientMetrics, HttpClientMetricsType::RequestLatency);
             ExportHttpMetricsToJson(json, metricsFromCore.httpClientMetrics, HttpClientMetricsType::SslLatency);
             ExportHttpMetricsToJson(json, metricsFromCore.httpClientMetrics, HttpClientMetricsType::TcpLatency);
+            ExportHttpMetricsToJson(json, metricsFromCore.httpClientMetrics, HttpClientMetricsType::TimeToFirstByte);
+            ExportHttpMetricsToJson(json, metricsFromCore.httpClientMetrics, HttpClientMetricsType::TimeToConnect);
         }
 
         DefaultMonitoring::DefaultMonitoring(const Aws::String& clientId, const Aws::String& host, unsigned short port):

src/aws-cpp-sdk-core/source/monitoring/HttpClientMetrics.cpp

@@ -21,9 +21,11 @@ namespace Aws
         static const char HTTP_CLIENT_METRICS_DOWNLOAD_SPEED[] = "DownloadSpeed";
         static const char HTTP_CLIENT_METRICS_THROUGHPUT[] = "Throughput";
         static const char HTTP_CLIENT_METRICS_UPLOAD_SPEED[] = "UploadSpeed";
+        static const char HTTP_CLIENT_METRICS_TIME_TO_FIRST_BYTE[] = "TimeToFirstByte";
+        static const char HTTP_CLIENT_METRICS_TIME_TO_CONNECT[] = "TimeToConnect";
         static const char HTTP_CLIENT_METRICS_UNKNOWN[] = "Unknown";
 
-        static const Aws::Array<std::pair<HttpClientMetricsType, const char*>, 12> httpClientMetricsNames =
+        static const Aws::Array<std::pair<HttpClientMetricsType, const char*>, 14> httpClientMetricsNames =
         {
             std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::DestinationIp, HTTP_CLIENT_METRICS_DESTINATION_IP),
             std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::AcquireConnectionLatency, HTTP_CLIENT_METRICS_ACQUIRE_CONNECTION_LATENCY),
@@ -37,6 +39,8 @@ namespace Aws
             std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::Throughput, HTTP_CLIENT_METRICS_THROUGHPUT),
             std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::UploadSpeed, HTTP_CLIENT_METRICS_UPLOAD_SPEED),
             std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::Unknown, HTTP_CLIENT_METRICS_UNKNOWN),
+            std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::TimeToFirstByte, HTTP_CLIENT_METRICS_TIME_TO_FIRST_BYTE),
+            std::pair<HttpClientMetricsType, const char *>(HttpClientMetricsType::TimeToConnect, HTTP_CLIENT_METRICS_TIME_TO_CONNECT),
         };
 
         HttpClientMetricsType GetHttpClientMetricTypeByName(const Aws::String& name)