Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/v/rpc/transport.cc
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,8 @@ void transport::setup_metrics(
"rpc_client",
labels,
aggregate_labels,
_probe->defs(labels, aggregate_labels));
_probe->defs(
labels, aggregate_labels, [this] { return _correlations.size(); }));
}

timing_info* transport::get_timing(uint32_t correlation) {
Expand Down Expand Up @@ -487,7 +488,8 @@ std::ostream& operator<<(std::ostream& o, const transport& t) {

std::vector<ss::metrics::metric_definition> client_probe::defs(
const std::vector<ss::metrics::label_instance>& labels,
const std::vector<ss::metrics::label>& aggregate_labels) {
const std::vector<ss::metrics::label>& aggregate_labels,
std::function<size_t()> pending_count) {
namespace sm = ss::metrics;
std::vector<sm::metric_definition> ret;

Expand All @@ -502,7 +504,7 @@ std::vector<ss::metrics::metric_definition> client_probe::defs(
ret.emplace_back(
sm::make_gauge(
"requests_pending",
[this] { return _requests_pending; },
[pending_count = std::move(pending_count)] { return pending_count(); },
sm::description("Number of requests pending"),
labels)
.aggregate(aggregate_labels));
Expand Down Expand Up @@ -586,7 +588,6 @@ std::vector<ss::metrics::metric_definition> client_probe::defs(
std::ostream& operator<<(std::ostream& o, const client_probe& p) {
o << "{"
<< " requests_sent: " << p._requests
<< ", requests_pending: " << p._requests_pending
<< ", requests_completed: " << p._requests_completed
<< ", request_errors: " << p._request_errors
<< ", request_timeouts: " << p._request_timeouts
Expand Down
25 changes: 7 additions & 18 deletions src/v/rpc/transport.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

#include <concepts>
#include <cstdint>
#include <functional>
#include <memory>
#include <optional>
#include <utility>
Expand Down Expand Up @@ -114,25 +115,13 @@ class client_probe : public net::client_probe {
client_probe& operator=(client_probe&&) = delete;
~client_probe() = default;

void request() {
++_requests;
++_requests_pending;
}
void request() { ++_requests; }

void request_completed() {
++_requests_completed;
--_requests_pending;
}
void request_completed() { ++_requests_completed; }

void request_timeout() {
++_request_timeouts;
--_requests_pending;
}
void request_timeout() { ++_request_timeouts; }

void request_error() {
++_request_errors;
--_requests_pending;
}
void request_error() { ++_request_errors; }

void add_bytes_sent(size_t sent) { _out_bytes += sent; }

Expand All @@ -150,11 +139,11 @@ class client_probe : public net::client_probe {

std::vector<ss::metrics::metric_definition> defs(
const std::vector<ss::metrics::label_instance>& labels,
const std::vector<ss::metrics::label>& aggregate_labels);
const std::vector<ss::metrics::label>& aggregate_labels,
std::function<size_t()> pending_count);

private:
uint64_t _requests = 0;
uint32_t _requests_pending = 0;
uint32_t _request_errors = 0;
uint64_t _request_timeouts = 0;
uint64_t _requests_completed = 0;
Expand Down
Loading