Added isolate + thread high watermark tracking to Observatory

runtime/vm/thread_test.cc

Index: runtime/vm/thread_test.cc
diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc
index 44082bc53ad719373134a470d82f51631c361abd..9c2446882e279ff22451e6c8e0cd1c27a7cb7d44 100644
--- a/runtime/vm/thread_test.cc
+++ b/runtime/vm/thread_test.cc
@@ -320,12 +320,21 @@ TEST_CASE(ManySimpleTasksWithZones) {
   isolate->PrintJSON(&stream, false);
   const char* json = stream.ToCString();
 
+  Thread* current_thread = Thread::Current();
+  {
+    StackZone stack_zone(current_thread);
+    char* isolate_info_buf = OS::SCreate(current_thread->zone(),
+                                         "\"isolateMemoryHighWatermark\":"
+                                         "%" Pd "",
+                                         isolate->GetIsolateHighWatermark());
+    EXPECT_SUBSTRING(isolate_info_buf, json);
+  }
+
   // Confirm all expected entries are in the JSON output.
   for (intptr_t i = 0; i < kTaskCount + 1; i++) {
     Thread* thread = threads[i];
     Zone* top_zone = thread->zone();
 
-    Thread* current_thread = Thread::Current();
     StackZone stack_zone(current_thread);
     Zone* current_zone = current_thread->zone();
 
@@ -348,9 +357,11 @@ TEST_CASE(ManySimpleTasksWithZones) {
                     "\"type\":\"_Thread\","
                     "\"id\":\"threads\\/%" Pd
                     "\","
-                    "\"kind\":\"%s\"",
+                    "\"kind\":\"%s\","
+                    "\"threadMemoryHighWatermark\":%" Pd "",
                     OSThread::ThreadIdToIntPtr(thread->os_thread()->trace_id()),
-                    Thread::TaskKindToCString(thread->task_kind()));
+                    Thread::TaskKindToCString(thread->task_kind()),
+                    thread->GetThreadHighWatermark());
 
     EXPECT_SUBSTRING(thread_info_buf, json);
   }