Merge branch 'main' into fix-snapshot

vue/src/components/CPP.vue

@@ -1,16 +1,18 @@
 <template>
   <div>
     <Shared :language="'C++'"></Shared>
+    <Metrics :language="'C++'"></Metrics>
     <TransactionsShared :language="'C++'"></TransactionsShared>
   </div>
 </template>
 
 <script>
 import Shared from "@/components/Shared.vue";
 import TransactionsShared from "@/components/TransactionsShared.vue";
+import Metrics from "@/components/Metrics.vue";
 
 export default {
-  components: {Shared, TransactionsShared}
+  components: {Metrics, Shared, TransactionsShared}
 }
 </script>
 

vue/src/components/Metrics.vue

@@ -4,8 +4,14 @@
     All these tests are doing KV gets in 20 threads.
 
     <h2>Memory</h2>
-    Measures the maximum heap memory used in MB by the performer+SDK.
-    <Results :input="memHeapUsedMB" :key="'heap-' + reloadTrigger"></Results>
+    <div v-if="hasHeapUsedMB">
+      Measures the maximum heap memory used in MB by the performer+SDK.
+      <Results :input="memHeapUsedMB" :key="'heap-' + reloadTrigger"></Results>
+    </div>
+    <div v-if="hasRssUsedMB">
+      Measures the maximum RSS memory used in MB by the performer+SDK.
+      <Results :input="memRssUsedMB" :key="'rss-' + reloadTrigger"></Results>
+    </div>
 
     <h2>Thread Count</h2>
     Measures the maximum thread count used by the performer+SDK.
@@ -63,6 +69,14 @@ export default {
       }
     },
 
+    hasHeapUsedMB() {
+      return ["go", "java", "kotlin", "scala"].includes(this.language.toLowerCase());
+    },
+
+    hasRssUsedMB() {
+      return ["c++", "node", "python", "ruby"].includes(this.language.toLowerCase());
+    },
+
     memHeapUsedMB() {
       return {
         ...sharedQuery(this.language, this.excludeSnapshots),
@@ -74,6 +88,17 @@ export default {
       }
     },
 
+    memRssUsedMB() {
+      return {
+        ...sharedQuery(this.language),
+        "yAxes": [{
+          "type": "metric",
+          "metric": "memRssUsedMB",
+        }],
+        mergingType: "Maximum",
+      }
+    },
+
     threadCount() {
       return {
         ...sharedQuery(this.language, this.excludeSnapshots),