feat: add PLUGIN_VM_MEMORY property to query Wasm VM memory usage

Change-Id: I787f124bb7b1b35d7b9fecfa8fe6261fd52f413f

Author: johnlanni

source/extensions/common/wasm/context.cc

@@ -456,10 +456,17 @@ WasmResult serializeValue(Filters::Common::Expr::CelValue value, std::string* re
   return WasmResult::SerializationFailure;
 }
 
+#if defined(HIGRESS)
+#define PROPERTY_TOKENS(_f)                                                                        \
+  _f(NODE) _f(LISTENER_DIRECTION) _f(LISTENER_METADATA) _f(CLUSTER_NAME) _f(CLUSTER_METADATA)      \
+      _f(ROUTE_NAME) _f(ROUTE_METADATA) _f(PLUGIN_NAME) _f(UPSTREAM_HOST_METADATA)                 \
+          _f(PLUGIN_ROOT_ID) _f(PLUGIN_VM_ID) _f(PLUGIN_VM_MEMORY) _f(CONNECTION_ID)
+#else
 #define PROPERTY_TOKENS(_f)                                                                        \
   _f(NODE) _f(LISTENER_DIRECTION) _f(LISTENER_METADATA) _f(CLUSTER_NAME) _f(CLUSTER_METADATA)      \
       _f(ROUTE_NAME) _f(ROUTE_METADATA) _f(PLUGIN_NAME) _f(UPSTREAM_HOST_METADATA)                 \
           _f(PLUGIN_ROOT_ID) _f(PLUGIN_VM_ID) _f(CONNECTION_ID)
+#endif
 
 static inline std::string downCase(std::string s) {
   std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) { return std::tolower(c); });
@@ -614,6 +621,13 @@ Context::findValue(absl::string_view name, Protobuf::Arena* arena, bool last) co
     return CelValue::CreateStringView(toAbslStringView(root_id()));
   case PropertyToken::PLUGIN_VM_ID:
     return CelValue::CreateStringView(toAbslStringView(wasm()->vm_id()));
+#if defined(HIGRESS)
+  case PropertyToken::PLUGIN_VM_MEMORY:
+    if (wasm() && wasm()->wasm_vm()) {
+      return CelValue::CreateUint64(wasm()->wasm_vm()->getMemorySize());
+    }
+    break;
+#endif
   }
   return {};
 }

test/extensions/filters/http/wasm/test_data/test_cpp.cc

@@ -286,6 +286,21 @@ FilterHeadersStatus TestContext::onRequestHeaders(uint32_t, bool) {
       logError("get route name failed");
     }
     return FilterHeadersStatus::Continue;
+  } else if (test == "GetVMMemorySize") {
+    std::string value;
+    if (getValue({"plugin_vm_memory"}, &value)) {
+      // The value is stored as binary uint64_t, convert to string for logging
+      if (value.size() == sizeof(uint64_t)) {
+        uint64_t memory_size;
+        memcpy(&memory_size, value.data(), sizeof(uint64_t));
+        logInfo("vm memory size is " + std::to_string(memory_size));
+      } else {
+        logError("invalid memory size format");
+      }
+    } else {
+      logError("get vm memory size failed");
+    }
+    return FilterHeadersStatus::Continue;
   } else if (test == "CrashRecover") {
     if (!getRequestHeader("crash")->toString().empty()) {
       abort();

test/extensions/filters/http/wasm/wasm_filter_test.cc

@@ -1850,6 +1850,21 @@ TEST_P(WasmHttpFilterTest, GetRouteName) {
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, false));
   filter().onDestroy();
 }
+TEST_P(WasmHttpFilterTest, GetVMMemorySize) {
+  auto runtime = std::get<0>(GetParam());
+  if (runtime == "null") {
+    return;
+  }
+  if (std::get<1>(GetParam()) != "cpp") {
+    return;
+  }
+  setupTest("", "GetVMMemorySize");
+  setupFilter();
+  EXPECT_CALL(filter(), log_(spdlog::level::info, testing::StartsWith("vm memory size is ")));
+  Http::TestRequestHeaderMapImpl request_headers{};
+  EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, false));
+  filter().onDestroy();
+}
 TEST_P(WasmHttpFilterTest, RecoverFromCrash) {
   auto runtime = std::get<0>(GetParam());
   if (runtime == "null") {
@@ -1980,7 +1995,7 @@ TEST_P(WasmHttpFilterTest, ProactiveRebuild) {
   request_headers = Http::TestRequestHeaderMapImpl{{"rebuild", "true"}};
   EXPECT_CALL(filter(), log_(spdlog::level::info, Eq("Setting rebuild flag")));
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, false));
-  EXPECT_EQ(0U, rebuild_total.value());  // No rebuild yet, just set the flag
+  EXPECT_EQ(0U, rebuild_total.value()); // No rebuild yet, just set the flag
   EXPECT_EQ(0U, recover_total.value());
 
   // Now trigger the actual rebuild using doRebuild()
@@ -1998,7 +2013,7 @@ TEST_P(WasmHttpFilterTest, ProactiveRebuild) {
   request_headers = Http::TestRequestHeaderMapImpl{{"rebuild", "true"}};
   EXPECT_CALL(filter(), log_(spdlog::level::info, Eq("Setting rebuild flag")));
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, false));
-  EXPECT_EQ(1U, rebuild_total.value());  // Still 1, just set the flag again
+  EXPECT_EQ(1U, rebuild_total.value()); // Still 1, just set the flag again
   EXPECT_EQ(0U, recover_total.value());
 
   // Trigger second rebuild using doRebuild()