Fixed review comments

Author: zwoop

doc/admin-guide/logging/formatting.en.rst

@@ -455,7 +455,7 @@ cqql  Client Request         Client request header and content length combined,
                              in bytes.
 cqqtl Client Request         Same as cqql_, but for the first transaction on a
                              TLS connection, also includes TLS handshake bytes
-                             received from the client. Note that this metrics
+                             received from the client. Note that this metric
                              may not always be 100% accurate.
 csscl Cached Origin Response Content body length from cached origin response.
 csshl Cached Origin Response Header length from cached origin response.

include/iocore/net/TLSBasicSupport.h

@@ -51,7 +51,7 @@ class TLSBasicSupport
   std::string_view get_tls_group() const;
   ink_hrtime       get_tls_handshake_begin_time() const;
   ink_hrtime       get_tls_handshake_end_time() const;
-  bool             get_tls_handshake_bytes(uint64_t &bytes_in, uint64_t &bytes_out);
+  bool             get_tls_handshake_bytes(uint64_t &bytes_in, uint64_t &bytes_out) const;
 
   /**
    * Returns a certificate that need to be verified.
@@ -103,8 +103,8 @@ class TLSBasicSupport
 
   X509_STORE_CTX *_cert_to_verify = nullptr;
 
-  ink_hrtime _tls_handshake_begin_time = 0;
-  ink_hrtime _tls_handshake_end_time   = 0;
-  uint64_t   _tls_handshake_bytes_in   = 0;
-  uint64_t   _tls_handshake_bytes_out  = 0;
+  ink_hrtime       _tls_handshake_begin_time = 0;
+  ink_hrtime       _tls_handshake_end_time   = 0;
+  mutable uint64_t _tls_handshake_bytes_in   = 0;
+  mutable uint64_t _tls_handshake_bytes_out  = 0;
 };

src/iocore/net/SSLStats.cc

@@ -281,7 +281,7 @@ SSLInitializeStatistics()
   ssl_rsb.user_agent_version_too_low        = Metrics::Counter::createPtr("proxy.process.ssl.user_agent_version_too_low");
   ssl_rsb.user_agent_wrong_version          = Metrics::Counter::createPtr("proxy.process.ssl.user_agent_wrong_version");
   ssl_rsb.tls_handshake_bytes_in_total      = Metrics::Counter::createPtr("proxy.process.ssl.total_handshake_bytes_read_in");
-  ssl_rsb.tls_handshake_bytes_out_total     = Metrics::Counter::createPtr("proxy.process.ssl.total_handshake_bytes_write_in");
+  ssl_rsb.tls_handshake_bytes_out_total     = Metrics::Counter::createPtr("proxy.process.ssl.total_handshake_bytes_write_out");
 
 #if defined(OPENSSL_IS_BORINGSSL)
   size_t                    n = SSL_get_all_cipher_names(nullptr, 0);

src/iocore/net/TLSBasicSupport.cc

@@ -76,8 +76,10 @@ TLSBasicSupport::clear()
   this->_tls_handshake_bytes_out  = 0;
 }
 
+// Returns true only on the first call that reads from the BIOs, so callers
+// can distinguish fresh values (for metrics) from cached ones.
 bool
-TLSBasicSupport::get_tls_handshake_bytes(uint64_t &bytes_in, uint64_t &bytes_out)
+TLSBasicSupport::get_tls_handshake_bytes(uint64_t &bytes_in, uint64_t &bytes_out) const
 {
   if (_tls_handshake_bytes_in > 0 || _tls_handshake_bytes_out > 0) {
     bytes_in  = _tls_handshake_bytes_in;