Repository: trafficserver Updated Branches: refs/heads/master 5373a33dc -> 7b59c016b
TS-3336: remove unimplemented HTTP metrics Many of the metrics published by the HTTP state machine are not actually implemented. This change removes all these, and publishes one that was implemented but not published. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b59c016 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b59c016 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b59c016 Branch: refs/heads/master Commit: 7b59c016bd21243fad4e8635df844e9b3cfbbd83 Parents: 5373a33 Author: James Peach <[email protected]> Authored: Thu Jan 22 10:44:58 2015 -0800 Committer: James Peach <[email protected]> Committed: Wed Jan 28 08:32:47 2015 -0800 ---------------------------------------------------------------------- CHANGES | 2 + proxy/http/HttpConfig.cc | 113 ++--------------------------------------- proxy/http/HttpConfig.h | 43 +--------------- proxy/logging/LogConfig.h | 1 - 4 files changed, 7 insertions(+), 152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b59c016/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index be56328..545c72e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3336] Remove unimplemented HTTP metrics. + *) [TS-3333] Enable TOS settings on IPv6 connections. *) [TS-3332] Allow set-conn-dscp to work in remap. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b59c016/proxy/http/HttpConfig.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc index 5ac0892..b0e5904 100644 --- a/proxy/http/HttpConfig.cc +++ b/proxy/http/HttpConfig.cc @@ -230,11 +230,6 @@ http_server_session_sharing_cb(char const* name, RecDataT dtype, RecData data, v } void -register_configs() -{ -} - -void register_stat_callbacks() { @@ -264,32 +259,9 @@ register_stat_callbacks() RECD_INT, RECP_NON_PERSISTENT, (int) http_current_client_transactions_stat, RecRawStatSyncSum); HTTP_CLEAR_DYN_STAT(http_current_client_transactions_stat); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.current_parent_proxy_transactions", - RECD_INT, RECP_NON_PERSISTENT, - (int) http_current_parent_proxy_transactions_stat, RecRawStatSyncSum); - HTTP_CLEAR_DYN_STAT(http_current_parent_proxy_transactions_stat); - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.current_icp_transactions", - RECD_INT, RECP_NON_PERSISTENT, (int) http_current_icp_transactions_stat, RecRawStatSyncSum); - HTTP_CLEAR_DYN_STAT(http_current_icp_transactions_stat); - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.current_server_transactions", RECD_INT, RECP_NON_PERSISTENT, (int) http_current_server_transactions_stat, RecRawStatSyncSum); HTTP_CLEAR_DYN_STAT(http_current_server_transactions_stat); - // Current Transaction (Raw) Stats - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.current_parent_proxy_raw_transactions", - RECD_INT, RECP_NON_PERSISTENT, - (int) http_current_parent_proxy_raw_transactions_stat, RecRawStatSyncSum); - HTTP_CLEAR_DYN_STAT(http_current_parent_proxy_raw_transactions_stat); - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.current_icp_raw_transactions", - RECD_INT, RECP_NON_PERSISTENT, (int) http_current_icp_raw_transactions_stat, RecRawStatSyncSum); - HTTP_CLEAR_DYN_STAT(http_current_icp_raw_transactions_stat); - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.current_server_raw_transactions", - RECD_INT, RECP_NON_PERSISTENT, (int) http_current_server_raw_transactions_stat, RecRawStatSyncSum); - HTTP_CLEAR_DYN_STAT(http_current_server_raw_transactions_stat); // Total connections stats RecRegisterRawStat(http_rsb, RECT_PROCESS, @@ -343,26 +315,6 @@ register_stat_callbacks() RECD_FLOAT, RECP_PERSISTENT, (int) http_transactions_per_server_con, RecRawStatSyncAvg); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.avg_transactions_per_parent_connection", - RECD_FLOAT, RECP_PERSISTENT, (int) http_transactions_per_parent_con, RecRawStatSyncAvg); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.client_connection_time", - RECD_INT, RECP_PERSISTENT, (int) http_client_connection_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.parent_proxy_connection_time", - RECD_INT, RECP_PERSISTENT, (int) http_parent_proxy_connection_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.server_connection_time", - RECD_INT, RECP_PERSISTENT, (int) http_server_connection_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.cache_connection_time", - RECD_INT, RECP_PERSISTENT, (int) http_cache_connection_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.transaction_counts.errors.pre_accept_hangups", RECD_COUNTER, RECP_PERSISTENT, (int) http_ua_msecs_counts_errors_pre_accept_hangups_stat, RecRawStatSyncCount); @@ -372,26 +324,6 @@ register_stat_callbacks() RECD_FLOAT, RECP_PERSISTENT, (int) http_ua_msecs_counts_errors_pre_accept_hangups_stat, RecRawStatSyncIntMsecsToFloatSeconds); - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.transaction_counts.errors.empty_hangups", - RECD_COUNTER, RECP_PERSISTENT, - (int) http_ua_msecs_counts_errors_empty_hangups_stat, RecRawStatSyncCount); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.transaction_totaltime.errors.empty_hangups", - RECD_FLOAT, RECP_PERSISTENT, (int) http_ua_msecs_counts_errors_empty_hangups_stat, RecRawStatSyncCount); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.transaction_counts.errors.early_hangups", - RECD_COUNTER, RECP_PERSISTENT, - (int) http_ua_msecs_counts_errors_early_hangups_stat, RecRawStatSyncCount); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.transaction_totaltime.errors.early_hangups", - RECD_FLOAT, RECP_PERSISTENT, (int) http_ua_msecs_counts_errors_early_hangups_stat, RecRawStatSyncCount); - - - // Transactional stats RecRegisterRawStat(http_rsb, RECT_PROCESS, @@ -459,10 +391,6 @@ register_stat_callbacks() RECD_COUNTER, RECP_PERSISTENT, (int) http_extension_method_requests_stat, RecRawStatSyncCount); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.client_no_cache_requests", - RECD_COUNTER, RECP_PERSISTENT, (int) http_client_no_cache_requests_stat, RecRawStatSyncCount); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.broken_server_connections", RECD_COUNTER, RECP_PERSISTENT, (int) http_broken_server_connections_stat, RecRawStatSyncCount); @@ -495,42 +423,10 @@ register_stat_callbacks() RECD_COUNTER, RECP_PERSISTENT, (int) http_icp_suggested_lookups_stat, RecRawStatSyncCount); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.client_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_client_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.client_write_time", - RECD_INT, RECP_PERSISTENT, (int) http_client_write_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.server_read_time", - RECD_INT, RECP_PERSISTENT, (int) http_server_read_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.icp_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_icp_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.icp_raw_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_icp_raw_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.parent_proxy_transaction_time", RECD_INT, RECP_PERSISTENT, (int) http_parent_proxy_transaction_time_stat, RecRawStatSyncSum); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.parent_proxy_raw_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_parent_proxy_raw_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.server_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_server_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.server_raw_transaction_time", - RECD_INT, RECP_PERSISTENT, (int) http_server_raw_transaction_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.user_agent_request_header_total_size", RECD_INT, RECP_PERSISTENT, (int) http_user_agent_request_header_total_size_stat, RecRawStatSyncSum); @@ -703,10 +599,6 @@ register_stat_callbacks() RECD_INT, RECP_PERSISTENT, (int) http_total_transactions_time_stat, RecRawStatSyncSum); RecRegisterRawStat(http_rsb, RECT_PROCESS, - "proxy.process.http.total_transactions_think_time", - RECD_INT, RECP_PERSISTENT, (int) http_total_transactions_think_time_stat, RecRawStatSyncSum); - - RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.cache_hit_fresh", RECD_COUNTER, RECP_PERSISTENT, (int) http_cache_hit_fresh_stat, RecRawStatSyncCount); @@ -883,6 +775,10 @@ register_stat_callbacks() RECD_INT, RECP_PERSISTENT, (int) http_misc_user_agent_bytes_stat, RecRawStatSyncSum); RecRegisterRawStat(http_rsb, RECT_PROCESS, + "proxy.process.http.http_misc_origin_server_bytes_stat", + RECD_INT, RECP_PERSISTENT, (int) http_misc_origin_server_bytes_stat, RecRawStatSyncSum); + + RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.background_fill_bytes_aborted_stat", RECD_INT, RECP_PERSISTENT, (int) http_background_fill_bytes_aborted_stat, RecRawStatSyncSum); @@ -1208,7 +1104,6 @@ HttpConfig::startup() { http_rsb = RecAllocateRawStatBlock((int) http_stat_count); - register_configs(); register_stat_callbacks(); HttpConfigParams &c = m_master; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b59c016/proxy/http/HttpConfig.h ---------------------------------------------------------------------- diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h index fae8b43..03644d8 100644 --- a/proxy/http/HttpConfig.h +++ b/proxy/http/HttpConfig.h @@ -58,17 +58,10 @@ enum http_websocket_current_active_client_connections_stat, http_current_client_transactions_stat, http_total_incoming_connections_stat, - http_current_parent_proxy_transactions_stat, - http_current_icp_transactions_stat, http_current_server_transactions_stat, - http_current_parent_proxy_raw_transactions_stat, - http_current_icp_raw_transactions_stat, - http_current_server_raw_transactions_stat, // Http Abort information (from HttpNetConnection) http_ua_msecs_counts_errors_pre_accept_hangups_stat, - http_ua_msecs_counts_errors_empty_hangups_stat, - http_ua_msecs_counts_errors_early_hangups_stat, // Http Total Connections Stats // @@ -88,16 +81,8 @@ enum // Http K-A Stats http_transactions_per_client_con, http_transactions_per_server_con, - http_transactions_per_parent_con, - // Http Time Stuff - http_client_connection_time_stat, - http_parent_proxy_connection_time_stat, - http_server_connection_time_stat, - http_cache_connection_time_stat, - - - // Transactional stats (originaly in proxy/HttpTransStats.h) + // Transactional stats (originally in proxy/HttpTransStats.h) http_incoming_requests_stat, http_outgoing_requests_stat, http_incoming_responses_stat, @@ -116,20 +101,9 @@ enum http_extension_method_requests_stat, http_completed_requests_stat, - - http_client_no_cache_requests_stat, - - // http_icp_requests_stat, - // http_icp_invalid_responses_stat, - // http_parent_proxy_requests_stat, - // http_parent_invalid_responses_stat, - // http_invalid_responses_stat, - // http_retried_requests_stat, - http_broken_server_connections_stat, http_cache_lookups_stat, - http_cache_misses_stat, http_cache_writes_stat, http_cache_updates_stat, http_cache_deletes_stat, @@ -244,13 +218,10 @@ enum http_ua_msecs_counts_hit_fresh_process_stat, http_ua_msecs_counts_hit_reval_stat, - http_ua_msecs_counts_hit_ims_stat, - http_ua_msecs_counts_hit_stale_served_stat, http_ua_msecs_counts_miss_cold_stat, http_ua_msecs_counts_miss_changed_stat, http_ua_msecs_counts_miss_client_no_cache_stat, http_ua_msecs_counts_miss_uncacheable_stat, - http_ua_msecs_counts_miss_ims_stat, http_ua_msecs_counts_errors_aborts_stat, http_ua_msecs_counts_errors_possible_aborts_stat, http_ua_msecs_counts_errors_connect_failed_stat, @@ -261,19 +232,7 @@ enum // Times http_total_transactions_time_stat, - http_total_transactions_think_time_stat, - - http_client_transaction_time_stat, - - http_client_write_time_stat, - http_server_read_time_stat, - - http_icp_transaction_time_stat, - http_icp_raw_transaction_time_stat, http_parent_proxy_transaction_time_stat, - http_parent_proxy_raw_transaction_time_stat, - http_server_transaction_time_stat, - http_server_raw_transaction_time_stat, // Http cache errors http_cache_write_errors, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b59c016/proxy/logging/LogConfig.h ---------------------------------------------------------------------- diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h index 51867b6..72ff245 100644 --- a/proxy/logging/LogConfig.h +++ b/proxy/logging/LogConfig.h @@ -117,7 +117,6 @@ public: void display(FILE * fd = stdout); void setup_log_objects(); - static void register_configs(); static int reconfigure(const char *name, RecDataT data_type, RecData data, void *cookie); static void register_config_callbacks();
