mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chore: rename dfly_ metrics to dragonfly_ (#1568)

Browse source
This commit is contained in:
Roman Gershman 2023-07-19 13:46:06 +03:00 • committed by GitHub
parent 590bf94e1c
commit e44cc68b73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/dragonfly_test.cc
View file

@ -250,14 +250,14 @@ TEST_F(DflyEngineTest, Hello) {
ASSERT_THAT(resp, ArrLen(14));
EXPECT_THAT(resp.GetVec(),
ElementsAre("server", "redis", "version", "6.2.11", "dfly_version",
ElementsAre("server", "redis", "version", "6.2.11", "dragonfly_version",
ArgType(RespExpr::STRING), "proto", IntArg(2), "id",
ArgType(RespExpr::INT64), "mode", "standalone", "role", "master"));
resp = Run({"hello", "3"});
ASSERT_THAT(resp, ArrLen(14));
EXPECT_THAT(resp.GetVec(),
ElementsAre("server", "redis", "version", "6.2.11", "dfly_version",
ElementsAre("server", "redis", "version", "6.2.11", "dragonfly_version",
ArgType(RespExpr::STRING), "proto", IntArg(3), "id",
ArgType(RespExpr::INT64), "mode", "standalone", "role", "master"));

8
src/server/server_family.cc
View file

@ -815,7 +815,7 @@ void PrintPrometheusMetrics(const Metrics& m, StringResponse* resp) {
// Clients metrics
AppendMetricWithoutLabels("connected_clients", "", m.conn_stats.num_conns, MetricType::GAUGE,
&resp->body());
AppendMetricWithoutLabels("client_read_buf_capacity", "", m.conn_stats.read_buf_capacity,
AppendMetricWithoutLabels("client_read_buffer_bytes", "", m.conn_stats.read_buf_capacity,
MetricType::GAUGE, &resp->body());
AppendMetricWithoutLabels("blocked_clients", "", m.conn_stats.num_blocked_clients,
MetricType::GAUGE, &resp->body());
@ -1560,7 +1560,7 @@ void ServerFamily::Info(CmdArgList args, ConnectionContext* cntx) {
ADD_HEADER("# Server");
append("redis_version", kRedisVersion);
append("dfly_version", GetVersion());
append("dragonfly_version", GetVersion());
append("redis_mode", "standalone");
append("arch_bits", 64);
append("multiplexing_api", multiplex_api);
@ -1581,7 +1581,7 @@ void ServerFamily::Info(CmdArgList args, ConnectionContext* cntx) {
if (should_enter("CLIENTS")) {
ADD_HEADER("# Clients");
append("connected_clients", m.conn_stats.num_conns);
append("client_read_buf_capacity", m.conn_stats.read_buf_capacity);
append("client_read_buffer_bytes", m.conn_stats.read_buf_capacity);
append("blocked_clients", m.conn_stats.num_blocked_clients);
}
@ -1865,7 +1865,7 @@ void ServerFamily::Hello(CmdArgList args, ConnectionContext* cntx) {
(*cntx)->SendBulkString("redis");
(*cntx)->SendBulkString("version");
(*cntx)->SendBulkString(kRedisVersion);
(*cntx)->SendBulkString("dfly_version");
(*cntx)->SendBulkString("dragonfly_version");
(*cntx)->SendBulkString(GetVersion());
(*cntx)->SendBulkString("proto");
(*cntx)->SendLong(proto_version);