From 147d4291679821c6405ecf6ecaee283042e18288 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@apache.org>
Date: Tue, 5 Jan 2016 20:18:43 -0800
Subject: [PATCH] TS-4107: proxy.process.ssl.total_success_handshake_count_in
 has wrong record type

proxy.process.ssl.total_success_handshake_count_in should be the
metrics generated in the core SSL code, and the old compatible name
proxy.process.ssl.total_success_handshake_count should be generated
as a custom metric. The custom metric needs to be registered in
RecordsConfig.cc but it should be of type RECT_PROCESS not RECT_NODE.
---
 iocore/net/SSLUtils.cc                | 2 +-
 mgmt/RecordsConfig.cc                 | 2 +-
 proxy/config/stats.config.xml.default | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 0231a158565..03d1b4eef8a 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -902,7 +902,7 @@ SSLInitializeStatistics()
   // SSL handshake time
   RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_handshake_time", RECD_INT, RECP_PERSISTENT,
                      (int)ssl_total_handshake_time_stat, RecRawStatSyncSum);
-  RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count", RECD_INT, RECP_PERSISTENT,
+  RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count_in", RECD_INT, RECP_PERSISTENT,
                      (int)ssl_total_success_handshake_count_in_stat, RecRawStatSyncCount);
   RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count_out", RECD_INT, RECP_PERSISTENT,
                      (int)ssl_total_success_handshake_count_out_stat, RecRawStatSyncCount);
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index c390ac57eaf..1f8c2cd25da 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1767,7 +1767,7 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_NODE, "proxy.node.log.bytes_lost_before_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_NODE, "proxy.process.ssl.total_success_handshake_count_in", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+  {RECT_PROCESS, "proxy.process.ssl.total_success_handshake_count", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
 
   //#
diff --git a/proxy/config/stats.config.xml.default b/proxy/config/stats.config.xml.default
index 430e2bea7a2..da17a2c5466 100644
--- a/proxy/config/stats.config.xml.default
+++ b/proxy/config/stats.config.xml.default
@@ -1946,11 +1946,12 @@
         </expression>
     </statistics>
 
+    <!-- TS-3409. Mirror proxy.process.ssl.total_success_handshake_count_in for backwards compatibility. -->
     <statistics
 	minimum="0">
-        <destination>proxy.process.ssl.total_success_handshake_count_in</destination>
+        <destination>proxy.process.ssl.total_success_handshake_count</destination>
         <expression>
-            proxy.process.ssl.total_success_handshake_count
+            proxy.process.ssl.total_success_handshake_count_in
         </expression>
     </statistics>