From 331a5671c5320fadf1654fc7856231e95772d772 Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Wed, 2 Feb 2022 13:06:43 -0500 Subject: [PATCH 1/8] rm envoy/stats/symbol_table.h Signed-off-by: Joshua Marantz --- envoy/http/codes.h | 1 - envoy/local_info/BUILD | 2 +- envoy/local_info/local_info.h | 2 +- envoy/stats/BUILD | 6 ------ envoy/stats/allocator.h | 1 - envoy/stats/scope.h | 1 - envoy/stats/stats.h | 11 ++++++++++- envoy/stats/symbol_table.h | 22 ---------------------- envoy/stats/tag.h | 4 ++-- envoy/upstream/cluster_manager.h | 1 - source/common/stats/BUILD | 1 - source/common/stats/allocator_impl.h | 1 - source/common/stats/tag_utility.h | 1 - 13 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 envoy/stats/symbol_table.h diff --git a/envoy/http/codes.h b/envoy/http/codes.h index 374ed1e184c20..eafd16d1cb1de 100644 --- a/envoy/http/codes.h +++ b/envoy/http/codes.h @@ -3,7 +3,6 @@ #include #include "envoy/stats/scope.h" -#include "envoy/stats/symbol_table.h" namespace Envoy { namespace Http { diff --git a/envoy/local_info/BUILD b/envoy/local_info/BUILD index 31ee44aa746ed..976b460a157c0 100644 --- a/envoy/local_info/BUILD +++ b/envoy/local_info/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( deps = [ "//envoy/config:context_provider_interface", "//envoy/network:address_interface", - "//envoy/stats:symbol_table_interface", + "//envoy/stats:stats_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/envoy/local_info/local_info.h b/envoy/local_info/local_info.h index aa066f4cd27ca..4b6c385d00f53 100644 --- a/envoy/local_info/local_info.h +++ b/envoy/local_info/local_info.h @@ -6,7 +6,7 @@ #include "envoy/config/context_provider.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/address.h" -#include "envoy/stats/symbol_table.h" +#include "envoy/stats/stats.h" namespace Envoy { namespace LocalInfo { diff --git a/envoy/stats/BUILD b/envoy/stats/BUILD index 612ef108ad59e..0af871ae09928 100644 --- a/envoy/stats/BUILD +++ b/envoy/stats/BUILD @@ -32,7 +32,6 @@ envoy_cc_library( external_deps = ["abseil_inlined_vector"], deps = [ ":refcount_ptr_interface", - ":symbol_table_interface", "//envoy/common:interval_set_interface", "//envoy/common:time_interface", ], @@ -49,11 +48,6 @@ envoy_cc_library( ], ) -envoy_cc_library( - name = "symbol_table_interface", - hdrs = ["symbol_table.h"], -) - envoy_cc_library( name = "timespan_interface", hdrs = ["timespan.h"], diff --git a/envoy/stats/allocator.h b/envoy/stats/allocator.h index 223b1cab47068..0d61c0d97eeb2 100644 --- a/envoy/stats/allocator.h +++ b/envoy/stats/allocator.h @@ -10,7 +10,6 @@ #include "envoy/common/pure.h" #include "envoy/stats/stats.h" -#include "envoy/stats/symbol_table.h" #include "envoy/stats/tag.h" #include "absl/strings/string_view.h" diff --git a/envoy/stats/scope.h b/envoy/stats/scope.h index 7271883314ad9..bc8f0b1c4bfe8 100644 --- a/envoy/stats/scope.h +++ b/envoy/stats/scope.h @@ -6,7 +6,6 @@ #include "envoy/common/pure.h" #include "envoy/stats/histogram.h" -#include "envoy/stats/symbol_table.h" #include "envoy/stats/tag.h" #include "absl/types/optional.h" diff --git a/envoy/stats/stats.h b/envoy/stats/stats.h index 9fba64c34ccfa..9db2c9dbcac9a 100644 --- a/envoy/stats/stats.h +++ b/envoy/stats/stats.h @@ -7,7 +7,6 @@ #include "envoy/common/pure.h" #include "envoy/stats/refcount_ptr.h" -#include "envoy/stats/symbol_table.h" #include "envoy/stats/tag.h" #include "absl/strings/string_view.h" @@ -15,6 +14,16 @@ namespace Envoy { namespace Stats { +/** + * Runtime representation of an encoded stat name. + */ +class StatName; + +/** + * Holds a set of symbols used to compose hierarhical names. + */ +class SymbolTable; + /** * General interface for all stats objects. */ diff --git a/envoy/stats/symbol_table.h b/envoy/stats/symbol_table.h deleted file mode 100644 index 39ac815d0e32c..0000000000000 --- a/envoy/stats/symbol_table.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -namespace Envoy { -namespace Stats { - -// Forward declarations for the symbol table classes. See -// source/common/stats/symbol_table_impl.h" for the class definitions. -// -// TODO(jmarantz): remove this file and put the forward declarations into stats.h. - -/** - * Runtime representation of an encoded stat name. - */ -class StatName; - -/** - * Holds a set of symbols used to compose hierarhical names. - */ -class SymbolTable; - -} // namespace Stats -} // namespace Envoy diff --git a/envoy/stats/tag.h b/envoy/stats/tag.h index 67d01711146a6..9916b71f46e03 100644 --- a/envoy/stats/tag.h +++ b/envoy/stats/tag.h @@ -2,13 +2,13 @@ #include -#include "envoy/stats/symbol_table.h" - #include "absl/types/optional.h" namespace Envoy { namespace Stats { +class StatName; + /** * General representation of a tag. */ diff --git a/envoy/upstream/cluster_manager.h b/envoy/upstream/cluster_manager.h index e24790038d241..fd00dae2252c6 100644 --- a/envoy/upstream/cluster_manager.h +++ b/envoy/upstream/cluster_manager.h @@ -25,7 +25,6 @@ #include "envoy/singleton/manager.h" #include "envoy/ssl/context_manager.h" #include "envoy/stats/store.h" -#include "envoy/stats/symbol_table.h" #include "envoy/tcp/conn_pool.h" #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/health_checker.h" diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD index f4670d18109e7..a9e2039ff42fe 100644 --- a/source/common/stats/BUILD +++ b/source/common/stats/BUILD @@ -195,7 +195,6 @@ envoy_cc_library( ], deps = [ ":recent_lookups_lib", - "//envoy/stats:symbol_table_interface", "//source/common/common:assert_lib", "//source/common/common:mem_block_builder_lib", "//source/common/common:minimal_logger_lib", diff --git a/source/common/stats/allocator_impl.h b/source/common/stats/allocator_impl.h index 86a1e1aa664cf..5348cb46bad6d 100644 --- a/source/common/stats/allocator_impl.h +++ b/source/common/stats/allocator_impl.h @@ -6,7 +6,6 @@ #include "envoy/stats/allocator.h" #include "envoy/stats/sink.h" #include "envoy/stats/stats.h" -#include "envoy/stats/symbol_table.h" #include "source/common/common/thread_synchronizer.h" #include "source/common/stats/metric_impl.h" diff --git a/source/common/stats/tag_utility.h b/source/common/stats/tag_utility.h index d0961cf0f3e82..04593c687d4fb 100644 --- a/source/common/stats/tag_utility.h +++ b/source/common/stats/tag_utility.h @@ -1,6 +1,5 @@ #pragma once -#include "envoy/stats/symbol_table.h" #include "envoy/stats/tag.h" #include "source/common/stats/symbol_table_impl.h" From 1e0c61cc48c35d894b3e64c0c14cc919c749ede3 Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Wed, 2 Feb 2022 14:13:02 -0500 Subject: [PATCH 2/8] big rename Signed-off-by: Joshua Marantz --- contrib/sip_proxy/filters/network/source/tra/stat_names.h | 2 +- envoy/server/proactive_resource_monitor.h | 2 +- envoy/stats/stats_macros.h | 2 +- source/common/common/regex.h | 2 +- source/common/grpc/context_impl.h | 2 +- source/common/grpc/stat_names.h | 2 +- source/common/http/codes.h | 2 +- source/common/http/conn_manager_config.h | 2 +- source/common/http/user_agent.cc | 2 +- source/common/http/user_agent.h | 2 +- source/common/local_info/local_info_impl.h | 2 +- source/common/memory/heap_shrinker.cc | 2 +- source/common/quic/quic_stat_names.h | 4 ++-- source/common/router/config_impl.h | 2 +- source/common/router/router.h | 2 +- source/common/stats/BUILD | 4 ++-- source/common/stats/allocator_impl.cc | 2 +- source/common/stats/isolated_store_impl.h | 2 +- source/common/stats/metric_impl.cc | 2 +- source/common/stats/metric_impl.h | 2 +- source/common/stats/scope_prefixer.cc | 2 +- source/common/stats/scope_prefixer.h | 2 +- source/common/stats/stat_merger.h | 2 +- source/common/stats/stats_matcher_impl.h | 2 +- source/common/stats/store_impl.h | 2 +- source/common/stats/{symbol_table_impl.cc => symbol_table.cc} | 2 +- source/common/stats/{symbol_table_impl.h => symbol_table.h} | 0 source/common/stats/tag_utility.cc | 2 +- source/common/stats/tag_utility.h | 2 +- source/common/stats/thread_local_store.h | 2 +- source/common/stats/utility.h | 2 +- source/exe/main_common.h | 2 +- source/extensions/common/wasm/stats_handler.h | 2 +- source/extensions/common/wasm/wasm.h | 2 +- source/extensions/filters/common/ratelimit/stat_names.h | 2 +- source/extensions/filters/http/dynamo/dynamo_stats.cc | 2 +- source/extensions/filters/http/dynamo/dynamo_stats.h | 2 +- source/extensions/filters/http/fault/fault_filter.h | 2 +- .../extensions/filters/http/grpc_stats/grpc_stats_filter.cc | 2 +- source/extensions/filters/http/ip_tagging/ip_tagging_filter.h | 2 +- .../filters/network/common/redis/redis_command_stats.h | 2 +- source/extensions/filters/network/mongo_proxy/mongo_stats.cc | 2 +- source/extensions/filters/network/mongo_proxy/mongo_stats.h | 2 +- .../network/thrift_proxy/filters/ratelimit/ratelimit.h | 2 +- source/extensions/filters/network/zookeeper_proxy/filter.h | 2 +- source/extensions/stat_sinks/common/statsd/statsd.cc | 2 +- source/extensions/stat_sinks/hystrix/hystrix.h | 2 +- source/extensions/tracers/lightstep/lightstep_tracer_impl.h | 2 +- .../transport_sockets/tls/cert_validator/cert_validator.h | 2 +- .../transport_sockets/tls/cert_validator/default_validator.cc | 2 +- .../transport_sockets/tls/cert_validator/default_validator.h | 2 +- .../tls/cert_validator/spiffe/spiffe_validator.cc | 2 +- .../tls/cert_validator/spiffe/spiffe_validator.h | 2 +- source/extensions/transport_sockets/tls/context_impl.h | 2 +- source/extensions/watchdog/profile_action/profile_action.cc | 2 +- source/server/guarddog_impl.cc | 2 +- source/server/hot_restarting_parent.cc | 2 +- source/server/overload_manager_impl.cc | 2 +- test/common/grpc/context_impl_test.cc | 2 +- test/common/grpc/grpc_client_integration_test_harness.h | 2 +- test/common/http/codes_speed_test.cc | 2 +- test/common/stats/symbol_table_fuzz_test.cc | 2 +- test/common/stats/symbol_table_impl_test.cc | 2 +- test/common/stats/symbol_table_speed_test.cc | 2 +- test/common/stats/thread_local_store_speed_test.cc | 2 +- test/common/stats/thread_local_store_test.cc | 2 +- .../http/grpc_http1_bridge/http1_bridge_filter_test.cc | 2 +- test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc | 2 +- .../tracers/lightstep/lightstep_tracer_impl_test.cc | 2 +- test/integration/filters/eds_ready_filter.cc | 2 +- test/mocks/router/mocks.h | 2 +- test/mocks/server/instance.h | 2 +- test/mocks/stats/mocks.cc | 2 +- test/mocks/stats/mocks.h | 2 +- test/mocks/upstream/host.h | 2 +- test/test_common/utility.h | 2 +- test/tools/router_check/router.h | 2 +- 77 files changed, 78 insertions(+), 78 deletions(-) rename source/common/stats/{symbol_table_impl.cc => symbol_table.cc} (99%) rename source/common/stats/{symbol_table_impl.h => symbol_table.h} (100%) diff --git a/contrib/sip_proxy/filters/network/source/tra/stat_names.h b/contrib/sip_proxy/filters/network/source/tra/stat_names.h index dd0940fd394ed..4e73a107beeb6 100644 --- a/contrib/sip_proxy/filters/network/source/tra/stat_names.h +++ b/contrib/sip_proxy/filters/network/source/tra/stat_names.h @@ -1,6 +1,6 @@ #pragma once -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/envoy/server/proactive_resource_monitor.h b/envoy/server/proactive_resource_monitor.h index ee37ccf094fd5..f4d69aa832b57 100644 --- a/envoy/server/proactive_resource_monitor.h +++ b/envoy/server/proactive_resource_monitor.h @@ -7,7 +7,7 @@ #include "envoy/stats/stats.h" #include "source/common/common/assert.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Server { diff --git a/envoy/stats/stats_macros.h b/envoy/stats/stats_macros.h index 0cc6ee927472d..6ffca3ea0d118 100644 --- a/envoy/stats/stats_macros.h +++ b/envoy/stats/stats_macros.h @@ -5,7 +5,7 @@ #include "envoy/stats/histogram.h" #include "envoy/stats/stats.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "absl/strings/match.h" diff --git a/source/common/common/regex.h b/source/common/common/regex.h index e2aee56170abe..b3bacb319ea0a 100644 --- a/source/common/common/regex.h +++ b/source/common/common/regex.h @@ -9,7 +9,7 @@ #include "source/common/common/assert.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "re2/re2.h" #include "xds/type/matcher/v3/regex.pb.h" diff --git a/source/common/grpc/context_impl.h b/source/common/grpc/context_impl.h index 8cc073a46be4e..4729f68b14552 100644 --- a/source/common/grpc/context_impl.h +++ b/source/common/grpc/context_impl.h @@ -8,7 +8,7 @@ #include "source/common/common/hash.h" #include "source/common/grpc/stat_names.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "absl/types/optional.h" diff --git a/source/common/grpc/stat_names.h b/source/common/grpc/stat_names.h index 2c65f597aeea2..13d81c78893ca 100644 --- a/source/common/grpc/stat_names.h +++ b/source/common/grpc/stat_names.h @@ -2,7 +2,7 @@ #include "envoy/grpc/status.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/http/codes.h b/source/common/http/codes.h index d3f78ee16c03f..be8ef2776b08b 100644 --- a/source/common/http/codes.h +++ b/source/common/http/codes.h @@ -9,7 +9,7 @@ #include "envoy/stats/scope.h" #include "source/common/common/thread.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h index 45ceb107d5bf5..d0d9294ac63f7 100644 --- a/source/common/http/conn_manager_config.h +++ b/source/common/http/conn_manager_config.h @@ -13,7 +13,7 @@ #include "source/common/http/date_provider.h" #include "source/common/local_reply/local_reply.h" #include "source/common/network/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Http { diff --git a/source/common/http/user_agent.cc b/source/common/http/user_agent.cc index cf5e6746f7783..5a68f8fd7569c 100644 --- a/source/common/http/user_agent.cc +++ b/source/common/http/user_agent.cc @@ -9,7 +9,7 @@ #include "envoy/stats/timespan.h" #include "source/common/http/headers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" namespace Envoy { diff --git a/source/common/http/user_agent.h b/source/common/http/user_agent.h index 8cb482b556c36..f4bd4454e9263 100644 --- a/source/common/http/user_agent.h +++ b/source/common/http/user_agent.h @@ -10,7 +10,7 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/timespan.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Http { diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h index 8f5b3e5fba560..4e1ae360126b7 100644 --- a/source/common/local_info/local_info_impl.h +++ b/source/common/local_info/local_info_impl.h @@ -6,7 +6,7 @@ #include "envoy/local_info/local_info.h" #include "source/common/config/context_provider_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace LocalInfo { diff --git a/source/common/memory/heap_shrinker.cc b/source/common/memory/heap_shrinker.cc index 4cc3ea7c51319..0fe1cac2c20bf 100644 --- a/source/common/memory/heap_shrinker.cc +++ b/source/common/memory/heap_shrinker.cc @@ -1,7 +1,7 @@ #include "source/common/memory/heap_shrinker.h" #include "source/common/memory/utils.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/strings/str_cat.h" diff --git a/source/common/quic/quic_stat_names.h b/source/common/quic/quic_stat_names.h index 19abf6921f846..7385b2ff7905e 100644 --- a/source/common/quic/quic_stat_names.h +++ b/source/common/quic/quic_stat_names.h @@ -5,7 +5,7 @@ #include "envoy/stats/scope.h" #include "source/common/common/thread.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "quiche/quic/core/quic_error_codes.h" #include "quiche/quic/core/quic_types.h" @@ -50,7 +50,7 @@ class QuicStatNames { #else -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Quic { diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h index 3a2c683fd44e1..d65b2fe04d1c4 100644 --- a/source/common/router/config_impl.h +++ b/source/common/router/config_impl.h @@ -31,7 +31,7 @@ #include "source/common/router/metadatamatchcriteria_impl.h" #include "source/common/router/router_ratelimit.h" #include "source/common/router/tls_context_match_criteria_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/container/node_hash_map.h" #include "absl/types/optional.h" diff --git a/source/common/router/router.h b/source/common/router/router.h index 1ae8f0197bc3c..9c9ae021574c2 100644 --- a/source/common/router/router.h +++ b/source/common/router/router.h @@ -34,7 +34,7 @@ #include "source/common/router/config_impl.h" #include "source/common/router/context_impl.h" #include "source/common/router/upstream_request.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stream_info/stream_info_impl.h" #include "source/common/upstream/load_balancer_impl.h" diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD index a9e2039ff42fe..5dabf51657c15 100644 --- a/source/common/stats/BUILD +++ b/source/common/stats/BUILD @@ -187,8 +187,8 @@ envoy_cc_library( envoy_cc_library( name = "symbol_table_lib", - srcs = ["symbol_table_impl.cc"], - hdrs = ["symbol_table_impl.h"], + srcs = ["symbol_table.cc"], + hdrs = ["symbol_table.h"], external_deps = [ "abseil_base", "abseil_inlined_vector", diff --git a/source/common/stats/allocator_impl.cc b/source/common/stats/allocator_impl.cc index b61e079c7c7c9..8980ccc883370 100644 --- a/source/common/stats/allocator_impl.cc +++ b/source/common/stats/allocator_impl.cc @@ -14,7 +14,7 @@ #include "source/common/common/utility.h" #include "source/common/stats/metric_impl.h" #include "source/common/stats/stat_merger.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/stats/isolated_store_impl.h b/source/common/stats/isolated_store_impl.h index 879648189977d..f272989c677b0 100644 --- a/source/common/stats/isolated_store_impl.h +++ b/source/common/stats/isolated_store_impl.h @@ -13,7 +13,7 @@ #include "source/common/stats/null_counter.h" #include "source/common/stats/null_gauge.h" #include "source/common/stats/store_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/tag_utility.h" #include "source/common/stats/utility.h" diff --git a/source/common/stats/metric_impl.cc b/source/common/stats/metric_impl.cc index 7a43ce886e3e5..7aa757481385c 100644 --- a/source/common/stats/metric_impl.cc +++ b/source/common/stats/metric_impl.cc @@ -2,7 +2,7 @@ #include "envoy/stats/tag.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/metric_impl.h b/source/common/stats/metric_impl.h index e188f1abe7942..28d23c6aceb47 100644 --- a/source/common/stats/metric_impl.h +++ b/source/common/stats/metric_impl.h @@ -8,7 +8,7 @@ #include "envoy/stats/tag.h" #include "source/common/common/assert.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/scope_prefixer.cc b/source/common/stats/scope_prefixer.cc index cbe4c3b1c45e6..549172379349d 100644 --- a/source/common/stats/scope_prefixer.cc +++ b/source/common/stats/scope_prefixer.cc @@ -2,7 +2,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" namespace Envoy { diff --git a/source/common/stats/scope_prefixer.h b/source/common/stats/scope_prefixer.h index 8d4f6ee19cc6d..bb3d1620489cf 100644 --- a/source/common/stats/scope_prefixer.h +++ b/source/common/stats/scope_prefixer.h @@ -2,7 +2,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/stat_merger.h b/source/common/stats/stat_merger.h index 3a9fb6c3093fd..04bf7abdb977c 100644 --- a/source/common/stats/stat_merger.h +++ b/source/common/stats/stat_merger.h @@ -3,7 +3,7 @@ #include "envoy/stats/store.h" #include "source/common/protobuf/protobuf.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/stats/stats_matcher_impl.h b/source/common/stats/stats_matcher_impl.h index a0d3a085cc3fb..dcd84b087794e 100644 --- a/source/common/stats/stats_matcher_impl.h +++ b/source/common/stats/stats_matcher_impl.h @@ -8,7 +8,7 @@ #include "source/common/common/matchers.h" #include "source/common/protobuf/protobuf.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/strings/string_view.h" diff --git a/source/common/stats/store_impl.h b/source/common/stats/store_impl.h index e4de8fe918b20..9716985f83003 100644 --- a/source/common/stats/store_impl.h +++ b/source/common/stats/store_impl.h @@ -3,7 +3,7 @@ #include "envoy/stats/stats.h" #include "envoy/stats/store.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/symbol_table_impl.cc b/source/common/stats/symbol_table.cc similarity index 99% rename from source/common/stats/symbol_table_impl.cc rename to source/common/stats/symbol_table.cc index a2b2d00fd3a60..6936300389b11 100644 --- a/source/common/stats/symbol_table_impl.cc +++ b/source/common/stats/symbol_table.cc @@ -1,4 +1,4 @@ -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include #include diff --git a/source/common/stats/symbol_table_impl.h b/source/common/stats/symbol_table.h similarity index 100% rename from source/common/stats/symbol_table_impl.h rename to source/common/stats/symbol_table.h diff --git a/source/common/stats/tag_utility.cc b/source/common/stats/tag_utility.cc index 550bdf81180bf..0ff1fa43597d6 100644 --- a/source/common/stats/tag_utility.cc +++ b/source/common/stats/tag_utility.cc @@ -3,7 +3,7 @@ #include #include "source/common/config/well_known_names.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/tag_utility.h b/source/common/stats/tag_utility.h index 04593c687d4fb..e071786022da6 100644 --- a/source/common/stats/tag_utility.h +++ b/source/common/stats/tag_utility.h @@ -2,7 +2,7 @@ #include "envoy/stats/tag.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/thread_local_store.h b/source/common/stats/thread_local_store.h index e7e973cd6acc7..535ac80e07ab4 100644 --- a/source/common/stats/thread_local_store.h +++ b/source/common/stats/thread_local_store.h @@ -17,7 +17,7 @@ #include "source/common/stats/null_counter.h" #include "source/common/stats/null_gauge.h" #include "source/common/stats/null_text_readout.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/stats/utility.h b/source/common/stats/utility.h index 5ada272e3bb45..01d204ed4e6d2 100644 --- a/source/common/stats/utility.h +++ b/source/common/stats/utility.h @@ -6,7 +6,7 @@ #include "envoy/stats/stats.h" #include "source/common/common/thread.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" diff --git a/source/exe/main_common.h b/source/exe/main_common.h index a393c841e8b3a..7c684fab2ee3c 100644 --- a/source/exe/main_common.h +++ b/source/exe/main_common.h @@ -7,7 +7,7 @@ #include "source/common/common/thread.h" #include "source/common/event/real_time_system.h" #include "source/common/grpc/google_grpc_context.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/thread_local_store.h" #include "source/common/thread_local/thread_local_impl.h" #include "source/exe/process_wide.h" diff --git a/source/extensions/common/wasm/stats_handler.h b/source/extensions/common/wasm/stats_handler.h index ad03f3c118209..01e3e4ae30aaa 100644 --- a/source/extensions/common/wasm/stats_handler.h +++ b/source/extensions/common/wasm/stats_handler.h @@ -8,7 +8,7 @@ #include "envoy/upstream/cluster_manager.h" #include "source/common/common/logger.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/wasm/wasm.h b/source/extensions/common/wasm/wasm.h index cc0de5d908211..04d5338407c1b 100644 --- a/source/extensions/common/wasm/wasm.h +++ b/source/extensions/common/wasm/wasm.h @@ -17,7 +17,7 @@ #include "source/common/common/assert.h" #include "source/common/common/logger.h" #include "source/common/config/datasource.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/version/version.h" #include "source/extensions/common/wasm/context.h" #include "source/extensions/common/wasm/plugin.h" diff --git a/source/extensions/filters/common/ratelimit/stat_names.h b/source/extensions/filters/common/ratelimit/stat_names.h index 45161fe43d44e..65a8b0614d5df 100644 --- a/source/extensions/filters/common/ratelimit/stat_names.h +++ b/source/extensions/filters/common/ratelimit/stat_names.h @@ -1,6 +1,6 @@ #pragma once -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.cc b/source/extensions/filters/http/dynamo/dynamo_stats.cc index ba0e5d9355389..148e9a2ec2afb 100644 --- a/source/extensions/filters/http/dynamo/dynamo_stats.cc +++ b/source/extensions/filters/http/dynamo/dynamo_stats.cc @@ -5,7 +5,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" namespace Envoy { diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.h b/source/extensions/filters/http/dynamo/dynamo_stats.h index 78bd72c728035..772b44c80f01a 100644 --- a/source/extensions/filters/http/dynamo/dynamo_stats.h +++ b/source/extensions/filters/http/dynamo/dynamo_stats.h @@ -5,7 +5,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" namespace Envoy { diff --git a/source/extensions/filters/http/fault/fault_filter.h b/source/extensions/filters/http/fault/fault_filter.h index 1d8fea719ca48..2fe00acb05f87 100644 --- a/source/extensions/filters/http/fault/fault_filter.h +++ b/source/extensions/filters/http/fault/fault_filter.h @@ -16,7 +16,7 @@ #include "source/common/buffer/watermark_buffer.h" #include "source/common/common/token_bucket_impl.h" #include "source/common/http/header_utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/common/fault/fault_config.h" #include "source/extensions/filters/http/common/stream_rate_limiter.h" diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc index 3e604ddf1f4f4..2e0fe1bd76d73 100644 --- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc +++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc @@ -8,7 +8,7 @@ #include "source/common/grpc/common.h" #include "source/common/grpc/context_impl.h" #include "source/common/runtime/runtime_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stream_info/utility.h" #include "source/extensions/filters/http/common/pass_through_filter.h" diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h index 3753122a3dff5..a7db4da855284 100644 --- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h +++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h @@ -14,7 +14,7 @@ #include "source/common/network/cidr_range.h" #include "source/common/network/lc_trie.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/redis_command_stats.h b/source/extensions/filters/network/common/redis/redis_command_stats.h index fd80c5ac850c5..f4ce6b5192917 100644 --- a/source/extensions/filters/network/common/redis/redis_command_stats.h +++ b/source/extensions/filters/network/common/redis/redis_command_stats.h @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/timespan.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/network/common/redis/codec.h" namespace Envoy { diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc index fd362d35af42b..95172aa762e3e 100644 --- a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc +++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.h b/source/extensions/filters/network/mongo_proxy/mongo_stats.h index 5dee147145997..127451e5cc29a 100644 --- a/source/extensions/filters/network/mongo_proxy/mongo_stats.h +++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.h @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" namespace Envoy { diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h index d796044555e54..75fb2260e2cae 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h @@ -9,7 +9,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/common/ratelimit/ratelimit.h" #include "source/extensions/filters/common/ratelimit/stat_names.h" #include "source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h" diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.h b/source/extensions/filters/network/zookeeper_proxy/filter.h index 46c4f0ea8da31..33c0af256d8fb 100644 --- a/source/extensions/filters/network/zookeeper_proxy/filter.h +++ b/source/extensions/filters/network/zookeeper_proxy/filter.h @@ -12,7 +12,7 @@ #include "envoy/stats/stats_macros.h" #include "source/common/common/logger.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/network/zookeeper_proxy/decoder.h" namespace Envoy { diff --git a/source/extensions/stat_sinks/common/statsd/statsd.cc b/source/extensions/stat_sinks/common/statsd/statsd.cc index a69733b87b589..e661e326b2c4d 100644 --- a/source/extensions/stat_sinks/common/statsd/statsd.cc +++ b/source/extensions/stat_sinks/common/statsd/statsd.cc @@ -19,7 +19,7 @@ #include "source/common/config/utility.h" #include "source/common/network/socket_interface.h" #include "source/common/network/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/stat_sinks/hystrix/hystrix.h b/source/extensions/stat_sinks/hystrix/hystrix.h index 97c5b2b2e7f54..ab2502d762eea 100644 --- a/source/extensions/stat_sinks/hystrix/hystrix.h +++ b/source/extensions/stat_sinks/hystrix/hystrix.h @@ -9,7 +9,7 @@ #include "envoy/stats/histogram.h" #include "envoy/stats/sink.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h index 6c7c131245a7f..ad482e3510560 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h @@ -15,7 +15,7 @@ #include "source/common/http/message_impl.h" #include "source/common/json/json_loader.h" #include "source/common/protobuf/protobuf.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/upstream/cluster_update_tracker.h" #include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h index efec7cb3aa4e3..5e0f589b4890c 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h @@ -14,7 +14,7 @@ #include "envoy/ssl/ssl_socket_extended_info.h" #include "source/common/common/matchers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/stats.h" #include "openssl/ssl.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc index 93bbe8b17a041..3b28200b73abc 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc @@ -22,7 +22,7 @@ #include "source/common/network/address_impl.h" #include "source/common/protobuf/utility.h" #include "source/common/runtime/runtime_features.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" #include "source/extensions/transport_sockets/tls/cert_validator/factory.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h index 64f52bc38728f..2cea2782f0349 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h @@ -17,7 +17,7 @@ #include "source/common/common/logger.h" #include "source/common/common/matchers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" #include "source/extensions/transport_sockets/tls/cert_validator/san_matcher.h" #include "source/extensions/transport_sockets/tls/stats.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc index c3b8d338fcae3..00bd8f86eedca 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc @@ -10,7 +10,7 @@ #include "source/common/config/datasource.h" #include "source/common/config/utility.h" #include "source/common/protobuf/message_validator_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/cert_validator/factory.h" #include "source/extensions/transport_sockets/tls/cert_validator/utility.h" #include "source/extensions/transport_sockets/tls/stats.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h index 669d77aec7d05..8fe7a213e0de0 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h @@ -15,7 +15,7 @@ #include "source/common/common/c_smart_ptr.h" #include "source/common/common/matchers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" #include "source/extensions/transport_sockets/tls/cert_validator/san_matcher.h" #include "source/extensions/transport_sockets/tls/stats.h" diff --git a/source/extensions/transport_sockets/tls/context_impl.h b/source/extensions/transport_sockets/tls/context_impl.h index 0107a88ec6fac..8b607018d88cc 100644 --- a/source/extensions/transport_sockets/tls/context_impl.h +++ b/source/extensions/transport_sockets/tls/context_impl.h @@ -15,7 +15,7 @@ #include "envoy/stats/stats_macros.h" #include "source/common/common/matchers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" #include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "source/extensions/transport_sockets/tls/ocsp/ocsp.h" diff --git a/source/extensions/watchdog/profile_action/profile_action.cc b/source/extensions/watchdog/profile_action/profile_action.cc index 3f0e556a3cdeb..f010bcd007922 100644 --- a/source/extensions/watchdog/profile_action/profile_action.cc +++ b/source/extensions/watchdog/profile_action/profile_action.cc @@ -6,7 +6,7 @@ #include "source/common/profiler/profiler.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "absl/strings/str_format.h" diff --git a/source/server/guarddog_impl.cc b/source/server/guarddog_impl.cc index cfc8256d54200..13373b080cb53 100644 --- a/source/server/guarddog_impl.cc +++ b/source/server/guarddog_impl.cc @@ -21,7 +21,7 @@ #include "source/common/common/logger.h" #include "source/common/config/utility.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/server/watchdog_impl.h" #include "absl/synchronization/mutex.h" diff --git a/source/server/hot_restarting_parent.cc b/source/server/hot_restarting_parent.cc index fab51c4fc7b53..b18af67b97be6 100644 --- a/source/server/hot_restarting_parent.cc +++ b/source/server/hot_restarting_parent.cc @@ -5,7 +5,7 @@ #include "source/common/memory/stats.h" #include "source/common/network/utility.h" #include "source/common/stats/stat_merger.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "source/server/listener_impl.h" diff --git a/source/server/overload_manager_impl.cc b/source/server/overload_manager_impl.cc index 4a274c145e1ba..34a9c2b45df18 100644 --- a/source/server/overload_manager_impl.cc +++ b/source/server/overload_manager_impl.cc @@ -11,7 +11,7 @@ #include "source/common/config/utility.h" #include "source/common/event/scaled_range_timer_manager_impl.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/server/resource_monitor_config_impl.h" #include "absl/container/node_hash_map.h" diff --git a/test/common/grpc/context_impl_test.cc b/test/common/grpc/context_impl_test.cc index f95307ef42787..acc6bc1ada4c4 100644 --- a/test/common/grpc/context_impl_test.cc +++ b/test/common/grpc/context_impl_test.cc @@ -5,7 +5,7 @@ #include "source/common/http/headers.h" #include "source/common/http/message_impl.h" #include "source/common/http/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "test/mocks/upstream/cluster_info.h" diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h index 99808db5ab8b1..f03caff22fecc 100644 --- a/test/common/grpc/grpc_client_integration_test_harness.h +++ b/test/common/grpc/grpc_client_integration_test_harness.h @@ -23,7 +23,7 @@ #include "source/common/network/connection_impl.h" #include "source/common/network/raw_buffer_socket.h" #include "source/common/router/context_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/context_config_impl.h" #include "source/extensions/transport_sockets/tls/ssl_socket.h" diff --git a/test/common/http/codes_speed_test.cc b/test/common/http/codes_speed_test.cc index fc1d5f4ffac3d..aba98a08dd658 100644 --- a/test/common/http/codes_speed_test.cc +++ b/test/common/http/codes_speed_test.cc @@ -10,7 +10,7 @@ #include "source/common/http/codes.h" #include "source/common/stats/isolated_store_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "benchmark/benchmark.h" diff --git a/test/common/stats/symbol_table_fuzz_test.cc b/test/common/stats/symbol_table_fuzz_test.cc index cab1bda492c27..48c65300c948e 100644 --- a/test/common/stats/symbol_table_fuzz_test.cc +++ b/test/common/stats/symbol_table_fuzz_test.cc @@ -2,7 +2,7 @@ #include "source/common/common/assert.h" #include "source/common/common/base64.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "test/common/stats/stat_test_utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/stats/symbol_table_impl_test.cc b/test/common/stats/symbol_table_impl_test.cc index ee76b37a3c373..e74b52a806077 100644 --- a/test/common/stats/symbol_table_impl_test.cc +++ b/test/common/stats/symbol_table_impl_test.cc @@ -3,7 +3,7 @@ #include "source/common/common/macros.h" #include "source/common/common/mutex_tracer_impl.h" #include "source/common/memory/stats.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/logging.h" diff --git a/test/common/stats/symbol_table_speed_test.cc b/test/common/stats/symbol_table_speed_test.cc index 40cc5d11cb55b..e4dc22731ff72 100644 --- a/test/common/stats/symbol_table_speed_test.cc +++ b/test/common/stats/symbol_table_speed_test.cc @@ -7,7 +7,7 @@ #include "source/common/common/logger.h" #include "source/common/common/thread.h" #include "source/common/stats/isolated_store_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/utility.h" #include "test/common/stats/make_elements_helper.h" diff --git a/test/common/stats/thread_local_store_speed_test.cc b/test/common/stats/thread_local_store_speed_test.cc index 620af46c698ab..5ea5e73b6e483 100644 --- a/test/common/stats/thread_local_store_speed_test.cc +++ b/test/common/stats/thread_local_store_speed_test.cc @@ -8,7 +8,7 @@ #include "source/common/event/dispatcher_impl.h" #include "source/common/stats/allocator_impl.h" #include "source/common/stats/stats_matcher_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/tag_producer_impl.h" #include "source/common/stats/thread_local_store.h" #include "source/common/thread_local/thread_local_impl.h" diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc index edb0faa12d40f..963c689b0a804 100644 --- a/test/common/stats/thread_local_store_test.cc +++ b/test/common/stats/thread_local_store_test.cc @@ -12,7 +12,7 @@ #include "source/common/event/dispatcher_impl.h" #include "source/common/memory/stats.h" #include "source/common/stats/stats_matcher_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/tag_producer_impl.h" #include "source/common/stats/thread_local_store.h" #include "source/common/thread_local/thread_local_impl.h" diff --git a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc index 45045ed8a0c47..a1b82e84016d1 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc +++ b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc @@ -4,7 +4,7 @@ #include "source/common/grpc/codec.h" #include "source/common/grpc/common.h" #include "source/common/http/header_map_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/http/grpc_http1_bridge/config.h" #include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc index 561484f56d0d4..5d22c3ae37e5f 100644 --- a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc +++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc @@ -8,7 +8,7 @@ #include "source/common/http/codes.h" #include "source/common/http/header_map_impl.h" #include "source/common/http/headers.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/http/grpc_web/grpc_web_filter.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc index 5fce7e07e4d58..162e8534be470 100644 --- a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc +++ b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc @@ -11,7 +11,7 @@ #include "source/common/http/headers.h" #include "source/common/http/message_impl.h" #include "source/common/runtime/runtime_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/tracing/http_tracer_impl.h" #include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h" diff --git a/test/integration/filters/eds_ready_filter.cc b/test/integration/filters/eds_ready_filter.cc index 4c78e2e5fa43d..10fa6c2136b04 100644 --- a/test/integration/filters/eds_ready_filter.cc +++ b/test/integration/filters/eds_ready_filter.cc @@ -6,7 +6,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h index 80cc62719e1ed..ef9a74b61311f 100644 --- a/test/mocks/router/mocks.h +++ b/test/mocks/router/mocks.h @@ -30,7 +30,7 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/global.h" diff --git a/test/mocks/server/instance.h b/test/mocks/server/instance.h index c208614218726..b9967e58c3e17 100644 --- a/test/mocks/server/instance.h +++ b/test/mocks/server/instance.h @@ -6,7 +6,7 @@ #include "source/common/http/context_impl.h" #include "source/common/quic/quic_stat_names.h" #include "source/common/router/context_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc index 6ed277eed2fd1..9de8bd4f6f8bd 100644 --- a/test/mocks/stats/mocks.cc +++ b/test/mocks/stats/mocks.cc @@ -2,7 +2,7 @@ #include -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/stats/mocks.h b/test/mocks/stats/mocks.h index 42837995662a5..6bd20eec8bf9c 100644 --- a/test/mocks/stats/mocks.h +++ b/test/mocks/stats/mocks.h @@ -18,7 +18,7 @@ #include "source/common/stats/histogram_impl.h" #include "source/common/stats/isolated_store_impl.h" #include "source/common/stats/store_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stats/timespan_impl.h" #include "test/common/stats/stat_test_utility.h" diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h index 21eea638773fc..edf02aab76f8d 100644 --- a/test/mocks/upstream/host.h +++ b/test/mocks/upstream/host.h @@ -9,7 +9,7 @@ #include "envoy/data/cluster/v3/outlier_detection_event.pb.h" #include "envoy/upstream/upstream.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "test/mocks/network/transport_socket.h" #include "test/mocks/upstream/cluster_info.h" diff --git a/test/test_common/utility.h b/test/test_common/utility.h index 545fcbe17edb5..2b657d2d2b01b 100644 --- a/test/test_common/utility.h +++ b/test/test_common/utility.h @@ -24,7 +24,7 @@ #include "source/common/http/header_map_impl.h" #include "source/common/protobuf/message_validator_impl.h" #include "source/common/protobuf/utility.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "test/test_common/file_system_for_test.h" #include "test/test_common/logging.h" diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index 3624efcb9cc4f..1ab9ae97bf0c2 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -12,7 +12,7 @@ #include "source/common/http/headers.h" #include "source/common/json/json_loader.h" #include "source/common/router/config_impl.h" -#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table.h" #include "source/common/stream_info/stream_info_impl.h" #include "test/mocks/server/instance.h" From c8c4070832a9163d96d0bf50b29950dbbf342e0b Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Wed, 2 Feb 2022 14:44:30 -0500 Subject: [PATCH 3/8] rename file Signed-off-by: Joshua Marantz --- source/docs/stats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/docs/stats.md b/source/docs/stats.md index 54d8b13053184..97e42e5bcd4c7 100644 --- a/source/docs/stats.md +++ b/source/docs/stats.md @@ -272,7 +272,7 @@ Developers trying to can iterate through changes in these tests locally with: If you are visiting this section because you saw a message like: ```bash -[...][16][critical][assert] [source/common/stats/symbol_table_impl.cc:251] assert failure: +[...][16][critical][assert] [source/common/stats/symbol_table.cc:341] assert failure: decode_search != decode_map_.end(). Details: Please see https://github.com/envoyproxy/envoy/blob/main/source/docs/stats.md#debugging-symbol-table-assertions ``` From 41f5d4c02397d8ab8bf6b888c9730e91cd5153b8 Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Wed, 2 Feb 2022 23:34:58 -0500 Subject: [PATCH 4/8] attempt to disable clang-tidy error. Signed-off-by: Joshua Marantz --- source/common/common/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/common/hash.h b/source/common/common/hash.h index 2c9fb22e777c8..276f42b9acb62 100644 --- a/source/common/common/hash.h +++ b/source/common/common/hash.h @@ -10,7 +10,7 @@ #include "absl/strings/ascii.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "xxhash.h" +#include "xxhash.h" // NOLINT(clang-diagnostic-error) -- clang-tidy can't find this file. namespace Envoy { From aab0c86803377c1b414546cf5418c03fe4dc7ffc Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Thu, 3 Feb 2022 12:37:55 -0500 Subject: [PATCH 5/8] backout ineffective NOLINT hack Signed-off-by: Joshua Marantz --- source/common/common/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/common/hash.h b/source/common/common/hash.h index 276f42b9acb62..2c9fb22e777c8 100644 --- a/source/common/common/hash.h +++ b/source/common/common/hash.h @@ -10,7 +10,7 @@ #include "absl/strings/ascii.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "xxhash.h" // NOLINT(clang-diagnostic-error) -- clang-tidy can't find this file. +#include "xxhash.h" namespace Envoy { From 5e4adf13b0c3e65665b63dd3f4440ed681d61583 Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Thu, 3 Feb 2022 13:20:05 -0500 Subject: [PATCH 6/8] remove superfluous include of hash.h, which was also not declared as a dependency. Signed-off-by: Joshua Marantz --- source/common/stats/symbol_table.h | 1 - 1 file changed, 1 deletion(-) diff --git a/source/common/stats/symbol_table.h b/source/common/stats/symbol_table.h index 71baef0b74acf..cbead07a89cd1 100644 --- a/source/common/stats/symbol_table.h +++ b/source/common/stats/symbol_table.h @@ -7,7 +7,6 @@ #include #include "source/common/common/assert.h" -#include "source/common/common/hash.h" #include "source/common/common/lock_guard.h" #include "source/common/common/mem_block_builder.h" #include "source/common/common/non_copyable.h" From 0e8a047ce191ed9c87c9c88e2119c1ba2fce6c83 Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Thu, 3 Feb 2022 13:34:45 -0500 Subject: [PATCH 7/8] remove superfluous include. Signed-off-by: Joshua Marantz --- envoy/server/proactive_resource_monitor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/envoy/server/proactive_resource_monitor.h b/envoy/server/proactive_resource_monitor.h index f4d69aa832b57..2558e16cf9f74 100644 --- a/envoy/server/proactive_resource_monitor.h +++ b/envoy/server/proactive_resource_monitor.h @@ -7,7 +7,6 @@ #include "envoy/stats/stats.h" #include "source/common/common/assert.h" -#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Server { From e0f84258c3b1c26c2e9337d121a54b3bb52575be Mon Sep 17 00:00:00 2001 From: Joshua Marantz Date: Thu, 3 Feb 2022 14:05:04 -0500 Subject: [PATCH 8/8] more dependency cleaning Signed-off-by: Joshua Marantz --- envoy/server/BUILD | 2 +- envoy/server/proactive_resource_monitor.h | 1 + source/common/common/utility.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/envoy/server/BUILD b/envoy/server/BUILD index bd34c1e8e5fdf..fa77bc7642dba 100644 --- a/envoy/server/BUILD +++ b/envoy/server/BUILD @@ -298,7 +298,7 @@ envoy_cc_library( name = "proactive_resource_monitor_interface", hdrs = ["proactive_resource_monitor.h"], deps = [ - "//envoy/stats:stats_interface", + "//source/common/stats:symbol_table_lib", ], ) diff --git a/envoy/server/proactive_resource_monitor.h b/envoy/server/proactive_resource_monitor.h index 2558e16cf9f74..f4d69aa832b57 100644 --- a/envoy/server/proactive_resource_monitor.h +++ b/envoy/server/proactive_resource_monitor.h @@ -7,6 +7,7 @@ #include "envoy/stats/stats.h" #include "source/common/common/assert.h" +#include "source/common/stats/symbol_table.h" namespace Envoy { namespace Server { diff --git a/source/common/common/utility.h b/source/common/common/utility.h index 8fef9576901b0..fe5f361d83dfd 100644 --- a/source/common/common/utility.h +++ b/source/common/common/utility.h @@ -15,6 +15,8 @@ #include "source/common/common/hash.h" #include "source/common/common/non_copyable.h" +#include "absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" namespace Envoy {