Merge branch 'v1.3.3'

Author: caojiajun

Diff for: camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/monitor/LoggingMonitorCallback.java

@@ -1,6 +1,7 @@
 package com.netease.nim.camellia.redis.proxy.monitor;
 
 import com.netease.nim.camellia.redis.proxy.monitor.model.*;
+import com.netease.nim.camellia.redis.proxy.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -177,6 +178,14 @@ public void callback(Stats stats) {
                         kvRunToCompletionStats.getHit(), kvRunToCompletionStats.getNotHit(), kvRunToCompletionStats.getHitRate());
             }
 
+            logger.info("====kv.lru.cache.stats====");
+            List<KvLRUCacheStats> kvLRUCacheStatsList = stats.getKvLRUCacheStatsList();
+            for (KvLRUCacheStats kvLRUCacheStats : kvLRUCacheStatsList) {
+                logger.info("namespace={},capacity={},keyCount={},currentSize={},targetSize={}",
+                        kvLRUCacheStats.getNamespace(), kvLRUCacheStats.getCapacity(),
+                        kvLRUCacheStats.getKeyCount(), Utils.humanReadableByteCountBin(kvLRUCacheStats.getCurrentSize()), Utils.humanReadableByteCountBin(kvLRUCacheStats.getTargetSize()));
+            }
+
             logger.info("<<<<<<<END<<<<<<<");
         } catch (Exception e) {
             logger.error(e.getMessage(), e);

Diff for: camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/monitor/PrometheusMetrics.java

@@ -436,6 +436,20 @@ public static String metrics() {
                     kvRunToCompletionStats.getNamespace(), kvRunToCompletionStats.getCommand(), kvRunToCompletionStats.getHitRate()));
         }
 
+        List<KvLRUCacheStats> kvLRUCacheStatsList = stats.getKvLRUCacheStatsList();
+        builder.append("# HELP kv_lru_cache Redis Proxy KV LRU Cache Stats\n");
+        builder.append("# TYPE kv_lru_cache gauge\n");
+        for (KvLRUCacheStats kvLRUCacheStats : kvLRUCacheStatsList) {
+            builder.append(prefix).append(String.format("kv_lru_cache_stats{namespace=\"%s\", type=\"capacity\"} %d\n",
+                    kvLRUCacheStats.getNamespace(), kvLRUCacheStats.getCapacity()));
+            builder.append(prefix).append(String.format("kv_lru_cache_stats{namespace=\"%s\", type=\"key_count\"} %d\n",
+                    kvLRUCacheStats.getNamespace(), kvLRUCacheStats.getKeyCount()));
+            builder.append(prefix).append(String.format("kv_lru_cache_stats{namespace=\"%s\", type=\"current_size\"} %d\n",
+                    kvLRUCacheStats.getNamespace(), kvLRUCacheStats.getCurrentSize()));
+            builder.append(prefix).append(String.format("kv_lru_cache_stats{namespace=\"%s\", type=\"target_size\"} %d\n",
+                    kvLRUCacheStats.getNamespace(), kvLRUCacheStats.getTargetSize()));
+        }
+
         return builder.toString();
     }