Skip to content

Pass stats update interval #945

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
istio-merge-robot merged 5 commits into from
Jan 25, 2018
Merged

Pass stats update interval #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
215f37c
Pass stats update interval from config to MixerStatsObject.
JimmyCYJ Jan 24, 2018
c16da81
Add header file.
JimmyCYJ Jan 24, 2018
5829aa4
.
JimmyCYJ Jan 24, 2018
d1a2879
Minor comment update.
JimmyCYJ Jan 24, 2018
06eaf77
Merge branch 'master' into pass-stats-update-interval
JimmyCYJ Jan 24, 2018
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
19 changes: 11 additions & 8 deletions src/envoy/mixer/mixer_control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,16 @@ HttpMixerControl::HttpMixerControl(const HttpMixerConfig& mixer_config,
Runtime::RandomGenerator& random,
Stats::Scope& scope)
: cm_(cm),
stats_obj_(dispatcher, kHttpStatsPrefix, scope,
[this](Statistics* stat) -> bool {
if (!controller_) {
return false;
}
controller_->GetStatistics(stat);
return true;
}) {
stats_obj_(
dispatcher, kHttpStatsPrefix, scope,
mixer_config.http_config.transport().stats_update_interval_ms(),
[this](Statistics* stat) -> bool {
if (!controller_) {
return false;
}
controller_->GetStatistics(stat);
return true;
}) {
::istio::mixer_control::http::Controller::Options options(
mixer_config.http_config, mixer_config.legacy_quotas);

Expand All @@ -91,6 +93,7 @@ TcpMixerControl::TcpMixerControl(const TcpMixerConfig& mixer_config,
Runtime::RandomGenerator& random,
Stats::Scope& scope)
: stats_obj_(dispatcher, kTcpStatsPrefix, scope,
mixer_config.tcp_config.transport().stats_update_interval_ms(),
[this](Statistics* stat) -> bool {
if (!controller_) {
return false;
Expand Down
7 changes: 5 additions & 2 deletions src/envoy/mixer/stats.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ const int kStatsUpdateIntervalInMs = 10000;

MixerStatsObject::MixerStatsObject(Event::Dispatcher& dispatcher,
const std::string& name, Stats::Scope& scope,
GetStatsFunc func)
int update_interval_ms, GetStatsFunc func)
: stats_{ALL_MIXER_FILTER_STATS(POOL_COUNTER_PREFIX(scope, name))},
get_stats_func_(func) {
memset(&old_stats_, 0, sizeof(old_stats_));

// If stats update interval from config is 0, then set interval to 10 seconds.
int stats_update_interval =
update_interval_ms > 0 ? update_interval_ms : kStatsUpdateIntervalInMs;
if (get_stats_func_) {
timer_ = dispatcher.createTimer([this]() { OnTimer(); });
timer_->enableTimer(std::chrono::milliseconds(kStatsUpdateIntervalInMs));
timer_->enableTimer(std::chrono::milliseconds(stats_update_interval));
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/envoy/mixer/stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ typedef std::function<bool(::istio::mixer_client::Statistics* s)> GetStatsFunc;
class MixerStatsObject {
public:
MixerStatsObject(Event::Dispatcher& dispatcher, const std::string& name,
Stats::Scope& scope, GetStatsFunc func);
Stats::Scope& scope, int update_interval_ms,
GetStatsFunc func);

private:
// This function is invoked when timer event fires.
Expand Down