Skip to content

stats: Add a new Counter Group metric type #16535

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

Closed
RyanTheOptimist wants to merge 17 commits into from
Closed

stats: Add a new Counter Group metric type #16535

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
142f5ff
Add a new type of metric, a CounterGroup, to represent a group of rel…
RyanTheOptimist May 17, 2021
a458c83
Rename
RyanTheOptimist May 17, 2021
9ceac2f
Done?
RyanTheOptimist May 17, 2021
53c26d6
format
RyanTheOptimist May 17, 2021
2f3c7e9
Fix comments from jmarantz
RyanTheOptimist May 18, 2021
8a1a56c
Merge branch 'main' into CounterGroup
RyanTheOptimist Jun 4, 2021
3699471
Fix build issues post-merge
RyanTheOptimist Jun 4, 2021
ae938ac
Descriptor
RyanTheOptimist Jun 4, 2021
ab4bb65
Descriptor
RyanTheOptimist Jun 4, 2021
e5f3799
Fix
RyanTheOptimist Jun 4, 2021
96b7bb5
format
RyanTheOptimist Jun 4, 2021
857a05f
Stats integration test
RyanTheOptimist Jun 7, 2021
5f66fc4
Address comments from jmarantz
RyanTheOptimist Jun 7, 2021
f07a458
Format
RyanTheOptimist Jun 7, 2021
6fb2b39
Merge branch 'main' into CounterGroup
RyanTheOptimist Jun 17, 2021
a1638b2
Memory usage tests
RyanTheOptimist Jun 18, 2021
46a6771
Use _LE in tests
RyanTheOptimist Jun 18, 2021
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
3 changes: 2 additions & 1 deletion envoy/router/router.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,8 @@ using ShadowPolicyPtr = std::unique_ptr<ShadowPolicy>;
/**
* All virtual cluster stats. @see stats_macro.h
*/
#define ALL_VIRTUAL_CLUSTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_VIRTUAL_CLUSTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUP, \
STATNAME) \
COUNTER(upstream_rq_retry) \
COUNTER(upstream_rq_retry_limit_exceeded) \
COUNTER(upstream_rq_retry_overflow) \
Expand Down
12 changes: 12 additions & 0 deletions envoy/stats/allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ class Allocator {
*/
virtual TextReadoutSharedPtr makeTextReadout(StatName name, StatName tag_extracted_name,
const StatNameTagVector& stat_name_tags) PURE;

/**
* @param name the full name of the group.
* @param tag_extracted_name the name of the stat with tag-values stripped out.
* @param tags the tag values.
* @param descriptor the maximum number of entries in the group.
* @return CounterSharedPtr a counter.
*/
virtual CounterGroupSharedPtr makeCounterGroup(StatName name, StatName tag_extracted_name,
const StatNameTagVector& stat_name_tags,
CounterGroupDescriptorSharedPtr descriptor) PURE;

@jmarantz jmarantz Jun 21, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about the usage model, I'm wondering where. the descriptors will come from.

I think it's probably OK to be unopinionated at this level. You could have the caller create a descriptor and then make a CounterGroup from that.

However what we want to avoid is having multiple copies of the same group, or you lose the benefit of memory savings.

If you leave this in the hands of the caller, I'm wondering whether (eg) Quic will have an appropriate context that is instantiated once per process, in which these descriptors can be explicitly instantiated and referenced. That would in some sense be ideal.

However if Quic (or other possible use-cases for this) doesn't have such a context, we might want to delegate the management of the descriptors to the Stats::Allocator. In that case, we could provide Stats::Allocator::makeCounterGroupDescriptor(...) which would take a string-list and return a canonical descriptor for that. That would need to take a lock on a the allocator's descriptor-cache, and hopefully that would not be overly contended.

Maybe this is worth a TODO here in allocator.h? WDYT?

@RyanTheOptimist RyanTheOptimist Jun 25, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My idea was that we'd have a global function like:

CounterGroupDescriptorSharedPtr getQuicCounterGroupDescriptor() {
  static CounterGroupDescriptorSharedPtr descriptor = std::make_shared<CounterGroupDescriptorImpl>({"foo", "bar", "baz"});
  return descriptor;
}

This way we allocate a single descriptor which is accessible to any place that want to create a counter group with the same set of suffixes. Does that sound plausible?

@jmarantz jmarantz Jun 25, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My personal preference would be for that to come out of a context. I think also we might want to use StatName rather than string as the representation for the enum names within the descriptor, so that they could be sent to StatName::join() without taking a symbol table lock.

Doing that, though, means you need to pass a SymbolTable& to the descriptor constructor.

And then wouldn't be able to use a static because in tests, symbol-tables would be re-built with every test method, and you wouldn't be able to destruct the symbol-table for one test method while a static held ownership of live StatNames built it.

@RyanTheOptimist RyanTheOptimist Jun 25, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. I don't see StatName::join() in the code, but I did see SymbolTable::join(). Is that the method you're referring to? Can you say more about where this method is called from? In particular, with this PR the CounterGroup::nameSuffix() currently returns an absl::string_view. Would it need to return a StatName?


virtual const SymbolTable& constSymbolTable() const PURE;
virtual SymbolTable& symbolTable() PURE;

Expand Down
50 changes: 50 additions & 0 deletions envoy/stats/scope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ using CounterOptConstRef = absl::optional<std::reference_wrapper<const Counter>>
using GaugeOptConstRef = absl::optional<std::reference_wrapper<const Gauge>>;
using HistogramOptConstRef = absl::optional<std::reference_wrapper<const Histogram>>;
using TextReadoutOptConstRef = absl::optional<std::reference_wrapper<const TextReadout>>;
using CounterGroupOptConstRef = absl::optional<std::reference_wrapper<const CounterGroup>>;
using ScopePtr = std::unique_ptr<Scope>;
using ScopeSharedPtr = std::shared_ptr<Scope>;

Expand Down Expand Up @@ -178,6 +179,38 @@ class Scope {
*/
virtual TextReadout& textReadoutFromString(const std::string& name) PURE;

/**
* Creates a CounterGroup from the stat name. Tag extraction will be performed on the name.
* @param name The name of the stat, obtained from the SymbolTable.
* @param descriptor The size of the group.
* @return a counter group within the scope's namespace with a particular value type.
*/
CounterGroup& counterGroupFromStatName(const StatName& name,
CounterGroupDescriptorSharedPtr descriptor) {
return counterGroupFromStatNameWithTags(name, absl::nullopt, descriptor);
}

/**
* Creates a CounterGroup from the stat name and tags. If tags are not provided, tag extraction
* will be performed on the name.
* @param name The name of the stat, obtained from the SymbolTable.
* @param tags optionally specified tags.
* @param descriptor The size of the group.
* @return a counter group within the scope's namespace with a particular value type.
*/
virtual CounterGroup&
counterGroupFromStatNameWithTags(const StatName& name, StatNameTagVectorOptConstRef tags,
CounterGroupDescriptorSharedPtr descriptor) PURE;

/**
* TODO(#6667): this variant is deprecated: use counterGroupFromStatName.

@mattklein123 mattklein123 Jun 8, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's deprecated can we avoid adding this for new things?

@RyanTheOptimist RyanTheOptimist Jun 8, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wondered about this myself. I'm not quite sure how deprecated this variant is... it seems aspirational not actual. In particular, stats_macros.h uses it in the various POOL_*_PREFIX macros. Maybe someone has a plan to get rid of uses this method eventually but hasn't done so yet? I'm just cargo-culting from existing metric code so perhaps someone with more background in the metrics knows more?

* @param name The name, expressed as a string.
* @param descriptor The size of the group.
* @return a counter group within the scope's namespace with a particular value type.
*/
virtual CounterGroup& counterGroupFromString(const std::string& name,
CounterGroupDescriptorSharedPtr descriptor) PURE;

/**
* @param The name of the stat, obtained from the SymbolTable.
* @return a reference to a counter within the scope's namespace, if it exists.
Expand All @@ -203,6 +236,12 @@ class Scope {
*/
virtual TextReadoutOptConstRef findTextReadout(StatName name) const PURE;

/**
* @param The name of the stat, obtained from the SymbolTable.
* @return a reference to a text readout within the scope's namespace, if it exists.
*/
virtual CounterGroupOptConstRef findCounterGroup(StatName name) const PURE;

/**
* @return a reference to the symbol table.
*/
Expand Down Expand Up @@ -249,6 +288,17 @@ class Scope {
* was hit.
*/
virtual bool iterate(const IterateFn<TextReadout>& fn) const PURE;

/**
* Calls 'fn' for every counter group. Note that in the case of overlapping
* scopes, the implementation may call fn more than one time for each
* counter group. Iteration stops if `fn` returns false;
*
* @param fn Function to be run for every counter group, or until fn return false.
* @return false if fn(text_readout) return false during iteration, true if every counter group
* was hit.
*/
virtual bool iterate(const IterateFn<CounterGroup>& fn) const PURE;
};

} // namespace Stats
Expand Down
2 changes: 2 additions & 0 deletions envoy/stats/sink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class MetricSnapshot {
*/
virtual const std::vector<std::reference_wrapper<const TextReadout>>& textReadouts() PURE;

// TODO(RyanTheOptimist): Add support for counter groups.

/**
* @return the time in UTC since epoch when the snapshot was created.
*/
Expand Down
75 changes: 75 additions & 0 deletions envoy/stats/stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,80 @@ class TextReadout : public virtual Metric {

using TextReadoutSharedPtr = RefcountPtr<TextReadout>;

class CounterGroupDescriptor {
public:
virtual ~CounterGroupDescriptor() = default;

/**
* Returns the suffix for the name of the counter at the specific index.
*/
virtual absl::string_view nameSuffix(size_t index) const PURE;

/**
* Returns the number of counters in the group.
*/
virtual size_t size() const PURE;
};

using CounterGroupDescriptorSharedPtr = std::shared_ptr<CounterGroupDescriptor>;

/**
* An group of always incrementing counters with latching capability. Each increment is added
* both to a global counter as well as periodic counter. Calling latch() returns the periodic
* counter and clears it.
*/
class CounterGroup : public Metric {
public:
~CounterGroup() override = default;

/**
* Adds the specified amount to the counter at the specified index.
* @param index The index of the counter to add.
* @param amount The value to add to the counter.
*/
virtual void add(size_t index, uint64_t amount) PURE;

/**
* Increments the the counter at the specified index.
* @param index The index of the counter to increment.
*/
virtual void inc(size_t index) PURE;

/**
* Returns the value of the periodic counter at the specified index, then resets
* that periodic counter.
* @param index The index of the counter.
* @return The value of the counter at the specified index.
*/
virtual uint64_t latch(size_t index) PURE;

/**
* Resets the the counter at the specified index.
* @param index The index of the counter to reset.
*/
virtual void reset(size_t index) PURE;

/**
* Returns the value of the counter at the specified index.
* @param index The index of the counter.
* @return The value of the counter at the specified index.
*/
virtual uint64_t value(size_t index) const PURE;

/**
* Returns the number of entries in the group.
* @return The number of entries in the group.
*/
virtual size_t maxEntries() const PURE;

/**
* Returns the suffix for the name of the counter at the specific index.
* @return the suffix for the name of the counter at the specific index.
*/
virtual absl::string_view nameSuffix(size_t index) const PURE;
};

using CounterGroupSharedPtr = RefcountPtr<CounterGroup>;

} // namespace Stats
} // namespace Envoy
28 changes: 18 additions & 10 deletions envoy/stats/stats_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ namespace Envoy {
#define GENERATE_GAUGE_STRUCT(NAME, MODE) Envoy::Stats::Gauge& NAME##_;
#define GENERATE_HISTOGRAM_STRUCT(NAME, UNIT) Envoy::Stats::Histogram& NAME##_;
#define GENERATE_TEXT_READOUT_STRUCT(NAME) Envoy::Stats::TextReadout& NAME##_;
#define GENERATE_COUNTER_GROUP_STRUCT(NAME, MAX_ENTRIES) Envoy::Stats::CounterGroup& NAME##_;

#define FINISH_STAT_DECL_(X) #X)),
#define FINISH_STAT_DECL_MODE_(X, MODE) #X), Envoy::Stats::Gauge::ImportMode::MODE),
#define FINISH_STAT_DECL_UNIT_(X, UNIT) #X), Envoy::Stats::Histogram::Unit::UNIT),
#define FINISH_STAT_DECL_SIZE_(X, SIZE) #X), SIZE),

static inline std::string statPrefixJoin(absl::string_view prefix, absl::string_view token) {
if (prefix.empty()) {
Expand All @@ -92,12 +94,14 @@ static inline std::string statPrefixJoin(absl::string_view prefix, absl::string_
#define POOL_GAUGE_PREFIX(POOL, PREFIX) (POOL).gaugeFromString(Envoy::statPrefixJoin(PREFIX, FINISH_STAT_DECL_MODE_
#define POOL_HISTOGRAM_PREFIX(POOL, PREFIX) (POOL).histogramFromString(Envoy::statPrefixJoin(PREFIX, FINISH_STAT_DECL_UNIT_
#define POOL_TEXT_READOUT_PREFIX(POOL, PREFIX) (POOL).textReadoutFromString(Envoy::statPrefixJoin(PREFIX, FINISH_STAT_DECL_
#define POOL_COUNTER_GROUP_PREFIX(POOL, PREFIX) (POOL).counterGroupFromString(Envoy::statPrefixJoin(PREFIX, FINISH_STAT_DECL_SIZE_
#define POOL_STAT_NAME_PREFIX(POOL, PREFIX) (POOL).symbolTable().textReadoutFromString(Envoy::statPrefixJoin(PREFIX, FINISH_STAT_DECL_

#define POOL_COUNTER(POOL) POOL_COUNTER_PREFIX(POOL, "")
#define POOL_GAUGE(POOL) POOL_GAUGE_PREFIX(POOL, "")
#define POOL_HISTOGRAM(POOL) POOL_HISTOGRAM_PREFIX(POOL, "")
#define POOL_TEXT_READOUT(POOL) POOL_TEXT_READOUT_PREFIX(POOL, "")
#define POOL_COUNTER_GROUP(POOL) POOL_COUNTER_GROUP_PREFIX(POOL, "")

#define NULL_STAT_DECL_(X) std::string(#X)),
#define NULL_STAT_DECL_IGNORE_MODE_(X, MODE) std::string(#X)),
Expand All @@ -123,6 +127,10 @@ static inline std::string statPrefixJoin(absl::string_view prefix, absl::string_
#define MAKE_STATS_STRUCT_TEXT_READOUT_HELPER_(NAME) \
, NAME##_(Envoy::Stats::Utility::textReadoutFromStatNames(scope, {prefix, stat_names.NAME##_}))

#define MAKE_STATS_STRUCT_COUNTER_GROUP_HELPER_(NAME, MAX_ENTRIES) \
, NAME##_(Envoy::Stats::Utility::counterGroupFromStatNames(scope, {prefix, stat_names.NAME##_}, \
MAX_ENTRIES))

#define MAKE_STATS_STRUCT_STATNAME_HELPER_(name)
#define GENERATE_STATNAME_STRUCT(name)

Expand All @@ -134,12 +142,12 @@ static inline std::string statPrefixJoin(absl::string_view prefix, absl::string_
#define MAKE_STAT_NAMES_STRUCT(StatNamesStruct, ALL_STATS) \
struct StatNamesStruct { \
explicit StatNamesStruct(Envoy::Stats::SymbolTable& symbol_table) \
: pool_(symbol_table) \
ALL_STATS(GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT, \
GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT) {} \
: pool_(symbol_table) ALL_STATS(GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT, \
GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT, \
GENERATE_STAT_NAME_INIT, GENERATE_STAT_NAME_INIT) {} \
Envoy::Stats::StatNamePool pool_; \
ALL_STATS(GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT, \
GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT) \
GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT) \
}

/**
Expand All @@ -154,14 +162,14 @@ static inline std::string statPrefixJoin(absl::string_view prefix, absl::string_
struct StatsStruct { \
StatsStruct(const StatNamesStruct& stat_names, Envoy::Stats::Scope& scope, \
Envoy::Stats::StatName prefix = Envoy::Stats::StatName()) \
: stat_names_(stat_names) \
ALL_STATS(MAKE_STATS_STRUCT_COUNTER_HELPER_, MAKE_STATS_STRUCT_GAUGE_HELPER_, \
MAKE_STATS_STRUCT_HISTOGRAM_HELPER_, \
MAKE_STATS_STRUCT_TEXT_READOUT_HELPER_, \
MAKE_STATS_STRUCT_STATNAME_HELPER_) {} \
: stat_names_(stat_names) ALL_STATS( \
MAKE_STATS_STRUCT_COUNTER_HELPER_, MAKE_STATS_STRUCT_GAUGE_HELPER_, \
MAKE_STATS_STRUCT_HISTOGRAM_HELPER_, MAKE_STATS_STRUCT_TEXT_READOUT_HELPER_, \
MAKE_STATS_STRUCT_COUNTER_GROUP_HELPER_, MAKE_STATS_STRUCT_STATNAME_HELPER_) {} \
const StatNamesStruct& stat_names_; \
ALL_STATS(GENERATE_COUNTER_STRUCT, GENERATE_GAUGE_STRUCT, GENERATE_HISTOGRAM_STRUCT, \
GENERATE_TEXT_READOUT_STRUCT, GENERATE_STATNAME_STRUCT) \
GENERATE_TEXT_READOUT_STRUCT, GENERATE_COUNTER_GROUP_STRUCT, \
GENERATE_STATNAME_STRUCT) \
}

} // namespace Envoy
5 changes: 5 additions & 0 deletions envoy/stats/store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class Store : public Scope {
* @return a list of all known histograms.
*/
virtual std::vector<ParentHistogramSharedPtr> histograms() const PURE;

/**
* @return a list of all known counter groups.
*/
virtual std::vector<CounterGroupSharedPtr> counterGroups() const PURE;
};

using StorePtr = std::unique_ptr<Store>;
Expand Down
17 changes: 11 additions & 6 deletions envoy/upstream/upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ class PrioritySet {
/**
* All cluster stats. @see stats_macros.h
*/
#define ALL_CLUSTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_CLUSTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUPS, STATNAME) \

@mattklein123 mattklein123 Jun 8, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: IIRC you don't need to add this if there are no COUNTER_GROUPS below, but perhaps this has changed.

@RyanTheOptimist RyanTheOptimist Jun 8, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, that doesn't seem to work for me when I removed "COUNTER_GROUP, " from this line:

./envoy/upstream/upstream.h:648:1: error: too many arguments provided to function-like macro invocation
MAKE_STAT_NAMES_STRUCT(ClusterStatNames, ALL_CLUSTER_STATS);

In particular, MAKE_STAT_NAMES_STRUCT does:

ALL_STATS(GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT,     \
          GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT, GENERATE_STAT_NAME_STRUCT)     \

which seems to have 1 argument for each of the different metric types. Is there something different I should be doing?

COUNTER(assignment_stale) \
COUNTER(assignment_timeout_received) \
COUNTER(bind_errors) \
Expand Down Expand Up @@ -595,7 +595,8 @@ class PrioritySet {
* stats sink. See envoy.api.v2.endpoint.ClusterStats for the definition of upstream_rq_dropped.
* These are latched by LoadStatsReporter, independent of the normal stats sink flushing.
*/
#define ALL_CLUSTER_LOAD_REPORT_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_CLUSTER_LOAD_REPORT_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUP, \
STATNAME) \
COUNTER(upstream_rq_dropped)

/**
Expand All @@ -607,7 +608,8 @@ class PrioritySet {
* We also include stat-names in this structure that are used when composing
* the circuit breaker names, depending on priority settings.
*/
#define ALL_CLUSTER_CIRCUIT_BREAKERS_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_CLUSTER_CIRCUIT_BREAKERS_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUP, \
STATNAME) \
GAUGE(cx_open, Accumulate) \
GAUGE(cx_pool_open, Accumulate) \
GAUGE(rq_open, Accumulate) \
Expand All @@ -625,7 +627,8 @@ class PrioritySet {
/**
* All stats tracking request/response headers and body sizes. Not used by default.
*/
#define ALL_CLUSTER_REQUEST_RESPONSE_SIZE_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_CLUSTER_REQUEST_RESPONSE_SIZE_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, \
COUNTER_GROUP, STATNAME) \
HISTOGRAM(upstream_rq_headers_size, Bytes) \
HISTOGRAM(upstream_rq_body_size, Bytes) \
HISTOGRAM(upstream_rs_headers_size, Bytes) \
Expand All @@ -634,7 +637,8 @@ class PrioritySet {
/**
* All stats around timeout budgets. Not used by default.
*/
#define ALL_CLUSTER_TIMEOUT_BUDGET_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_CLUSTER_TIMEOUT_BUDGET_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUP, \
STATNAME) \
HISTOGRAM(upstream_rq_timeout_budget_percent_used, Unspecified) \
HISTOGRAM(upstream_rq_timeout_budget_per_try_percent_used, Unspecified)

Expand Down Expand Up @@ -666,7 +670,8 @@ MAKE_STATS_STRUCT(ClusterTimeoutBudgetStats, ClusterTimeoutBudgetStatNames,
* Struct definition for cluster circuit breakers stats. @see stats_macros.h
*/
struct ClusterCircuitBreakersStats {
ALL_CLUSTER_CIRCUIT_BREAKERS_STATS(c, GENERATE_GAUGE_STRUCT, h, tr, GENERATE_STATNAME_STRUCT)
ALL_CLUSTER_CIRCUIT_BREAKERS_STATS(c, GENERATE_GAUGE_STRUCT, h, tr, GENERATE_COUNTER_GROUP_STRUCT,
GENERATE_STATNAME_STRUCT)
};

using ClusterRequestResponseSizeStatsPtr = std::unique_ptr<ClusterRequestResponseSizeStats>;
Expand Down
2 changes: 1 addition & 1 deletion source/common/router/context_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Router {
/**
* All router filter stats. @see stats_macros.h
*/
#define ALL_ROUTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, STATNAME) \
#define ALL_ROUTER_STATS(COUNTER, GAUGE, HISTOGRAM, TEXT_READOUT, COUNTER_GROUP, STATNAME) \
COUNTER(no_cluster) \
COUNTER(no_route) \
COUNTER(passthrough_internal_redirect_bad_location) \
Expand Down
12 changes: 12 additions & 0 deletions source/common/stats/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ envoy_cc_library(
hdrs = ["isolated_store_impl.h"],
deps = [
":histogram_lib",
":null_counter_group_lib",
":null_counter_lib",
":null_gauge_lib",
":null_text_readout_lib",
Expand Down Expand Up @@ -91,6 +92,16 @@ envoy_cc_library(
],
)

envoy_cc_library(
name = "null_counter_group_lib",
hdrs = ["null_counter_group.h"],
deps = [
":metric_impl_lib",
":symbol_table_lib",
"//envoy/stats:stats_interface",
],
)

envoy_cc_library(
name = "null_gauge_lib",
hdrs = ["null_gauge.h"],
Expand Down Expand Up @@ -237,6 +248,7 @@ envoy_cc_library(
deps = [
":allocator_lib",
":histogram_lib",
":null_counter_group_lib",
":null_counter_lib",
":null_gauge_lib",
":null_text_readout_lib",
Expand Down
Loading