Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid calling Collect() in counter/gauge Value() methods if not needed

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-04-09 10:00:41 -07:00
parent e195d3d778
commit d0d41f5c56
2 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/telemetry/Counter.h
View file

@ -31,7 +31,7 @@ public:
* Increments the value by @p amount. * Increments the value by @p amount.
* @pre `amount >= 0` * @pre `amount >= 0`
*/ */
void Inc(BaseType amount) noexcept { handle->Increment(amount); } void Inc(BaseType amount) noexcept { handle.Increment(amount); }
/** /**
* Increments the value by 1. * Increments the value by 1.
@ -43,10 +43,14 @@ public:
} }
BaseType Value() const noexcept { BaseType Value() const noexcept {
// Use Collect() here instead of Value() to correctly handle metrics with if ( has_callback ) {
// callbacks. // Use Collect() here instead of Value() to correctly handle metrics with
auto metric = handle->Collect(); // callbacks.
return static_cast<BaseType>(metric.counter.value); auto metric = handle.Collect();
return static_cast<BaseType>(metric.counter.value);
}
return handle.Value();
} }
bool operator==(const BaseCounter<BaseType>& rhs) const noexcept { return &handle == &rhs.handle; } bool operator==(const BaseCounter<BaseType>& rhs) const noexcept { return &handle == &rhs.handle; }
@ -57,13 +61,16 @@ public:
protected: protected:
explicit BaseCounter(FamilyType* family, const prometheus::Labels& labels, explicit BaseCounter(FamilyType* family, const prometheus::Labels& labels,
prometheus::CollectCallbackPtr callback = nullptr) noexcept prometheus::CollectCallbackPtr callback = nullptr) noexcept
: handle(&(family->Add(labels))), labels(labels) { : handle(family->Add(labels)), labels(labels) {
if ( callback ) if ( callback ) {
handle->AddCollectCallback(callback); handle.AddCollectCallback(callback);
has_callback = true;
}
} }
Handle* handle; Handle& handle;
prometheus::Labels labels; prometheus::Labels labels;
bool has_callback = false;
}; };
/** /**

17
src/telemetry/Gauge.h
View file

@ -61,10 +61,14 @@ public:
} }
BaseType Value() const noexcept { BaseType Value() const noexcept {
// Use Collect() here instead of Value() to correctly handle metrics if ( has_callback ) {
// with callbacks. // Use Collect() here instead of Value() to correctly handle metrics
auto metric = handle.Collect(); // with callbacks.
return static_cast<BaseType>(metric.gauge.value); auto metric = handle.Collect();
return static_cast<BaseType>(metric.gauge.value);
}
return handle.Value();
} }
/** /**
@ -81,12 +85,15 @@ protected:
explicit BaseGauge(FamilyType* family, const prometheus::Labels& labels, explicit BaseGauge(FamilyType* family, const prometheus::Labels& labels,
prometheus::CollectCallbackPtr callback = nullptr) noexcept prometheus::CollectCallbackPtr callback = nullptr) noexcept
: handle(family->Add(labels)), labels(labels) { : handle(family->Add(labels)), labels(labels) {
if ( callback ) if ( callback ) {
handle.AddCollectCallback(callback); handle.AddCollectCallback(callback);
has_callback = true;
}
} }
Handle& handle; Handle& handle;
prometheus::Labels labels; prometheus::Labels labels;
bool has_callback = false;
}; };
/** /**