Skip to content

stats: remove const-cast for symbol-table in edcs_filter_test.cc #7045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 9 commits into from
May 23, 2019
+5 −6
Merged

stats: remove const-cast for symbol-table in edcs_filter_test.cc #7045

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b1b5d9f
Improve test coverage by adding tests and small refactors to share mo…
jmarantz May 22, 2019
c551dfc
fix reference to const symbol table, whose accessor changed names.
jmarantz May 22, 2019
2e70745
Merge branch 'master' into stats-coverage
jmarantz May 22, 2019
1dc9df9
Add comments and improve variable-naming. Remove TODO that appeared n…
jmarantz May 22, 2019
be758d1
spelling
jmarantz May 22, 2019
bd55f79
Merge branch 'master' into stats-coverage
jmarantz May 22, 2019
4bf6824
Remove const_cast by passing in non-const symbol table from filter sc…
jmarantz May 22, 2019
f78aed3
Merge branch 'master' into eds-filter-cleanup
jmarantz May 22, 2019
a084921
format
jmarantz May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions test/integration/filters/eds_ready_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ namespace Envoy {
// responds OK to all requests if it is.
class EdsReadyFilter : public Http::PassThroughFilter {
public:
EdsReadyFilter(const Stats::Scope& root_scope)
: root_scope_(root_scope),
stat_name_("cluster.cluster_0.membership_healthy",
const_cast<Stats::SymbolTable&>(root_scope_.constSymbolTable())) {}
EdsReadyFilter(const Stats::Scope& root_scope, Stats::SymbolTable& symbol_table)
: root_scope_(root_scope), stat_name_("cluster.cluster_0.membership_healthy", symbol_table) {}
Http::FilterHeadersStatus decodeHeaders(Http::HeaderMap&, bool) override {
absl::optional<std::reference_wrapper<const Stats::Gauge>> gauge =
root_scope_.findGauge(stat_name_.statName());
Expand Down Expand Up @@ -52,8 +50,9 @@ class EdsReadyFilterConfig : public Extensions::HttpFilters::Common::EmptyHttpFi
createFilter(const std::string&,
Server::Configuration::FactoryContext& factory_context) override {
return [&factory_context](Http::FilterChainFactoryCallbacks& callbacks) {
callbacks.addStreamFilter(
std::make_shared<EdsReadyFilter>(factory_context.api().rootScope()));
const Stats::Scope& scope = factory_context.api().rootScope();
Stats::SymbolTable& symbol_table = factory_context.scope().symbolTable();
callbacks.addStreamFilter(std::make_shared<EdsReadyFilter>(scope, symbol_table));
};
}
};
Expand Down