From 4f418c41a72997f5cf88e01201c9e7b2331c859c Mon Sep 17 00:00:00 2001
From: eeff <33566201+eeff@users.noreply.github.com>
Date: Thu, 20 Oct 2022 17:23:49 +0800
Subject: [PATCH] fix(restful): node state api rename `avg_rtt` to `rtt`

---
 include/neuron/adapter.h         | 4 ++--
 plugins/restful/adapter_handle.c | 4 ++--
 src/adapter/adapter.c            | 2 +-
 src/core/node_manager.c          | 2 +-
 src/parser/neu_json_node.c       | 8 ++++----
 src/parser/neu_json_node.h       | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/neuron/adapter.h b/include/neuron/adapter.h
index b667ee8e..2ae098ce 100644
--- a/include/neuron/adapter.h
+++ b/include/neuron/adapter.h
@@ -356,7 +356,7 @@ typedef struct neu_req_get_node_state {
 
 typedef struct neu_resp_get_node_state {
     neu_node_state_t state;
-    uint16_t         avg_rtt; // average round trip time in milliseconds
+    uint16_t         rtt; // round trip time in milliseconds
 } neu_resp_get_node_state_t;
 
 typedef struct neu_req_get_nodes_state {
@@ -365,7 +365,7 @@ typedef struct neu_req_get_nodes_state {
 typedef struct {
     char             node[NEU_NODE_NAME_LEN];
     neu_node_state_t state;
-    uint16_t         avg_rtt; // average round trip time in milliseconds
+    uint16_t         rtt; // round trip time in milliseconds
 } neu_nodes_state_t;
 
 inline static UT_icd neu_nodes_state_t_icd()
diff --git a/plugins/restful/adapter_handle.c b/plugins/restful/adapter_handle.c
index e0bb7cec..394a9d4a 100644
--- a/plugins/restful/adapter_handle.c
+++ b/plugins/restful/adapter_handle.c
@@ -258,7 +258,7 @@ void handle_get_node_state_resp(nng_aio *aio, neu_resp_get_node_state_t *state)
 
     res.link    = state->state.link;
     res.running = state->state.running;
-    res.avg_rtt = state->avg_rtt;
+    res.rtt     = state->rtt;
 
     neu_json_encode_by_fn(&res, neu_json_encode_get_node_state_resp, &result);
 
@@ -282,7 +282,7 @@ void handle_get_nodes_state_resp(nng_aio *                   aio,
         states_res.nodes[index].name    = state->node;
         states_res.nodes[index].running = state->state.running;
         states_res.nodes[index].link    = state->state.link;
-        states_res.nodes[index].avg_rtt = state->avg_rtt;
+        states_res.nodes[index].rtt     = state->rtt;
     }
 
     neu_json_encode_by_fn(&states_res, neu_json_encode_get_nodes_state_resp,
diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c
index c46c4acc..7acd7026 100644
--- a/src/adapter/adapter.c
+++ b/src/adapter/adapter.c
@@ -434,7 +434,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
         if (NULL != adapter->metrics) {
             HASH_FIND_STR(adapter->metrics->entries, NEU_METRIC_LAST_RTT_MS, e);
         }
-        resp.avg_rtt = NULL != e ? e->value : 0;
+        resp.rtt     = NULL != e ? e->value : 0;
         resp.state   = neu_adapter_get_state(adapter);
         header->type = NEU_RESP_GET_NODE_STATE;
         neu_msg_exchange(header);
diff --git a/src/core/node_manager.c b/src/core/node_manager.c
index 80d4e04a..e7dac47b 100644
--- a/src/core/node_manager.c
+++ b/src/core/node_manager.c
@@ -308,7 +308,7 @@ UT_array *neu_node_manager_get_state(neu_node_manager_t *mgr)
                 HASH_FIND_STR(el->adapter->metrics->entries,
                               NEU_METRIC_LAST_RTT_MS, e);
             }
-            state.avg_rtt = NULL != e ? e->value : 0;
+            state.rtt = NULL != e ? e->value : 0;
 
             utarray_push_back(states, &state);
         }
diff --git a/src/parser/neu_json_node.c b/src/parser/neu_json_node.c
index ae610764..96bad5d9 100644
--- a/src/parser/neu_json_node.c
+++ b/src/parser/neu_json_node.c
@@ -140,9 +140,9 @@ int neu_json_encode_get_node_state_resp(void *json_object, void *param)
                                          .v.val_int = resp->link,
                                      },
                                      {
-                                         .name      = "average_rtt",
+                                         .name      = "rtt",
                                          .t         = NEU_JSON_INT,
-                                         .v.val_int = resp->avg_rtt,
+                                         .v.val_int = resp->rtt,
                                      } };
     ret = neu_json_encode_field(json_object, resp_elems,
                                 NEU_JSON_ELEM_SIZE(resp_elems));
@@ -176,9 +176,9 @@ int neu_json_encode_get_nodes_state_resp(void *json_object, void *param)
                 .v.val_int = p_node->link,
             },
             {
-                .name      = "average_rtt",
+                .name      = "rtt",
                 .t         = NEU_JSON_INT,
-                .v.val_int = p_node->avg_rtt,
+                .v.val_int = p_node->rtt,
             },
         };
         node_array = neu_json_encode_array(node_array, node_elems,
diff --git a/src/parser/neu_json_node.h b/src/parser/neu_json_node.h
index c755730b..8a95b865 100644
--- a/src/parser/neu_json_node.h
+++ b/src/parser/neu_json_node.h
@@ -49,7 +49,7 @@ void neu_json_decode_del_node_req_free(neu_json_del_node_req_t *req);
 typedef struct {
     int64_t running;
     int64_t link;
-    int64_t avg_rtt;
+    int64_t rtt;
 } neu_json_get_node_state_resp_t;
 
 int neu_json_encode_get_node_state_resp(void *json_object, void *param);
@@ -58,7 +58,7 @@ typedef struct {
     char *  name;
     int64_t running;
     int64_t link;
-    int64_t avg_rtt;
+    int64_t rtt;
 } neu_json_get_nodes_state_t;
 
 typedef struct {