Skip to content

Commit c20af57

Browse files
committed
fix nodename metricsname
1 parent 820482b commit c20af57

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

src/modules/keydb_modstatsd/modmain.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ std::string m_strPrefix { "keydb" };
7676
const std::regex g_replica_or_db_info_regex { "^(slave|db)(\\d+)" };
7777
const char *g_string_counter_separator = "__";
7878
const uint64_t g_stats_buffer_size_bytes = 1600;
79-
utsname sysName;
79+
std::string nodeName;
8080
int unameResult;
8181

8282
enum class StatsD_Type {
@@ -600,7 +600,7 @@ void event_cron_handler(struct RedisModuleCtx *ctx, RedisModuleEvent eid, uint64
600600

601601
/* node name */
602602
if (unameResult == 0) {
603-
g_stats->increment("node_name" + std::string(g_string_counter_separator) + sysName.nodename);
603+
g_stats->increment("node_name" + std::string(g_string_counter_separator) + nodeName);
604604
}
605605

606606
/* Log INFO Fields */
@@ -672,15 +672,18 @@ extern "C" int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv,
672672
RedisModule_AutoMemory(ctx);
673673
/* Use pod name if available*/
674674
const char *podName = getenv("POD_NAME");
675+
utsname sysName;
675676
unameResult = uname(&sysName);
677+
if (unameResult == 0) {
678+
nodeName = std::string(sysName.nodename);
679+
std::replace(nodeName.begin(), nodeName.end(), '.', '-');
680+
}
676681
if (podName != nullptr) {
677682
m_strPrefix = podName;
678683
}
679-
else {
680-
if (unameResult == 0) {
681-
m_strPrefix = std::string(sysName.nodename);
682-
unameResult = 1;
683-
}
684+
else if (unameResult == 0) {
685+
m_strPrefix = nodeName;
686+
unameResult = 1;
684687
}
685688
std::replace(m_strPrefix.begin(), m_strPrefix.end(), '.', '-');
686689

0 commit comments

Comments
 (0)