From 77d75301b7d552e391f240512d48a618806b2a48 Mon Sep 17 00:00:00 2001
From: Kevin Su <pingsutw@apache.org>
Date: Mon, 8 Jan 2024 04:27:29 -0800
Subject: [PATCH] update GetTaskMetrics

Signed-off-by: Kevin Su <pingsutw@apache.org>
---
 .../gen/pb-cpp/flyteidl/admin/agent.pb.cc     | 159 ++++-----
 flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h | 116 +++++--
 .../gen/pb-cpp/flyteidl/core/metrics.pb.cc    | 131 +++----
 .../gen/pb-cpp/flyteidl/core/metrics.pb.h     | 110 +++---
 flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go | 146 ++++----
 .../gen/pb-go/flyteidl/core/metrics.pb.go     | 105 ++----
 .../pb-go/flyteidl/service/agent.swagger.json |  14 +-
 .../flyteidl/admin/AgentOuterClass.java       | 323 +++++++-----------
 .../gen/pb-java/flyteidl/core/Metrics.java    | 318 ++++++-----------
 flyteidl/gen/pb-js/flyteidl.d.ts              |  21 +-
 flyteidl/gen/pb-js/flyteidl.js                |  92 ++---
 .../gen/pb_python/flyteidl/admin/agent_pb2.py |  20 +-
 .../pb_python/flyteidl/admin/agent_pb2.pyi    |   8 +-
 .../pb_python/flyteidl/core/metrics_pb2.py    |   6 +-
 .../pb_python/flyteidl/core/metrics_pb2.pyi   |  18 +-
 flyteidl/gen/pb_rust/flyteidl.admin.rs        |   4 +-
 flyteidl/gen/pb_rust/flyteidl.core.rs         |  46 +--
 flyteidl/protos/flyteidl/admin/agent.proto    |   2 +-
 flyteidl/protos/flyteidl/core/metrics.proto   |  19 +-
 19 files changed, 649 insertions(+), 1009 deletions(-)

diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
index af3a53df39..85de60a3be 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
@@ -564,7 +564,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o
   ~0u,  // no _weak_field_map_
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, task_type_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, resource_meta_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, metrics_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, queries_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, start_time_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, end_time_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::GetTaskMetricsRequest, step_),
@@ -687,28 +687,27 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] =
   "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt"
   "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n"
   "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl"
-  "yteidl.admin.Agent\"\371\001\n\025GetTaskMetricsReq"
+  "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq"
   "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta"
-  "\030\002 \001(\014\022/\n\007metrics\030\003 \003(\0162\036.flyteidl.core."
-  "ExecutionMetric\022.\n\nstart_time\030\004 \001(\0132\032.go"
-  "ogle.protobuf.Timestamp\022,\n\010end_time\030\005 \001("
-  "\0132\032.google.protobuf.Timestamp\022\'\n\004step\030\006 "
-  "\001(\0132\031.google.protobuf.Duration\"O\n\026GetTas"
-  "kMetricsResponse\0225\n\007results\030\001 \003(\0132$.flyt"
-  "eidl.core.ExecutionMetricResult\"\\\n\022GetTa"
-  "skLogsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rreso"
-  "urce_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r\n\005token\030"
-  "\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007results\030"
-  "\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n\021RETRYAB"
-  "LE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007P"
-  "ENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;"
-  "github.com/flyteorg/flyte/flyteidl/gen/p"
-  "b-go/flyteidl/adminb\006proto3"
+  "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 "
+  "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t"
+  "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n"
+  "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O"
+  "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003("
+  "\0132$.flyteidl.core.ExecutionMetricResult\""
+  "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t"
+  "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r"
+  "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007"
+  "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n"
+  "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR"
+  "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED"
+  "ED\020\004B=Z;github.com/flyteorg/flyte/flytei"
+  "dl/gen/pb-go/flyteidl/adminb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = {
   false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, 
   descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto,
-  "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2387,
+  "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2355,
 };
 
 void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() {
@@ -5949,7 +5948,7 @@ void GetTaskMetricsRequest::clear_step() {
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int GetTaskMetricsRequest::kTaskTypeFieldNumber;
 const int GetTaskMetricsRequest::kResourceMetaFieldNumber;
-const int GetTaskMetricsRequest::kMetricsFieldNumber;
+const int GetTaskMetricsRequest::kQueriesFieldNumber;
 const int GetTaskMetricsRequest::kStartTimeFieldNumber;
 const int GetTaskMetricsRequest::kEndTimeFieldNumber;
 const int GetTaskMetricsRequest::kStepFieldNumber;
@@ -5963,7 +5962,7 @@ GetTaskMetricsRequest::GetTaskMetricsRequest()
 GetTaskMetricsRequest::GetTaskMetricsRequest(const GetTaskMetricsRequest& from)
   : ::google::protobuf::Message(),
       _internal_metadata_(nullptr),
-      metrics_(from.metrics_) {
+      queries_(from.queries_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   task_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (from.task_type().size() > 0) {
@@ -6029,7 +6028,7 @@ void GetTaskMetricsRequest::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  metrics_.Clear();
+  queries_.Clear();
   task_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   resource_meta_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (GetArenaNoVirtual() == nullptr && start_time_ != nullptr) {
@@ -6091,25 +6090,23 @@ const char* GetTaskMetricsRequest::_InternalParse(const char* begin, const char*
         ptr += size;
         break;
       }
-      // repeated .flyteidl.core.ExecutionMetric metrics = 3;
+      // repeated string queries = 3;
       case 3: {
-        if (static_cast<::google::protobuf::uint8>(tag) == 26) {
-          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          parser_till_end = ::google::protobuf::internal::PackedEnumParser;
-          object = msg->mutable_metrics();
-          if (size > end - ptr) goto len_delim_till_end;
-          auto newend = ptr + size;
-          if (size) ptr = parser_till_end(ptr, newend, object, ctx);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr == newend);
-          break;
-        } else if (static_cast<::google::protobuf::uint8>(tag) != 24) goto handle_unusual;
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
         do {
-          ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
-          msg->add_metrics(static_cast<::flyteidl::core::ExecutionMetric>(val));
+          ptr = ::google::protobuf::io::ReadSize(ptr, &size);
           GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+          ctx->extra_parse_data().SetFieldName("flyteidl.admin.GetTaskMetricsRequest.queries");
+          object = msg->add_queries();
+          if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+            parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
+            goto string_till_end;
+          }
+          GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
+          ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+          ptr += size;
           if (ptr >= end) break;
-        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 24 && (ptr += 1));
+        } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1));
         break;
       }
       // .google.protobuf.Timestamp start_time = 4;
@@ -6211,26 +6208,16 @@ bool GetTaskMetricsRequest::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated .flyteidl.core.ExecutionMetric metrics = 3;
+      // repeated string queries = 3;
       case 3: {
         if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
-          ::google::protobuf::uint32 length;
-          DO_(input->ReadVarint32(&length));
-          ::google::protobuf::io::CodedInputStream::Limit limit = input->PushLimit(static_cast<int>(length));
-          while (input->BytesUntilLimit() > 0) {
-            int value = 0;
-            DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-            add_metrics(static_cast< ::flyteidl::core::ExecutionMetric >(value));
-          }
-          input->PopLimit(limit);
-        } else if (static_cast< ::google::protobuf::uint8>(tag) == (24 & 0xFF)) {
-          int value = 0;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          add_metrics(static_cast< ::flyteidl::core::ExecutionMetric >(value));
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_queries()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->queries(this->queries_size() - 1).data(),
+            static_cast<int>(this->queries(this->queries_size() - 1).length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "flyteidl.admin.GetTaskMetricsRequest.queries"));
         } else {
           goto handle_unusual;
         }
@@ -6313,18 +6300,14 @@ void GetTaskMetricsRequest::SerializeWithCachedSizes(
       2, this->resource_meta(), output);
   }
 
-  // repeated .flyteidl.core.ExecutionMetric metrics = 3;
-  if (this->metrics_size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteTag(
-      3,
-      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-      output);
-    output->WriteVarint32(_metrics_cached_byte_size_.load(
-        std::memory_order_relaxed));
-  }
-  for (int i = 0, n = this->metrics_size(); i < n; i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnumNoTag(
-      this->metrics(i), output);
+  // repeated string queries = 3;
+  for (int i = 0, n = this->queries_size(); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->queries(i).data(), static_cast<int>(this->queries(i).length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.admin.GetTaskMetricsRequest.queries");
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->queries(i), output);
   }
 
   // .google.protobuf.Timestamp start_time = 4;
@@ -6376,16 +6359,14 @@ ::google::protobuf::uint8* GetTaskMetricsRequest::InternalSerializeWithCachedSiz
         2, this->resource_meta(), target);
   }
 
-  // repeated .flyteidl.core.ExecutionMetric metrics = 3;
-  if (this->metrics_size() > 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
-      3,
-      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-      target);
-    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(      _metrics_cached_byte_size_.load(std::memory_order_relaxed),
-        target);
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumNoTagToArray(
-      this->metrics_, target);
+  // repeated string queries = 3;
+  for (int i = 0, n = this->queries_size(); i < n; i++) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->queries(i).data(), static_cast<int>(this->queries(i).length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.admin.GetTaskMetricsRequest.queries");
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(3, this->queries(i), target);
   }
 
   // .google.protobuf.Timestamp start_time = 4;
@@ -6430,22 +6411,12 @@ size_t GetTaskMetricsRequest::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // repeated .flyteidl.core.ExecutionMetric metrics = 3;
-  {
-    size_t data_size = 0;
-    unsigned int count = static_cast<unsigned int>(this->metrics_size());for (unsigned int i = 0; i < count; i++) {
-      data_size += ::google::protobuf::internal::WireFormatLite::EnumSize(
-        this->metrics(static_cast<int>(i)));
-    }
-    if (data_size > 0) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-            static_cast<::google::protobuf::int32>(data_size));
-    }
-    int cached_size = ::google::protobuf::internal::ToCachedSize(data_size);
-    _metrics_cached_byte_size_.store(cached_size,
-                                    std::memory_order_relaxed);
-    total_size += data_size;
+  // repeated string queries = 3;
+  total_size += 1 *
+      ::google::protobuf::internal::FromIntSize(this->queries_size());
+  for (int i = 0, n = this->queries_size(); i < n; i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->queries(i));
   }
 
   // string task_type = 1;
@@ -6510,7 +6481,7 @@ void GetTaskMetricsRequest::MergeFrom(const GetTaskMetricsRequest& from) {
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  metrics_.MergeFrom(from.metrics_);
+  queries_.MergeFrom(from.queries_);
   if (from.task_type().size() > 0) {
 
     task_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.task_type_);
@@ -6555,7 +6526,7 @@ void GetTaskMetricsRequest::Swap(GetTaskMetricsRequest* other) {
 void GetTaskMetricsRequest::InternalSwap(GetTaskMetricsRequest* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
-  metrics_.InternalSwap(&other->metrics_);
+  queries_.InternalSwap(CastToBase(&other->queries_));
   task_type_.Swap(&other->task_type_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   resource_meta_.Swap(&other->resource_meta_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
index 75632e3a4a..78238b32c1 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
@@ -2089,15 +2089,27 @@ class GetTaskMetricsRequest final :
 
   // accessors -------------------------------------------------------
 
-  // repeated .flyteidl.core.ExecutionMetric metrics = 3;
-  int metrics_size() const;
-  void clear_metrics();
-  static const int kMetricsFieldNumber = 3;
-  ::flyteidl::core::ExecutionMetric metrics(int index) const;
-  void set_metrics(int index, ::flyteidl::core::ExecutionMetric value);
-  void add_metrics(::flyteidl::core::ExecutionMetric value);
-  const ::google::protobuf::RepeatedField<int>& metrics() const;
-  ::google::protobuf::RepeatedField<int>* mutable_metrics();
+  // repeated string queries = 3;
+  int queries_size() const;
+  void clear_queries();
+  static const int kQueriesFieldNumber = 3;
+  const ::std::string& queries(int index) const;
+  ::std::string* mutable_queries(int index);
+  void set_queries(int index, const ::std::string& value);
+  #if LANG_CXX11
+  void set_queries(int index, ::std::string&& value);
+  #endif
+  void set_queries(int index, const char* value);
+  void set_queries(int index, const char* value, size_t size);
+  ::std::string* add_queries();
+  void add_queries(const ::std::string& value);
+  #if LANG_CXX11
+  void add_queries(::std::string&& value);
+  #endif
+  void add_queries(const char* value);
+  void add_queries(const char* value, size_t size);
+  const ::google::protobuf::RepeatedPtrField<::std::string>& queries() const;
+  ::google::protobuf::RepeatedPtrField<::std::string>* mutable_queries();
 
   // string task_type = 1;
   void clear_task_type();
@@ -2159,8 +2171,7 @@ class GetTaskMetricsRequest final :
   class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  ::google::protobuf::RepeatedField<int> metrics_;
-  mutable std::atomic<int> _metrics_cached_byte_size_;
+  ::google::protobuf::RepeatedPtrField<::std::string> queries_;
   ::google::protobuf::internal::ArenaStringPtr task_type_;
   ::google::protobuf::internal::ArenaStringPtr resource_meta_;
   ::google::protobuf::Timestamp* start_time_;
@@ -3988,34 +3999,73 @@ inline void GetTaskMetricsRequest::set_allocated_resource_meta(::std::string* re
   // @@protoc_insertion_point(field_set_allocated:flyteidl.admin.GetTaskMetricsRequest.resource_meta)
 }
 
-// repeated .flyteidl.core.ExecutionMetric metrics = 3;
-inline int GetTaskMetricsRequest::metrics_size() const {
-  return metrics_.size();
+// repeated string queries = 3;
+inline int GetTaskMetricsRequest::queries_size() const {
+  return queries_.size();
+}
+inline void GetTaskMetricsRequest::clear_queries() {
+  queries_.Clear();
 }
-inline void GetTaskMetricsRequest::clear_metrics() {
-  metrics_.Clear();
+inline const ::std::string& GetTaskMetricsRequest::queries(int index) const {
+  // @@protoc_insertion_point(field_get:flyteidl.admin.GetTaskMetricsRequest.queries)
+  return queries_.Get(index);
 }
-inline ::flyteidl::core::ExecutionMetric GetTaskMetricsRequest::metrics(int index) const {
-  // @@protoc_insertion_point(field_get:flyteidl.admin.GetTaskMetricsRequest.metrics)
-  return static_cast< ::flyteidl::core::ExecutionMetric >(metrics_.Get(index));
+inline ::std::string* GetTaskMetricsRequest::mutable_queries(int index) {
+  // @@protoc_insertion_point(field_mutable:flyteidl.admin.GetTaskMetricsRequest.queries)
+  return queries_.Mutable(index);
 }
-inline void GetTaskMetricsRequest::set_metrics(int index, ::flyteidl::core::ExecutionMetric value) {
-  metrics_.Set(index, value);
-  // @@protoc_insertion_point(field_set:flyteidl.admin.GetTaskMetricsRequest.metrics)
+inline void GetTaskMetricsRequest::set_queries(int index, const ::std::string& value) {
+  // @@protoc_insertion_point(field_set:flyteidl.admin.GetTaskMetricsRequest.queries)
+  queries_.Mutable(index)->assign(value);
 }
-inline void GetTaskMetricsRequest::add_metrics(::flyteidl::core::ExecutionMetric value) {
-  metrics_.Add(value);
-  // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskMetricsRequest.metrics)
+#if LANG_CXX11
+inline void GetTaskMetricsRequest::set_queries(int index, ::std::string&& value) {
+  // @@protoc_insertion_point(field_set:flyteidl.admin.GetTaskMetricsRequest.queries)
+  queries_.Mutable(index)->assign(std::move(value));
+}
+#endif
+inline void GetTaskMetricsRequest::set_queries(int index, const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  queries_.Mutable(index)->assign(value);
+  // @@protoc_insertion_point(field_set_char:flyteidl.admin.GetTaskMetricsRequest.queries)
+}
+inline void GetTaskMetricsRequest::set_queries(int index, const char* value, size_t size) {
+  queries_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_set_pointer:flyteidl.admin.GetTaskMetricsRequest.queries)
 }
-inline const ::google::protobuf::RepeatedField<int>&
-GetTaskMetricsRequest::metrics() const {
-  // @@protoc_insertion_point(field_list:flyteidl.admin.GetTaskMetricsRequest.metrics)
-  return metrics_;
+inline ::std::string* GetTaskMetricsRequest::add_queries() {
+  // @@protoc_insertion_point(field_add_mutable:flyteidl.admin.GetTaskMetricsRequest.queries)
+  return queries_.Add();
 }
-inline ::google::protobuf::RepeatedField<int>*
-GetTaskMetricsRequest::mutable_metrics() {
-  // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.GetTaskMetricsRequest.metrics)
-  return &metrics_;
+inline void GetTaskMetricsRequest::add_queries(const ::std::string& value) {
+  queries_.Add()->assign(value);
+  // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskMetricsRequest.queries)
+}
+#if LANG_CXX11
+inline void GetTaskMetricsRequest::add_queries(::std::string&& value) {
+  queries_.Add(std::move(value));
+  // @@protoc_insertion_point(field_add:flyteidl.admin.GetTaskMetricsRequest.queries)
+}
+#endif
+inline void GetTaskMetricsRequest::add_queries(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  queries_.Add()->assign(value);
+  // @@protoc_insertion_point(field_add_char:flyteidl.admin.GetTaskMetricsRequest.queries)
+}
+inline void GetTaskMetricsRequest::add_queries(const char* value, size_t size) {
+  queries_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  // @@protoc_insertion_point(field_add_pointer:flyteidl.admin.GetTaskMetricsRequest.queries)
+}
+inline const ::google::protobuf::RepeatedPtrField<::std::string>&
+GetTaskMetricsRequest::queries() const {
+  // @@protoc_insertion_point(field_list:flyteidl.admin.GetTaskMetricsRequest.queries)
+  return queries_;
+}
+inline ::google::protobuf::RepeatedPtrField<::std::string>*
+GetTaskMetricsRequest::mutable_queries() {
+  // @@protoc_insertion_point(field_mutable_list:flyteidl.admin.GetTaskMetricsRequest.queries)
+  return &queries_;
 }
 
 // .google.protobuf.Timestamp start_time = 4;
diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.cc
index dbd319304c..c96ae09bdb 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.cc
@@ -77,7 +77,7 @@ void InitDefaults_flyteidl_2fcore_2fmetrics_2eproto() {
 }
 
 ::google::protobuf::Metadata file_level_metadata_flyteidl_2fcore_2fmetrics_2eproto[2];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_flyteidl_2fcore_2fmetrics_2eproto[1];
+constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fcore_2fmetrics_2eproto = nullptr;
 constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fcore_2fmetrics_2eproto = nullptr;
 
 const ::google::protobuf::uint32 TableStruct_flyteidl_2fcore_2fmetrics_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
@@ -131,22 +131,16 @@ const char descriptor_table_protodef_flyteidl_2fcore_2fmetrics_2eproto[] =
   "tifierH\000\0229\n\007task_id\030\005 \001(\0132&.flyteidl.cor"
   "e.TaskExecutionIdentifierH\000\022\026\n\014operation"
   "_id\030\006 \001(\tH\000\022\"\n\005spans\030\007 \003(\0132\023.flyteidl.co"
-  "re.SpanB\004\n\002id\"n\n\025ExecutionMetricResult\022."
-  "\n\006metric\030\001 \001(\0162\036.flyteidl.core.Execution"
-  "Metric\022%\n\004data\030\002 \001(\0132\027.google.protobuf.S"
-  "truct*\331\001\n\017ExecutionMetric\022\036\n\032EXECUTION_M"
-  "ETRIC_UNDEFINED\020\000\022*\n&EXECUTION_METRIC_US"
-  "ED_MEMORY_BYTES_AVG\020\001\022/\n+EXECUTION_METRI"
-  "C_ALLOCATED_MEMORY_BYTES_AVG\020\002\022!\n\035EXECUT"
-  "ION_METRIC_USED_CPU_AVG\020\024\022&\n\"EXECUTION_M"
-  "ETRIC_ALLOCATED_CPU_AVG\020\025B<Z:github.com/"
-  "flyteorg/flyte/flyteidl/gen/pb-go/flytei"
-  "dl/coreb\006proto3"
+  "re.SpanB\004\n\002id\"N\n\025ExecutionMetricResult\022\016"
+  "\n\006metric\030\001 \001(\t\022%\n\004data\030\002 \001(\0132\027.google.pr"
+  "otobuf.StructB<Z:github.com/flyteorg/fly"
+  "te/flyteidl/gen/pb-go/flyteidl/coreb\006pro"
+  "to3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fcore_2fmetrics_2eproto = {
   false, InitDefaults_flyteidl_2fcore_2fmetrics_2eproto, 
   descriptor_table_protodef_flyteidl_2fcore_2fmetrics_2eproto,
-  "flyteidl/core/metrics.proto", &assign_descriptors_table_flyteidl_2fcore_2fmetrics_2eproto, 895,
+  "flyteidl/core/metrics.proto", &assign_descriptors_table_flyteidl_2fcore_2fmetrics_2eproto, 643,
 };
 
 void AddDescriptors_flyteidl_2fcore_2fmetrics_2eproto() {
@@ -163,23 +157,6 @@ void AddDescriptors_flyteidl_2fcore_2fmetrics_2eproto() {
 static bool dynamic_init_dummy_flyteidl_2fcore_2fmetrics_2eproto = []() { AddDescriptors_flyteidl_2fcore_2fmetrics_2eproto(); return true; }();
 namespace flyteidl {
 namespace core {
-const ::google::protobuf::EnumDescriptor* ExecutionMetric_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_flyteidl_2fcore_2fmetrics_2eproto);
-  return file_level_enum_descriptors_flyteidl_2fcore_2fmetrics_2eproto[0];
-}
-bool ExecutionMetric_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 20:
-    case 21:
-      return true;
-    default:
-      return false;
-  }
-}
-
 
 // ===================================================================
 
@@ -1007,21 +984,23 @@ ExecutionMetricResult::ExecutionMetricResult(const ExecutionMetricResult& from)
   : ::google::protobuf::Message(),
       _internal_metadata_(nullptr) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
+  metric_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.metric().size() > 0) {
+    metric_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.metric_);
+  }
   if (from.has_data()) {
     data_ = new ::google::protobuf::Struct(*from.data_);
   } else {
     data_ = nullptr;
   }
-  metric_ = from.metric_;
   // @@protoc_insertion_point(copy_constructor:flyteidl.core.ExecutionMetricResult)
 }
 
 void ExecutionMetricResult::SharedCtor() {
   ::google::protobuf::internal::InitSCC(
       &scc_info_ExecutionMetricResult_flyteidl_2fcore_2fmetrics_2eproto.base);
-  ::memset(&data_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&metric_) -
-      reinterpret_cast<char*>(&data_)) + sizeof(metric_));
+  metric_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  data_ = nullptr;
 }
 
 ExecutionMetricResult::~ExecutionMetricResult() {
@@ -1030,6 +1009,7 @@ ExecutionMetricResult::~ExecutionMetricResult() {
 }
 
 void ExecutionMetricResult::SharedDtor() {
+  metric_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (this != internal_default_instance()) delete data_;
 }
 
@@ -1048,11 +1028,11 @@ void ExecutionMetricResult::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
+  metric_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (GetArenaNoVirtual() == nullptr && data_ != nullptr) {
     delete data_;
   }
   data_ = nullptr;
-  metric_ = 0;
   _internal_metadata_.Clear();
 }
 
@@ -1069,12 +1049,20 @@ const char* ExecutionMetricResult::_InternalParse(const char* begin, const char*
     ptr = ::google::protobuf::io::Parse32(ptr, &tag);
     GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
     switch (tag >> 3) {
-      // .flyteidl.core.ExecutionMetric metric = 1;
+      // string metric = 1;
       case 1: {
-        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
-        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
-        msg->set_metric(static_cast<::flyteidl::core::ExecutionMetric>(val));
+        if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
         GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("flyteidl.core.ExecutionMetricResult.metric");
+        object = msg->mutable_metric();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
         break;
       }
       // .google.protobuf.Struct data = 2;
@@ -1105,6 +1093,10 @@ const char* ExecutionMetricResult::_InternalParse(const char* begin, const char*
     }  // switch
   }  // while
   return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
 len_delim_till_end:
   return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
                                {parser_till_end, object}, size);
@@ -1120,14 +1112,15 @@ bool ExecutionMetricResult::MergePartialFromCodedStream(
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .flyteidl.core.ExecutionMetric metric = 1;
+      // string metric = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
-          int value = 0;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          set_metric(static_cast< ::flyteidl::core::ExecutionMetric >(value));
+        if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_metric()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->metric().data(), static_cast<int>(this->metric().length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "flyteidl.core.ExecutionMetricResult.metric"));
         } else {
           goto handle_unusual;
         }
@@ -1172,9 +1165,13 @@ void ExecutionMetricResult::SerializeWithCachedSizes(
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .flyteidl.core.ExecutionMetric metric = 1;
-  if (this->metric() != 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+  // string metric = 1;
+  if (this->metric().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->metric().data(), static_cast<int>(this->metric().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.core.ExecutionMetricResult.metric");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       1, this->metric(), output);
   }
 
@@ -1197,10 +1194,15 @@ ::google::protobuf::uint8* ExecutionMetricResult::InternalSerializeWithCachedSiz
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .flyteidl.core.ExecutionMetric metric = 1;
-  if (this->metric() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->metric(), target);
+  // string metric = 1;
+  if (this->metric().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->metric().data(), static_cast<int>(this->metric().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.core.ExecutionMetricResult.metric");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->metric(), target);
   }
 
   // .google.protobuf.Struct data = 2;
@@ -1231,6 +1233,13 @@ size_t ExecutionMetricResult::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
+  // string metric = 1;
+  if (this->metric().size() > 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::StringSize(
+        this->metric());
+  }
+
   // .google.protobuf.Struct data = 2;
   if (this->has_data()) {
     total_size += 1 +
@@ -1238,12 +1247,6 @@ size_t ExecutionMetricResult::ByteSizeLong() const {
         *data_);
   }
 
-  // .flyteidl.core.ExecutionMetric metric = 1;
-  if (this->metric() != 0) {
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->metric());
-  }
-
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
@@ -1271,12 +1274,13 @@ void ExecutionMetricResult::MergeFrom(const ExecutionMetricResult& from) {
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
+  if (from.metric().size() > 0) {
+
+    metric_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.metric_);
+  }
   if (from.has_data()) {
     mutable_data()->::google::protobuf::Struct::MergeFrom(from.data());
   }
-  if (from.metric() != 0) {
-    set_metric(from.metric());
-  }
 }
 
 void ExecutionMetricResult::CopyFrom(const ::google::protobuf::Message& from) {
@@ -1304,8 +1308,9 @@ void ExecutionMetricResult::Swap(ExecutionMetricResult* other) {
 void ExecutionMetricResult::InternalSwap(ExecutionMetricResult* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
+  metric_.Swap(&other->metric_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
   swap(data_, other->data_);
-  swap(metric_, other->metric_);
 }
 
 ::google::protobuf::Metadata ExecutionMetricResult::GetMetadata() const {
diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.h b/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.h
index cf56d5feb9..8c7140c273 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/core/metrics.pb.h
@@ -30,7 +30,6 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>  // IWYU pragma: export
 #include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 #include "flyteidl/core/identifier.pb.h"
 #include <google/protobuf/timestamp.pb.h>
@@ -71,30 +70,6 @@ template<> ::flyteidl::core::Span* Arena::CreateMaybeMessage<::flyteidl::core::S
 namespace flyteidl {
 namespace core {
 
-enum ExecutionMetric {
-  EXECUTION_METRIC_UNDEFINED = 0,
-  EXECUTION_METRIC_USED_MEMORY_BYTES_AVG = 1,
-  EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG = 2,
-  EXECUTION_METRIC_USED_CPU_AVG = 20,
-  EXECUTION_METRIC_ALLOCATED_CPU_AVG = 21,
-  ExecutionMetric_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::min(),
-  ExecutionMetric_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::google::protobuf::int32>::max()
-};
-bool ExecutionMetric_IsValid(int value);
-const ExecutionMetric ExecutionMetric_MIN = EXECUTION_METRIC_UNDEFINED;
-const ExecutionMetric ExecutionMetric_MAX = EXECUTION_METRIC_ALLOCATED_CPU_AVG;
-const int ExecutionMetric_ARRAYSIZE = ExecutionMetric_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* ExecutionMetric_descriptor();
-inline const ::std::string& ExecutionMetric_Name(ExecutionMetric value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    ExecutionMetric_descriptor(), value);
-}
-inline bool ExecutionMetric_Parse(
-    const ::std::string& name, ExecutionMetric* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ExecutionMetric>(
-    ExecutionMetric_descriptor(), name, value);
-}
 // ===================================================================
 
 class Span final :
@@ -400,6 +375,20 @@ class ExecutionMetricResult final :
 
   // accessors -------------------------------------------------------
 
+  // string metric = 1;
+  void clear_metric();
+  static const int kMetricFieldNumber = 1;
+  const ::std::string& metric() const;
+  void set_metric(const ::std::string& value);
+  #if LANG_CXX11
+  void set_metric(::std::string&& value);
+  #endif
+  void set_metric(const char* value);
+  void set_metric(const char* value, size_t size);
+  ::std::string* mutable_metric();
+  ::std::string* release_metric();
+  void set_allocated_metric(::std::string* metric);
+
   // .google.protobuf.Struct data = 2;
   bool has_data() const;
   void clear_data();
@@ -409,19 +398,13 @@ class ExecutionMetricResult final :
   ::google::protobuf::Struct* mutable_data();
   void set_allocated_data(::google::protobuf::Struct* data);
 
-  // .flyteidl.core.ExecutionMetric metric = 1;
-  void clear_metric();
-  static const int kMetricFieldNumber = 1;
-  ::flyteidl::core::ExecutionMetric metric() const;
-  void set_metric(::flyteidl::core::ExecutionMetric value);
-
   // @@protoc_insertion_point(class_scope:flyteidl.core.ExecutionMetricResult)
  private:
   class HasBitSetters;
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
+  ::google::protobuf::internal::ArenaStringPtr metric_;
   ::google::protobuf::Struct* data_;
-  int metric_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_flyteidl_2fcore_2fmetrics_2eproto;
 };
@@ -768,19 +751,58 @@ inline Span::IdCase Span::id_case() const {
 
 // ExecutionMetricResult
 
-// .flyteidl.core.ExecutionMetric metric = 1;
+// string metric = 1;
 inline void ExecutionMetricResult::clear_metric() {
-  metric_ = 0;
+  metric_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
-inline ::flyteidl::core::ExecutionMetric ExecutionMetricResult::metric() const {
+inline const ::std::string& ExecutionMetricResult::metric() const {
   // @@protoc_insertion_point(field_get:flyteidl.core.ExecutionMetricResult.metric)
-  return static_cast< ::flyteidl::core::ExecutionMetric >(metric_);
+  return metric_.GetNoArena();
 }
-inline void ExecutionMetricResult::set_metric(::flyteidl::core::ExecutionMetric value) {
+inline void ExecutionMetricResult::set_metric(const ::std::string& value) {
   
-  metric_ = value;
+  metric_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:flyteidl.core.ExecutionMetricResult.metric)
 }
+#if LANG_CXX11
+inline void ExecutionMetricResult::set_metric(::std::string&& value) {
+  
+  metric_.SetNoArena(
+    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:flyteidl.core.ExecutionMetricResult.metric)
+}
+#endif
+inline void ExecutionMetricResult::set_metric(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  
+  metric_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:flyteidl.core.ExecutionMetricResult.metric)
+}
+inline void ExecutionMetricResult::set_metric(const char* value, size_t size) {
+  
+  metric_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
+  // @@protoc_insertion_point(field_set_pointer:flyteidl.core.ExecutionMetricResult.metric)
+}
+inline ::std::string* ExecutionMetricResult::mutable_metric() {
+  
+  // @@protoc_insertion_point(field_mutable:flyteidl.core.ExecutionMetricResult.metric)
+  return metric_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline ::std::string* ExecutionMetricResult::release_metric() {
+  // @@protoc_insertion_point(field_release:flyteidl.core.ExecutionMetricResult.metric)
+  
+  return metric_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline void ExecutionMetricResult::set_allocated_metric(::std::string* metric) {
+  if (metric != nullptr) {
+    
+  } else {
+    
+  }
+  metric_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), metric);
+  // @@protoc_insertion_point(field_set_allocated:flyteidl.core.ExecutionMetricResult.metric)
+}
 
 // .google.protobuf.Struct data = 2;
 inline bool ExecutionMetricResult::has_data() const {
@@ -839,18 +861,6 @@ inline void ExecutionMetricResult::set_allocated_data(::google::protobuf::Struct
 }  // namespace core
 }  // namespace flyteidl
 
-namespace google {
-namespace protobuf {
-
-template <> struct is_proto_enum< ::flyteidl::core::ExecutionMetric> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::flyteidl::core::ExecutionMetric>() {
-  return ::flyteidl::core::ExecutionMetric_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
 // @@protoc_insertion_point(global_scope)
 
 #include <google/protobuf/port_undef.inc>
diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
index be237003ed..92a788bb7a 100644
--- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
@@ -758,7 +758,7 @@ type GetTaskMetricsRequest struct {
 	// Metadata is created by the agent. It could be a string (jobId) or a dict (more complex metadata).
 	ResourceMeta []byte `protobuf:"bytes,2,opt,name=resource_meta,json=resourceMeta,proto3" json:"resource_meta,omitempty"`
 	// The metrics to query. If empty, will return a default set of metrics.
-	Metrics []core.ExecutionMetric `protobuf:"varint,3,rep,packed,name=metrics,proto3,enum=flyteidl.core.ExecutionMetric" json:"metrics,omitempty"`
+	Queries []string `protobuf:"bytes,3,rep,name=queries,proto3" json:"queries,omitempty"`
 	// Start timestamp, inclusive.
 	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End timestamp, inclusive..
@@ -809,9 +809,9 @@ func (m *GetTaskMetricsRequest) GetResourceMeta() []byte {
 	return nil
 }
 
-func (m *GetTaskMetricsRequest) GetMetrics() []core.ExecutionMetric {
+func (m *GetTaskMetricsRequest) GetQueries() []string {
 	if m != nil {
-		return m.Metrics
+		return m.Queries
 	}
 	return nil
 }
@@ -1025,74 +1025,74 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) }
 
 var fileDescriptor_c434e52bb0028071 = []byte{
-	// 1101 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xff, 0x6f, 0xdb, 0x44,
-	0x14, 0x5f, 0xbe, 0x36, 0x79, 0xe9, 0xba, 0xe4, 0xd6, 0x0c, 0x2f, 0x1d, 0xa3, 0x32, 0x14, 0x55,
-	0x4c, 0x75, 0x58, 0x0b, 0xa3, 0x03, 0xb1, 0x29, 0x6d, 0x4d, 0x57, 0x29, 0x8d, 0xaa, 0x6b, 0x8a,
-	0x06, 0x12, 0x44, 0x4e, 0xf2, 0x6a, 0xac, 0x38, 0xb6, 0xf1, 0x9d, 0xab, 0x15, 0xf1, 0x13, 0xfc,
-	0x13, 0xfc, 0x21, 0xfc, 0xc6, 0x3f, 0x87, 0x7c, 0x77, 0x76, 0xe2, 0x90, 0x6d, 0x9d, 0xd8, 0x6f,
-	0xbe, 0xf7, 0x3e, 0xef, 0x73, 0x9f, 0xf7, 0xe5, 0xee, 0x0c, 0xad, 0x4b, 0xf7, 0x9a, 0xa3, 0x33,
-	0x76, 0xdb, 0xd6, 0x78, 0xea, 0x78, 0x6d, 0xcb, 0x46, 0x8f, 0x1b, 0x41, 0xe8, 0x73, 0x9f, 0xac,
-	0x25, 0x3e, 0x43, 0xf8, 0x5a, 0x0f, 0x52, 0xec, 0xc8, 0x0f, 0xb1, 0xed, 0x3a, 0x1c, 0x43, 0xcb,
-	0x65, 0x12, 0xdd, 0xba, 0x9f, 0xf5, 0x72, 0x8b, 0x4d, 0x12, 0xd7, 0xc3, 0xac, 0xcb, 0x19, 0xa3,
-	0xc7, 0x9d, 0x4b, 0x07, 0x43, 0xe5, 0xff, 0x30, 0xeb, 0xc7, 0x57, 0x38, 0x8a, 0xb8, 0xe3, 0x7b,
-	0xca, 0xbd, 0x91, 0x75, 0x4f, 0x91, 0x87, 0xce, 0x28, 0xe5, 0xb6, 0x7d, 0xdf, 0x76, 0xb1, 0x2d,
-	0x56, 0xc3, 0xe8, 0xb2, 0x3d, 0x8e, 0x42, 0x6b, 0x2e, 0xf8, 0xa3, 0x45, 0x3f, 0x77, 0xa6, 0xc8,
-	0xb8, 0x35, 0x0d, 0x24, 0x40, 0xff, 0xab, 0x04, 0xcd, 0xbe, 0xc5, 0x26, 0x66, 0xb2, 0xeb, 0x29,
-	0x72, 0x6b, 0x6c, 0x71, 0x8b, 0x50, 0x68, 0xc4, 0x59, 0x0c, 0x52, 0x3d, 0x03, 0x67, 0xac, 0xe5,
-	0x36, 0x73, 0xdb, 0xb5, 0xdd, 0x4f, 0x8d, 0xb4, 0x36, 0xb1, 0x26, 0x23, 0x43, 0x70, 0x92, 0xe6,
-	0x47, 0xef, 0xf0, 0xac, 0x83, 0x3c, 0x80, 0xaa, 0x67, 0x4d, 0x91, 0x05, 0xd6, 0x08, 0xb5, 0xfc,
-	0x66, 0x6e, 0xbb, 0x4a, 0x67, 0x06, 0x72, 0x02, 0x65, 0xd7, 0x1a, 0xa2, 0xcb, 0xb4, 0xc2, 0x66,
-	0x61, 0xbb, 0xb6, 0xfb, 0xd8, 0xc8, 0xb6, 0xc0, 0x58, 0x2a, 0xd4, 0xe8, 0x8a, 0x18, 0xd3, 0xe3,
-	0xe1, 0x35, 0x55, 0x04, 0xe4, 0x25, 0xd4, 0x2c, 0xcf, 0xf3, 0xb9, 0xa8, 0x05, 0xd3, 0x8a, 0x82,
-	0xef, 0xc9, 0xcd, 0xf8, 0x3a, 0xb3, 0x40, 0x49, 0x3a, 0x4f, 0x45, 0x0c, 0xb8, 0x3b, 0xd9, 0x67,
-	0x03, 0x86, 0xe1, 0x95, 0x33, 0xc2, 0x81, 0x35, 0x1a, 0xf9, 0x91, 0xc7, 0xb5, 0x92, 0x48, 0xa6,
-	0x31, 0xd9, 0x67, 0xe7, 0xd2, 0xd3, 0x91, 0x0e, 0xc2, 0xa1, 0x89, 0xde, 0x95, 0x13, 0xfa, 0xde,
-	0x14, 0x3d, 0x3e, 0xb8, 0xb2, 0x42, 0xc7, 0x1a, 0xba, 0xc8, 0xb4, 0xb2, 0xd0, 0xf4, 0xfc, 0x66,
-	0x9a, 0xcc, 0x19, 0xc5, 0xf7, 0x09, 0x83, 0x14, 0xb7, 0x8e, 0x4b, 0x5c, 0xad, 0xa7, 0x50, 0x9b,
-	0x2b, 0x0b, 0xa9, 0x43, 0x61, 0x82, 0xd7, 0xa2, 0x7b, 0x55, 0x1a, 0x7f, 0x92, 0x75, 0x28, 0x5d,
-	0x59, 0x6e, 0x94, 0x74, 0x41, 0x2e, 0xbe, 0xce, 0xef, 0xe7, 0x5a, 0xcf, 0xa0, 0xbe, 0x58, 0x81,
-	0x77, 0x8a, 0x3f, 0x86, 0xfb, 0xaf, 0x55, 0xfb, 0x2e, 0x44, 0xfa, 0x9f, 0x79, 0x68, 0x1c, 0x86,
-	0x68, 0x71, 0x8c, 0x6b, 0x42, 0xf1, 0xd7, 0x08, 0x19, 0x27, 0x8f, 0xa1, 0xec, 0x78, 0x41, 0xc4,
-	0x99, 0x9a, 0xc5, 0xfb, 0x0b, 0xb3, 0xd8, 0x95, 0xe7, 0xf2, 0xd4, 0x0a, 0xa8, 0x02, 0x92, 0xaf,
-	0xa0, 0xc2, 0x71, 0x1a, 0xb8, 0x16, 0x97, 0xbb, 0xd4, 0x76, 0x37, 0x96, 0x0c, 0x70, 0x5f, 0x41,
-	0x68, 0x0a, 0x26, 0x1f, 0xc3, 0x6d, 0x3f, 0xe2, 0x41, 0xc4, 0x07, 0x41, 0x88, 0x97, 0xce, 0x2b,
-	0xad, 0x20, 0x34, 0xae, 0x4a, 0xe3, 0x99, 0xb0, 0x91, 0x9f, 0xe0, 0x83, 0x85, 0x73, 0x32, 0x55,
-	0x5d, 0xd3, 0x8a, 0x62, 0xb3, 0xad, 0x1b, 0xb5, 0x98, 0x36, 0xf9, 0x32, 0xb3, 0xfe, 0x1b, 0x90,
-	0xf9, 0x22, 0xb0, 0xc0, 0xf7, 0x18, 0x92, 0x2d, 0xb8, 0x1d, 0x22, 0xf3, 0xa3, 0x70, 0x84, 0x62,
-	0x3b, 0x51, 0x8c, 0xd5, 0x17, 0xb7, 0xe8, 0x6a, 0x62, 0x8e, 0x09, 0xc8, 0x13, 0xa8, 0x24, 0x6b,
-	0x95, 0xb9, 0xb6, 0x28, 0x86, 0x2a, 0xff, 0x8b, 0x5b, 0x34, 0xc5, 0x1e, 0x94, 0xa0, 0x10, 0x22,
-	0xd3, 0x29, 0xac, 0x1d, 0x23, 0x9f, 0xaf, 0xfe, 0x06, 0x54, 0x45, 0xb2, 0xfc, 0x3a, 0x40, 0xd5,
-	0xc5, 0x4a, 0x6c, 0xe8, 0x5f, 0x07, 0xa2, 0x5c, 0x59, 0x51, 0xf1, 0x96, 0xab, 0x59, 0x49, 0xfa,
-	0xef, 0x70, 0x27, 0xe5, 0x54, 0xc9, 0x7c, 0x31, 0xa7, 0x32, 0xf7, 0x66, 0x95, 0x33, 0x8d, 0x64,
-	0x0f, 0xaa, 0xae, 0x6f, 0x0f, 0x5c, 0xc7, 0x9b, 0x30, 0x2d, 0x2f, 0x0e, 0xd3, 0xbd, 0x25, 0x6d,
-	0xed, 0xfa, 0x36, 0xad, 0xb8, 0xbe, 0xdd, 0x8d, 0x71, 0xfa, 0x3f, 0x39, 0xa8, 0x24, 0x5c, 0xe4,
-	0x11, 0x94, 0x18, 0x8f, 0x87, 0x22, 0xde, 0x74, 0x6d, 0xb7, 0xb9, 0xb8, 0xe9, 0x79, 0xec, 0xa4,
-	0x12, 0x43, 0xf6, 0x60, 0x45, 0xb6, 0x9d, 0xa9, 0x4a, 0xbe, 0x61, 0xf0, 0x12, 0x24, 0xd1, 0x60,
-	0x65, 0x8a, 0x8c, 0x59, 0x36, 0xaa, 0xd1, 0x49, 0x96, 0x59, 0xf5, 0xc5, 0x1b, 0xaa, 0xbf, 0x80,
-	0xc6, 0x11, 0xba, 0x98, 0x3d, 0x10, 0xff, 0xbf, 0x25, 0xeb, 0x40, 0xe6, 0x69, 0x65, 0x57, 0xf4,
-	0x53, 0x28, 0x75, 0xe2, 0xe7, 0x90, 0x10, 0x28, 0xc6, 0x77, 0xb4, 0xe2, 0x16, 0xdf, 0xe4, 0x73,
-	0x58, 0x67, 0x51, 0x10, 0xf8, 0x21, 0xc7, 0xf1, 0x20, 0xdd, 0x5e, 0xf6, 0xa1, 0x4a, 0x49, 0xea,
-	0xeb, 0x2b, 0x21, 0x4c, 0xdf, 0x12, 0x7d, 0x17, 0x8c, 0x89, 0xf2, 0x25, 0xc4, 0xfa, 0x73, 0xa8,
-	0xcf, 0x60, 0x6a, 0x3e, 0x1e, 0x41, 0x49, 0x3c, 0xcc, 0x6a, 0x38, 0xfe, 0xd3, 0x27, 0x89, 0x96,
-	0x18, 0xfd, 0x2e, 0x34, 0xba, 0x0e, 0x93, 0x0c, 0x4c, 0xed, 0xa4, 0x1f, 0x02, 0x99, 0x37, 0x2a,
-	0xde, 0x1d, 0x28, 0x8b, 0x98, 0xf8, 0x2a, 0x29, 0xbc, 0x9e, 0x58, 0x81, 0xf4, 0xbf, 0xf3, 0xd0,
-	0x54, 0xa3, 0x7b, 0x2a, 0x1f, 0xe1, 0xf7, 0xd6, 0x02, 0xb2, 0x1f, 0x0f, 0x8a, 0xe0, 0x14, 0x6f,
-	0xdf, 0xda, 0xee, 0xc3, 0x85, 0x61, 0x98, 0xbf, 0x18, 0x42, 0x67, 0x44, 0x13, 0x38, 0x79, 0x0a,
-	0xc0, 0xb8, 0x15, 0xf2, 0x41, 0xfc, 0xb2, 0xab, 0x1b, 0xa7, 0x65, 0xc8, 0x67, 0xdf, 0x48, 0x9e,
-	0x7d, 0xa3, 0x9f, 0x3c, 0xfb, 0xb4, 0x2a, 0xd0, 0xf1, 0x9a, 0x7c, 0x09, 0x15, 0xf4, 0xc6, 0x32,
-	0xb0, 0xf4, 0xd6, 0xc0, 0x15, 0xf4, 0xc6, 0x22, 0x6c, 0x07, 0x8a, 0x8c, 0x63, 0xa0, 0x95, 0xd5,
-	0x31, 0x58, 0x0c, 0x39, 0x52, 0xbf, 0x20, 0x54, 0xc0, 0xf4, 0x97, 0x70, 0x6f, 0xb1, 0x6a, 0xaa,
-	0xfe, 0xcf, 0x60, 0x25, 0x44, 0x16, 0xb9, 0x69, 0x03, 0x3e, 0x79, 0x4b, 0xd2, 0x02, 0x4c, 0x93,
-	0x20, 0xfd, 0x8f, 0x1c, 0x10, 0x45, 0xdd, 0xf5, 0xed, 0xf7, 0xd8, 0x8d, 0x75, 0x28, 0xb9, 0x8e,
-	0x87, 0x4c, 0x1c, 0xda, 0x22, 0x95, 0x8b, 0xd8, 0xca, 0xfd, 0x09, 0x7a, 0xa2, 0xc8, 0x55, 0x2a,
-	0x17, 0xba, 0x09, 0x77, 0x33, 0x1a, 0x54, 0x6e, 0x5a, 0x36, 0xb7, 0x6a, 0xaa, 0x7a, 0x46, 0x93,
-	0x9f, 0xa3, 0xf9, 0xec, 0x67, 0x28, 0x89, 0xeb, 0x86, 0x34, 0xa1, 0x41, 0xcd, 0x3e, 0xfd, 0xa1,
-	0x73, 0xd0, 0x35, 0x07, 0xdf, 0x75, 0x4e, 0xba, 0x17, 0xd4, 0xac, 0xdf, 0x8a, 0xcd, 0x67, 0x26,
-	0x3d, 0xed, 0xf4, 0xcc, 0x5e, 0x3f, 0x35, 0xe7, 0x48, 0x0d, 0x56, 0xce, 0xcc, 0xde, 0xd1, 0x49,
-	0xef, 0xb8, 0x9e, 0x8f, 0x17, 0xf4, 0xa2, 0xd7, 0x8b, 0x17, 0x05, 0x72, 0x1b, 0xaa, 0xe7, 0x17,
-	0x87, 0x87, 0xa6, 0x79, 0x64, 0x1e, 0xd5, 0x8b, 0x07, 0xdf, 0xfe, 0xf8, 0x8d, 0xed, 0xf0, 0x5f,
-	0xa2, 0xa1, 0x31, 0xf2, 0xa7, 0x6d, 0x51, 0x66, 0x3f, 0xb4, 0xe5, 0x47, 0x3b, 0xfd, 0xc3, 0xb4,
-	0xd1, 0x6b, 0x07, 0xc3, 0x1d, 0xdb, 0x6f, 0x67, 0x7f, 0x8c, 0x87, 0x65, 0xd1, 0xdd, 0xbd, 0x7f,
-	0x03, 0x00, 0x00, 0xff, 0xff, 0x27, 0x25, 0xfb, 0x86, 0x31, 0x0b, 0x00, 0x00,
+	// 1098 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x6f, 0x6f, 0xdb, 0xd4,
+	0x17, 0x5e, 0xfe, 0x36, 0x39, 0xe9, 0xb6, 0xe4, 0xb6, 0xd9, 0xcf, 0x4d, 0xf7, 0x83, 0xca, 0x50,
+	0x54, 0x31, 0xd5, 0x61, 0x2d, 0x8c, 0x0e, 0xc4, 0xa6, 0xb4, 0x35, 0x5d, 0xa5, 0x34, 0xaa, 0x6e,
+	0x53, 0x34, 0x90, 0x20, 0x72, 0x92, 0x53, 0x63, 0xc5, 0xb1, 0x3d, 0xdf, 0xeb, 0x6a, 0x45, 0xbc,
+	0x82, 0xaf, 0xc0, 0x0b, 0xbe, 0x0b, 0x5f, 0x0e, 0xf9, 0xde, 0x6b, 0x27, 0x0e, 0xd9, 0xe8, 0xc4,
+	0xde, 0xf9, 0xfc, 0x7b, 0xce, 0x73, 0x9f, 0x73, 0xec, 0x6b, 0x68, 0x5d, 0xb9, 0x37, 0x1c, 0x9d,
+	0xb1, 0xdb, 0xb6, 0xc6, 0x53, 0xc7, 0x6b, 0x5b, 0x36, 0x7a, 0xdc, 0x08, 0x42, 0x9f, 0xfb, 0xe4,
+	0x5e, 0x12, 0x33, 0x44, 0xac, 0xf5, 0x30, 0xcd, 0x1d, 0xf9, 0x21, 0xb6, 0x5d, 0x87, 0x63, 0x68,
+	0xb9, 0x4c, 0x66, 0xb7, 0x36, 0xb2, 0x51, 0x6e, 0xb1, 0x49, 0x12, 0xfa, 0x20, 0x1b, 0x72, 0xc6,
+	0xe8, 0x71, 0xe7, 0xca, 0xc1, 0x50, 0xc5, 0xff, 0x9f, 0x8d, 0xe3, 0x6b, 0x1c, 0x45, 0xdc, 0xf1,
+	0x3d, 0x15, 0xde, 0xcc, 0x86, 0xa7, 0xc8, 0x43, 0x67, 0x94, 0x62, 0xdb, 0xbe, 0x6f, 0xbb, 0xd8,
+	0x16, 0xd6, 0x30, 0xba, 0x6a, 0x8f, 0xa3, 0xd0, 0x9a, 0x2b, 0xfe, 0x70, 0x31, 0xce, 0x9d, 0x29,
+	0x32, 0x6e, 0x4d, 0x03, 0x99, 0xa0, 0xff, 0x59, 0x82, 0x66, 0xdf, 0x62, 0x13, 0x33, 0xe9, 0x7a,
+	0x86, 0xdc, 0x1a, 0x5b, 0xdc, 0x22, 0x14, 0x1a, 0xf1, 0x29, 0x06, 0x29, 0x9f, 0x81, 0x33, 0xd6,
+	0x72, 0x5b, 0xb9, 0x9d, 0xda, 0xde, 0x27, 0x46, 0xaa, 0x4d, 0xcc, 0xc9, 0xc8, 0x00, 0x9c, 0xa6,
+	0xe7, 0xa3, 0xf7, 0x79, 0x36, 0x40, 0x1e, 0x42, 0xd5, 0xb3, 0xa6, 0xc8, 0x02, 0x6b, 0x84, 0x5a,
+	0x7e, 0x2b, 0xb7, 0x53, 0xa5, 0x33, 0x07, 0x39, 0x85, 0xb2, 0x6b, 0x0d, 0xd1, 0x65, 0x5a, 0x61,
+	0xab, 0xb0, 0x53, 0xdb, 0x7b, 0x6c, 0x64, 0x47, 0x60, 0x2c, 0x25, 0x6a, 0x74, 0x45, 0x8d, 0xe9,
+	0xf1, 0xf0, 0x86, 0x2a, 0x00, 0xf2, 0x12, 0x6a, 0x96, 0xe7, 0xf9, 0x5c, 0x68, 0xc1, 0xb4, 0xa2,
+	0xc0, 0x7b, 0x72, 0x3b, 0xbc, 0xce, 0xac, 0x50, 0x82, 0xce, 0x43, 0x11, 0x03, 0xd6, 0x26, 0x07,
+	0x6c, 0xc0, 0x30, 0xbc, 0x76, 0x46, 0x38, 0xb0, 0x46, 0x23, 0x3f, 0xf2, 0xb8, 0x56, 0x12, 0x87,
+	0x69, 0x4c, 0x0e, 0xd8, 0x85, 0x8c, 0x74, 0x64, 0x80, 0x70, 0x68, 0xa2, 0x77, 0xed, 0x84, 0xbe,
+	0x37, 0x45, 0x8f, 0x0f, 0xae, 0xad, 0xd0, 0xb1, 0x86, 0x2e, 0x32, 0xad, 0x2c, 0x38, 0x3d, 0xbf,
+	0x1d, 0x27, 0x73, 0x06, 0xf1, 0x5d, 0x82, 0x20, 0xc9, 0xad, 0xe3, 0x92, 0x50, 0xeb, 0x29, 0xd4,
+	0xe6, 0x64, 0x21, 0x75, 0x28, 0x4c, 0xf0, 0x46, 0x4c, 0xaf, 0x4a, 0xe3, 0x47, 0xb2, 0x0e, 0xa5,
+	0x6b, 0xcb, 0x8d, 0x92, 0x29, 0x48, 0xe3, 0xab, 0xfc, 0x41, 0xae, 0xf5, 0x0c, 0xea, 0x8b, 0x0a,
+	0xbc, 0x53, 0xfd, 0x09, 0x6c, 0xbc, 0x91, 0xed, 0xbb, 0x00, 0xe9, 0xbf, 0xe7, 0xa1, 0x71, 0x14,
+	0xa2, 0xc5, 0x31, 0xd6, 0x84, 0xe2, 0xab, 0x08, 0x19, 0x27, 0x8f, 0xa1, 0xec, 0x78, 0x41, 0xc4,
+	0x99, 0xda, 0xc5, 0x8d, 0x85, 0x5d, 0xec, 0xca, 0xf7, 0xf2, 0xcc, 0x0a, 0xa8, 0x4a, 0x24, 0x5f,
+	0x42, 0x85, 0xe3, 0x34, 0x70, 0x2d, 0x2e, 0xbb, 0xd4, 0xf6, 0x36, 0x97, 0x2c, 0x70, 0x5f, 0xa5,
+	0xd0, 0x34, 0x99, 0x7c, 0x04, 0x77, 0xfd, 0x88, 0x07, 0x11, 0x1f, 0x04, 0x21, 0x5e, 0x39, 0xaf,
+	0xb5, 0x82, 0xe0, 0xb8, 0x2a, 0x9d, 0xe7, 0xc2, 0x47, 0x7e, 0x84, 0xff, 0x2d, 0xbc, 0x27, 0x53,
+	0x35, 0x35, 0xad, 0x28, 0x9a, 0x6d, 0xdf, 0x6a, 0xc4, 0xb4, 0xc9, 0x97, 0xb9, 0xf5, 0x5f, 0x80,
+	0xcc, 0x8b, 0xc0, 0x02, 0xdf, 0x63, 0x48, 0xb6, 0xe1, 0x6e, 0x88, 0xcc, 0x8f, 0xc2, 0x11, 0x8a,
+	0x76, 0x42, 0x8c, 0xd5, 0x17, 0x77, 0xe8, 0x6a, 0xe2, 0x8e, 0x01, 0xc8, 0x13, 0xa8, 0x24, 0xb6,
+	0x3a, 0xb9, 0xb6, 0x48, 0x86, 0xaa, 0xf8, 0x8b, 0x3b, 0x34, 0xcd, 0x3d, 0x2c, 0x41, 0x21, 0x44,
+	0xa6, 0x53, 0xb8, 0x77, 0x82, 0x7c, 0x5e, 0xfd, 0x4d, 0xa8, 0x8a, 0xc3, 0xf2, 0x9b, 0x00, 0xd5,
+	0x14, 0x2b, 0xb1, 0xa3, 0x7f, 0x13, 0x08, 0xb9, 0xb2, 0xa4, 0xe2, 0x96, 0xab, 0x59, 0x4a, 0xfa,
+	0xaf, 0x70, 0x3f, 0xc5, 0x54, 0x87, 0xf9, 0x7c, 0x8e, 0x65, 0xee, 0xed, 0x2c, 0x67, 0x1c, 0xc9,
+	0x3e, 0x54, 0x5d, 0xdf, 0x1e, 0xb8, 0x8e, 0x37, 0x61, 0x5a, 0x5e, 0xbc, 0x4c, 0x0f, 0x96, 0x8c,
+	0xb5, 0xeb, 0xdb, 0xb4, 0xe2, 0xfa, 0x76, 0x37, 0xce, 0xd3, 0xff, 0xca, 0x41, 0x25, 0xc1, 0x22,
+	0x8f, 0xa0, 0xc4, 0x78, 0xbc, 0x14, 0x71, 0xd3, 0x7b, 0x7b, 0xcd, 0xc5, 0xa6, 0x17, 0x71, 0x90,
+	0xca, 0x1c, 0xb2, 0x0f, 0x2b, 0x72, 0xec, 0x4c, 0x29, 0xf9, 0x96, 0xc5, 0x4b, 0x32, 0x89, 0x06,
+	0x2b, 0x53, 0x64, 0xcc, 0xb2, 0x51, 0xad, 0x4e, 0x62, 0x66, 0xd9, 0x17, 0x6f, 0xc9, 0xfe, 0x12,
+	0x1a, 0xc7, 0xe8, 0x62, 0xf6, 0x85, 0xf8, 0xef, 0x23, 0x59, 0x07, 0x32, 0x0f, 0x2b, 0xa7, 0xa2,
+	0x9f, 0x41, 0xa9, 0x13, 0x5f, 0x87, 0x84, 0x40, 0x31, 0xfe, 0x46, 0x2b, 0x6c, 0xf1, 0x4c, 0x3e,
+	0x83, 0x75, 0x16, 0x05, 0x81, 0x1f, 0x72, 0x1c, 0x0f, 0xd2, 0xf6, 0x72, 0x0e, 0x55, 0x4a, 0xd2,
+	0x58, 0x5f, 0x11, 0x61, 0xfa, 0xb6, 0x98, 0xbb, 0x40, 0x4c, 0x98, 0x2f, 0x01, 0xd6, 0x9f, 0x43,
+	0x7d, 0x96, 0xa6, 0xf6, 0xe3, 0x11, 0x94, 0xc4, 0xc5, 0xac, 0x96, 0xe3, 0x1f, 0x73, 0x92, 0xd9,
+	0x32, 0x47, 0x5f, 0x83, 0x46, 0xd7, 0x61, 0x12, 0x81, 0xa9, 0x4e, 0xfa, 0x11, 0x90, 0x79, 0xa7,
+	0xc2, 0xdd, 0x85, 0xb2, 0xa8, 0x89, 0x3f, 0x25, 0x85, 0x37, 0x03, 0xab, 0x24, 0xfd, 0x8f, 0x3c,
+	0x34, 0xd5, 0xea, 0x9e, 0xc9, 0x4b, 0xf8, 0xbd, 0x8d, 0x20, 0x5e, 0x94, 0x57, 0x11, 0x86, 0x0e,
+	0xca, 0xbb, 0xaf, 0x4a, 0x13, 0x93, 0x3c, 0x05, 0x60, 0xdc, 0x0a, 0xf9, 0x20, 0xbe, 0xb9, 0xd5,
+	0x17, 0xa5, 0x65, 0xc8, 0x6b, 0xdd, 0x48, 0xae, 0x75, 0xa3, 0x9f, 0x5c, 0xeb, 0xb4, 0x2a, 0xb2,
+	0x63, 0x9b, 0x7c, 0x01, 0x15, 0xf4, 0xc6, 0xb2, 0xb0, 0xf4, 0xaf, 0x85, 0x2b, 0xe8, 0x8d, 0x45,
+	0xd9, 0x2e, 0x14, 0x19, 0xc7, 0x40, 0x2b, 0xab, 0x35, 0x5f, 0x2c, 0x39, 0x56, 0xbf, 0x18, 0x54,
+	0xa4, 0xe9, 0x2f, 0xe1, 0xc1, 0xa2, 0x2a, 0x4a, 0xdf, 0x67, 0xb0, 0x12, 0x22, 0x8b, 0xdc, 0x54,
+	0xe0, 0x8f, 0x17, 0x36, 0x7c, 0xfe, 0x6b, 0x17, 0x3a, 0x23, 0x2a, 0x92, 0x69, 0x52, 0xa4, 0xff,
+	0x96, 0x03, 0xa2, 0xa0, 0xbb, 0xbe, 0xfd, 0x1e, 0xd5, 0x5e, 0x87, 0x92, 0xeb, 0x78, 0x42, 0xeb,
+	0xdc, 0x4e, 0x91, 0x4a, 0x23, 0xf6, 0x72, 0x7f, 0x82, 0x9e, 0x10, 0xb9, 0x4a, 0xa5, 0xa1, 0x9b,
+	0xb0, 0x96, 0xe1, 0xa0, 0xce, 0xa6, 0x65, 0xcf, 0x56, 0x4d, 0x59, 0xcf, 0x60, 0xf2, 0x73, 0x30,
+	0x9f, 0xfe, 0x04, 0x25, 0xf1, 0x39, 0x21, 0x4d, 0x68, 0x50, 0xb3, 0x4f, 0xbf, 0xef, 0x1c, 0x76,
+	0xcd, 0xc1, 0xb7, 0x9d, 0xd3, 0xee, 0x25, 0x35, 0xeb, 0x77, 0x62, 0xf7, 0xb9, 0x49, 0xcf, 0x3a,
+	0x3d, 0xb3, 0xd7, 0x4f, 0xdd, 0x39, 0x52, 0x83, 0x95, 0x73, 0xb3, 0x77, 0x7c, 0xda, 0x3b, 0xa9,
+	0xe7, 0x63, 0x83, 0x5e, 0xf6, 0x7a, 0xb1, 0x51, 0x20, 0x77, 0xa1, 0x7a, 0x71, 0x79, 0x74, 0x64,
+	0x9a, 0xc7, 0xe6, 0x71, 0xbd, 0x78, 0xf8, 0xcd, 0x0f, 0x5f, 0xdb, 0x0e, 0xff, 0x39, 0x1a, 0x1a,
+	0x23, 0x7f, 0xda, 0x16, 0x32, 0xfb, 0xa1, 0x2d, 0x1f, 0xda, 0xe9, 0x1f, 0xa4, 0x8d, 0x5e, 0x3b,
+	0x18, 0xee, 0xda, 0x7e, 0x3b, 0xfb, 0xe3, 0x3b, 0x2c, 0x8b, 0xe9, 0xee, 0xff, 0x1d, 0x00, 0x00,
+	0xff, 0xff, 0xaf, 0x08, 0xa3, 0x3f, 0x11, 0x0b, 0x00, 0x00,
 }
diff --git a/flyteidl/gen/pb-go/flyteidl/core/metrics.pb.go b/flyteidl/gen/pb-go/flyteidl/core/metrics.pb.go
index 894769330b..524af3bb92 100644
--- a/flyteidl/gen/pb-go/flyteidl/core/metrics.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/core/metrics.pb.go
@@ -22,45 +22,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-type ExecutionMetric int32
-
-const (
-	ExecutionMetric_EXECUTION_METRIC_UNDEFINED ExecutionMetric = 0
-	// Average memory usage, measured in bytes
-	ExecutionMetric_EXECUTION_METRIC_USED_MEMORY_BYTES_AVG ExecutionMetric = 1
-	// Average memory allocation, measured in bytes
-	ExecutionMetric_EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG ExecutionMetric = 2
-	// CPU metrics
-	// Average CPU usage, measured in CPU cores
-	ExecutionMetric_EXECUTION_METRIC_USED_CPU_AVG ExecutionMetric = 20
-	// Average CPU allocation, measured in CPU cores
-	ExecutionMetric_EXECUTION_METRIC_ALLOCATED_CPU_AVG ExecutionMetric = 21
-)
-
-var ExecutionMetric_name = map[int32]string{
-	0:  "EXECUTION_METRIC_UNDEFINED",
-	1:  "EXECUTION_METRIC_USED_MEMORY_BYTES_AVG",
-	2:  "EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG",
-	20: "EXECUTION_METRIC_USED_CPU_AVG",
-	21: "EXECUTION_METRIC_ALLOCATED_CPU_AVG",
-}
-
-var ExecutionMetric_value = map[string]int32{
-	"EXECUTION_METRIC_UNDEFINED":                  0,
-	"EXECUTION_METRIC_USED_MEMORY_BYTES_AVG":      1,
-	"EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG": 2,
-	"EXECUTION_METRIC_USED_CPU_AVG":               20,
-	"EXECUTION_METRIC_ALLOCATED_CPU_AVG":          21,
-}
-
-func (x ExecutionMetric) String() string {
-	return proto.EnumName(ExecutionMetric_name, int32(x))
-}
-
-func (ExecutionMetric) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_756935f796ae3119, []int{0}
-}
-
 // Span represents a duration trace of Flyte execution. The id field denotes a Flyte execution entity or an operation
 // which uniquely identifies the Span. The spans attribute allows this Span to be further broken down into more
 // precise definitions.
@@ -203,7 +164,7 @@ func (*Span) XXX_OneofWrappers() []interface{} {
 
 type ExecutionMetricResult struct {
 	// The metric this data represents
-	Metric ExecutionMetric `protobuf:"varint,1,opt,name=metric,proto3,enum=flyteidl.core.ExecutionMetric" json:"metric,omitempty"`
+	Metric string `protobuf:"bytes,1,opt,name=metric,proto3" json:"metric,omitempty"`
 	// The result data in prometheus range query result format
 	// https://prometheus.io/docs/prometheus/latest/querying/api/#expression-query-result-formats.
 	// This may include multiple time series, differentiated by their metric labels.
@@ -240,11 +201,11 @@ func (m *ExecutionMetricResult) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ExecutionMetricResult proto.InternalMessageInfo
 
-func (m *ExecutionMetricResult) GetMetric() ExecutionMetric {
+func (m *ExecutionMetricResult) GetMetric() string {
 	if m != nil {
 		return m.Metric
 	}
-	return ExecutionMetric_EXECUTION_METRIC_UNDEFINED
+	return ""
 }
 
 func (m *ExecutionMetricResult) GetData() *_struct.Struct {
@@ -255,7 +216,6 @@ func (m *ExecutionMetricResult) GetData() *_struct.Struct {
 }
 
 func init() {
-	proto.RegisterEnum("flyteidl.core.ExecutionMetric", ExecutionMetric_name, ExecutionMetric_value)
 	proto.RegisterType((*Span)(nil), "flyteidl.core.Span")
 	proto.RegisterType((*ExecutionMetricResult)(nil), "flyteidl.core.ExecutionMetricResult")
 }
@@ -263,37 +223,30 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/core/metrics.proto", fileDescriptor_756935f796ae3119) }
 
 var fileDescriptor_756935f796ae3119 = []byte{
-	// 500 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xed, 0x8e, 0xd2, 0x4c,
-	0x14, 0xc7, 0x79, 0x5b, 0x78, 0xf6, 0xf0, 0xa8, 0x9b, 0xd1, 0x8d, 0x04, 0x15, 0x11, 0x13, 0x82,
-	0x6c, 0x6c, 0x13, 0x8c, 0x26, 0x1a, 0xbf, 0xf0, 0x52, 0xdd, 0x26, 0x5b, 0x30, 0xa5, 0xa8, 0xeb,
-	0x97, 0xa6, 0x74, 0x86, 0x3a, 0xa1, 0x74, 0x9a, 0x76, 0x9a, 0xd5, 0xc4, 0xbb, 0xf1, 0xaa, 0xbc,
-	0x1b, 0x33, 0x53, 0x4a, 0x42, 0x41, 0xfd, 0xc6, 0x70, 0x7e, 0xff, 0xdf, 0xa4, 0xe7, 0x9c, 0x81,
-	0x07, 0x2b, 0xff, 0x3b, 0x27, 0x14, 0xfb, 0xaa, 0xcb, 0x22, 0xa2, 0x6e, 0x08, 0x8f, 0xa8, 0x1b,
-	0x2b, 0x61, 0xc4, 0x38, 0x43, 0xb7, 0xb2, 0xa2, 0x22, 0x8a, 0xcd, 0xd6, 0x3e, 0x4b, 0x31, 0x09,
-	0x38, 0x5d, 0x51, 0x12, 0xa5, 0x78, 0xf3, 0xb1, 0xc7, 0x98, 0xe7, 0x13, 0x55, 0x9e, 0x96, 0xc9,
-	0x4a, 0xe5, 0x74, 0x43, 0x62, 0xee, 0x6c, 0xc2, 0x2d, 0xf0, 0x30, 0x0f, 0xc4, 0x3c, 0x4a, 0x5c,
-	0x9e, 0x56, 0x3b, 0x3f, 0xcb, 0x50, 0x99, 0x87, 0x4e, 0x80, 0x5e, 0x03, 0xc4, 0xdc, 0x89, 0xb8,
-	0x2d, 0xf2, 0x8d, 0x62, 0xbb, 0xd8, 0xab, 0x0f, 0x9a, 0x4a, 0x9a, 0x55, 0xb2, 0xac, 0x62, 0x65,
-	0x72, 0xf3, 0x54, 0xd2, 0xe2, 0x8c, 0x5e, 0xc2, 0x7f, 0x24, 0xc0, 0x69, 0xb0, 0xf4, 0xcf, 0x60,
-	0x8d, 0x04, 0x58, 0xc6, 0x0c, 0xa8, 0xdf, 0xb0, 0x68, 0xbd, 0xf2, 0xd9, 0x8d, 0x4d, 0x71, 0xa3,
-	0x2c, 0x93, 0x7d, 0x65, 0xef, 0xf3, 0x95, 0x4f, 0x5b, 0x42, 0xfb, 0x46, 0xdc, 0x84, 0x53, 0x16,
-	0xe8, 0xbb, 0x06, 0x5c, 0x16, 0x4c, 0xc8, 0x04, 0x3a, 0x46, 0x43, 0xa8, 0x05, 0x0c, 0x13, 0xa1,
-	0xaa, 0x48, 0x55, 0x37, 0xa7, 0x9a, 0x32, 0x4c, 0x8e, 0x6b, 0xaa, 0x22, 0x98, 0x2a, 0xb8, 0x13,
-	0xaf, 0x85, 0xe2, 0xe4, 0xa8, 0xc2, 0x72, 0xe2, 0xf5, 0x1f, 0x14, 0x22, 0xa8, 0x63, 0xf4, 0x14,
-	0xfe, 0x67, 0x21, 0x89, 0x1c, 0x01, 0x08, 0x4f, 0xb5, 0x5d, 0xec, 0x9d, 0x5e, 0x16, 0xcc, 0xfa,
-	0xee, 0x5f, 0x1d, 0xa3, 0x67, 0x70, 0x12, 0x87, 0x4e, 0x10, 0x37, 0x6a, 0xed, 0x72, 0xaf, 0x3e,
-	0xb8, 0x9b, 0xbb, 0x45, 0xcc, 0xc3, 0x4c, 0x89, 0x51, 0x05, 0x4a, 0x14, 0x77, 0x7e, 0xc0, 0xf9,
-	0xee, 0x5a, 0x43, 0x6e, 0x8b, 0x49, 0xe2, 0xc4, 0xe7, 0xe8, 0x15, 0x54, 0xd3, 0xed, 0x91, 0x13,
-	0xbb, 0x3d, 0x68, 0xe5, 0x54, 0xf9, 0xd4, 0x96, 0x46, 0x17, 0x50, 0xc1, 0x0e, 0x77, 0xb6, 0xe3,
-	0xba, 0x7f, 0x30, 0xae, 0xb9, 0xdc, 0x11, 0x53, 0x42, 0xfd, 0x5f, 0x45, 0xb8, 0x93, 0x13, 0xa1,
-	0x16, 0x34, 0xb5, 0xcf, 0xda, 0x78, 0x61, 0xe9, 0xb3, 0xa9, 0x6d, 0x68, 0x96, 0xa9, 0x8f, 0xed,
-	0xc5, 0x74, 0xa2, 0xbd, 0xd3, 0xa7, 0xda, 0xe4, 0xac, 0x80, 0xfa, 0xd0, 0x3d, 0xac, 0xcf, 0xb5,
-	0x89, 0x6d, 0x68, 0xc6, 0xcc, 0xbc, 0xb6, 0x47, 0xd7, 0x96, 0x36, 0xb7, 0x87, 0x1f, 0xdf, 0x9f,
-	0x15, 0x91, 0x0a, 0x17, 0x07, 0xec, 0xf0, 0xea, 0x6a, 0x36, 0x1e, 0x5a, 0xc7, 0x02, 0x25, 0xf4,
-	0x04, 0x1e, 0x1d, 0x97, 0x8f, 0x3f, 0x2c, 0x24, 0x72, 0x0f, 0x75, 0xa1, 0xf3, 0x17, 0x67, 0xc6,
-	0x9d, 0x8f, 0xde, 0x7e, 0x79, 0xe3, 0x51, 0xfe, 0x35, 0x59, 0x2a, 0x2e, 0xdb, 0xa8, 0xb2, 0x79,
-	0x2c, 0xf2, 0xd2, 0x1f, 0xea, 0xee, 0xe9, 0x79, 0x24, 0x50, 0xc3, 0xe5, 0x73, 0x8f, 0xa9, 0x7b,
-	0xaf, 0x71, 0x59, 0x95, 0x0d, 0x7b, 0xf1, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x77, 0x97, 0xe9, 0x1f,
-	0xd1, 0x03, 0x00, 0x00,
+	// 393 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x51, 0xcb, 0xd3, 0x30,
+	0x14, 0x86, 0xbf, 0x7d, 0xeb, 0x3a, 0x97, 0xea, 0x4d, 0x44, 0x1d, 0x53, 0x74, 0x4c, 0x90, 0xa9,
+	0x98, 0xc0, 0xc4, 0x0b, 0xc5, 0x1b, 0x07, 0xc2, 0x7a, 0x31, 0x2f, 0xba, 0x81, 0x20, 0xc2, 0x48,
+	0x9b, 0xb4, 0x86, 0xb5, 0x49, 0x49, 0x52, 0xa6, 0xbf, 0xc7, 0x3f, 0x2a, 0x49, 0xda, 0xc2, 0xe6,
+	0xc4, 0xbb, 0x9e, 0x9e, 0xf7, 0x79, 0xd2, 0xe6, 0x1c, 0xf0, 0x38, 0x2f, 0x7f, 0x19, 0xc6, 0x69,
+	0x89, 0x33, 0xa9, 0x18, 0xae, 0x98, 0x51, 0x3c, 0xd3, 0xa8, 0x56, 0xd2, 0x48, 0x78, 0xaf, 0x6b,
+	0x22, 0xdb, 0x9c, 0x3d, 0x3d, 0xcf, 0x72, 0xca, 0x84, 0xe1, 0x39, 0x67, 0xca, 0xc7, 0x67, 0xcf,
+	0x0a, 0x29, 0x8b, 0x92, 0x61, 0x57, 0xa5, 0x4d, 0x8e, 0x0d, 0xaf, 0x98, 0x36, 0xa4, 0xaa, 0xdb,
+	0xc0, 0x93, 0xcb, 0x80, 0x36, 0xaa, 0xc9, 0x8c, 0xef, 0x2e, 0x7e, 0x0f, 0x41, 0xb0, 0xab, 0x89,
+	0x80, 0xef, 0x01, 0xd0, 0x86, 0x28, 0x73, 0xb0, 0xfc, 0x74, 0x30, 0x1f, 0x2c, 0xa3, 0xd5, 0x0c,
+	0x79, 0x16, 0x75, 0x2c, 0xda, 0x77, 0xf2, 0x64, 0xe2, 0xd2, 0xb6, 0x86, 0xef, 0xc0, 0x1d, 0x26,
+	0xa8, 0x07, 0x6f, 0xff, 0x0b, 0x8e, 0x99, 0xa0, 0x0e, 0xdb, 0x82, 0xe8, 0x24, 0xd5, 0x31, 0x2f,
+	0xe5, 0xe9, 0xc0, 0xe9, 0x74, 0xe8, 0xc8, 0x57, 0xe8, 0xec, 0xf7, 0xd1, 0xd7, 0x36, 0xf1, 0xf9,
+	0x27, 0xcb, 0x1a, 0xc3, 0xa5, 0x88, 0xfb, 0x0b, 0xd8, 0xdc, 0x24, 0xa0, 0x13, 0xc4, 0x14, 0x7e,
+	0x02, 0x63, 0x21, 0x29, 0xb3, 0xaa, 0xc0, 0xa9, 0x5e, 0x5c, 0xa8, 0xbe, 0x48, 0xca, 0xae, 0x6b,
+	0x42, 0x0b, 0x7a, 0x85, 0x21, 0xfa, 0x68, 0x15, 0xa3, 0xab, 0x8a, 0x3d, 0xd1, 0xc7, 0x7f, 0x28,
+	0x2c, 0x18, 0x53, 0xf8, 0x1c, 0xdc, 0x95, 0x35, 0x53, 0xc4, 0x06, 0xac, 0x27, 0x9c, 0x0f, 0x96,
+	0x93, 0xcd, 0x4d, 0x12, 0xf5, 0x6f, 0x63, 0x0a, 0x5f, 0x82, 0x91, 0xae, 0x89, 0xd0, 0xd3, 0xf1,
+	0x7c, 0xb8, 0x8c, 0x56, 0xf7, 0x2f, 0x4e, 0xb1, 0xf3, 0x48, 0x7c, 0x62, 0x1d, 0x80, 0x5b, 0x4e,
+	0x17, 0xdf, 0xc1, 0x83, 0xfe, 0xd8, 0xad, 0xdb, 0x96, 0x84, 0xe9, 0xa6, 0x34, 0xf0, 0x21, 0x08,
+	0xfd, 0xf6, 0xb8, 0x89, 0x4d, 0x92, 0xb6, 0x82, 0xaf, 0x41, 0x40, 0x89, 0x21, 0xed, 0x38, 0x1e,
+	0xfd, 0x35, 0x8e, 0x9d, 0xdb, 0x81, 0xc4, 0x85, 0xd6, 0x1f, 0xbf, 0x7d, 0x28, 0xb8, 0xf9, 0xd1,
+	0xa4, 0x28, 0x93, 0x15, 0x76, 0xdf, 0x22, 0x55, 0xe1, 0x1f, 0x70, 0xbf, 0x7e, 0x05, 0x13, 0xb8,
+	0x4e, 0xdf, 0x14, 0x12, 0x9f, 0x6d, 0x64, 0x1a, 0x3a, 0xe9, 0xdb, 0x3f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xd7, 0xa7, 0xf1, 0xb0, 0xd5, 0x02, 0x00, 0x00,
 }
diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
index a729ba65d7..aa9c2e0252 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
+++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
@@ -563,23 +563,11 @@
       },
       "description": "Represents an error thrown from a node."
     },
-    "coreExecutionMetric": {
-      "type": "string",
-      "enum": [
-        "EXECUTION_METRIC_UNDEFINED",
-        "EXECUTION_METRIC_USED_MEMORY_BYTES_AVG",
-        "EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG",
-        "EXECUTION_METRIC_USED_CPU_AVG",
-        "EXECUTION_METRIC_ALLOCATED_CPU_AVG"
-      ],
-      "default": "EXECUTION_METRIC_UNDEFINED",
-      "title": "- EXECUTION_METRIC_USED_MEMORY_BYTES_AVG: Average memory usage, measured in bytes\n - EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG: Average memory allocation, measured in bytes\n - EXECUTION_METRIC_USED_CPU_AVG: CPU metrics\nAverage CPU usage, measured in CPU cores\n - EXECUTION_METRIC_ALLOCATED_CPU_AVG: Average CPU allocation, measured in CPU cores"
-    },
     "coreExecutionMetricResult": {
       "type": "object",
       "properties": {
         "metric": {
-          "$ref": "#/definitions/coreExecutionMetric",
+          "type": "string",
           "title": "The metric this data represents"
         },
         "data": {
diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
index c1b7937f1d..6eac63cb73 100644
--- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
+++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
@@ -12059,42 +12059,35 @@ public interface GetTaskMetricsRequestOrBuilder extends
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    java.util.List<flyteidl.core.Metrics.ExecutionMetric> getMetricsList();
-    /**
-     * <pre>
-     * The metrics to query. If empty, will return a default set of metrics.
-     * </pre>
-     *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
-     */
-    int getMetricsCount();
+    java.util.List<java.lang.String>
+        getQueriesList();
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    flyteidl.core.Metrics.ExecutionMetric getMetrics(int index);
+    int getQueriesCount();
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    java.util.List<java.lang.Integer>
-    getMetricsValueList();
+    java.lang.String getQueries(int index);
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    int getMetricsValue(int index);
+    com.google.protobuf.ByteString
+        getQueriesBytes(int index);
 
     /**
      * <pre>
@@ -12190,7 +12183,7 @@ private GetTaskMetricsRequest(com.google.protobuf.GeneratedMessageV3.Builder<?>
     private GetTaskMetricsRequest() {
       taskType_ = "";
       resourceMeta_ = com.google.protobuf.ByteString.EMPTY;
-      metrics_ = java.util.Collections.emptyList();
+      queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     }
 
     @java.lang.Override
@@ -12228,27 +12221,13 @@ private GetTaskMetricsRequest(
               resourceMeta_ = input.readBytes();
               break;
             }
-            case 24: {
-              int rawValue = input.readEnum();
+            case 26: {
+              java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                metrics_ = new java.util.ArrayList<java.lang.Integer>();
+                queries_ = new com.google.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              metrics_.add(rawValue);
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int oldLimit = input.pushLimit(length);
-              while(input.getBytesUntilLimit() > 0) {
-                int rawValue = input.readEnum();
-                if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                  metrics_ = new java.util.ArrayList<java.lang.Integer>();
-                  mutable_bitField0_ |= 0x00000004;
-                }
-                metrics_.add(rawValue);
-              }
-              input.popLimit(oldLimit);
+              queries_.add(s);
               break;
             }
             case 34: {
@@ -12306,7 +12285,7 @@ private GetTaskMetricsRequest(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          metrics_ = java.util.Collections.unmodifiableList(metrics_);
+          queries_ = queries_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -12381,71 +12360,50 @@ public com.google.protobuf.ByteString getResourceMeta() {
       return resourceMeta_;
     }
 
-    public static final int METRICS_FIELD_NUMBER = 3;
-    private java.util.List<java.lang.Integer> metrics_;
-    private static final com.google.protobuf.Internal.ListAdapter.Converter<
-        java.lang.Integer, flyteidl.core.Metrics.ExecutionMetric> metrics_converter_ =
-            new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer, flyteidl.core.Metrics.ExecutionMetric>() {
-              public flyteidl.core.Metrics.ExecutionMetric convert(java.lang.Integer from) {
-                @SuppressWarnings("deprecation")
-                flyteidl.core.Metrics.ExecutionMetric result = flyteidl.core.Metrics.ExecutionMetric.valueOf(from);
-                return result == null ? flyteidl.core.Metrics.ExecutionMetric.UNRECOGNIZED : result;
-              }
-            };
-    /**
-     * <pre>
-     * The metrics to query. If empty, will return a default set of metrics.
-     * </pre>
-     *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
-     */
-    public java.util.List<flyteidl.core.Metrics.ExecutionMetric> getMetricsList() {
-      return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer, flyteidl.core.Metrics.ExecutionMetric>(metrics_, metrics_converter_);
-    }
+    public static final int QUERIES_FIELD_NUMBER = 3;
+    private com.google.protobuf.LazyStringList queries_;
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    public int getMetricsCount() {
-      return metrics_.size();
+    public com.google.protobuf.ProtocolStringList
+        getQueriesList() {
+      return queries_;
     }
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    public flyteidl.core.Metrics.ExecutionMetric getMetrics(int index) {
-      return metrics_converter_.convert(metrics_.get(index));
+    public int getQueriesCount() {
+      return queries_.size();
     }
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    public java.util.List<java.lang.Integer>
-    getMetricsValueList() {
-      return metrics_;
+    public java.lang.String getQueries(int index) {
+      return queries_.get(index);
     }
     /**
      * <pre>
      * The metrics to query. If empty, will return a default set of metrics.
      * </pre>
      *
-     * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+     * <code>repeated string queries = 3;</code>
      */
-    public int getMetricsValue(int index) {
-      return metrics_.get(index);
+    public com.google.protobuf.ByteString
+        getQueriesBytes(int index) {
+      return queries_.getByteString(index);
     }
-    private int metricsMemoizedSerializedSize;
 
     public static final int START_TIME_FIELD_NUMBER = 4;
     private com.google.protobuf.Timestamp startTime_;
@@ -12560,19 +12518,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (!getTaskTypeBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, taskType_);
       }
       if (!resourceMeta_.isEmpty()) {
         output.writeBytes(2, resourceMeta_);
       }
-      if (getMetricsList().size() > 0) {
-        output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(metricsMemoizedSerializedSize);
-      }
-      for (int i = 0; i < metrics_.size(); i++) {
-        output.writeEnumNoTag(metrics_.get(i));
+      for (int i = 0; i < queries_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, queries_.getRaw(i));
       }
       if (startTime_ != null) {
         output.writeMessage(4, getStartTime());
@@ -12601,15 +12554,11 @@ public int getSerializedSize() {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < metrics_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeEnumSizeNoTag(metrics_.get(i));
+        for (int i = 0; i < queries_.size(); i++) {
+          dataSize += computeStringSizeNoTag(queries_.getRaw(i));
         }
         size += dataSize;
-        if (!getMetricsList().isEmpty()) {  size += 1;
-          size += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(dataSize);
-        }metricsMemoizedSerializedSize = dataSize;
+        size += 1 * getQueriesList().size();
       }
       if (startTime_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -12642,7 +12591,8 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getTaskType())) return false;
       if (!getResourceMeta()
           .equals(other.getResourceMeta())) return false;
-      if (!metrics_.equals(other.metrics_)) return false;
+      if (!getQueriesList()
+          .equals(other.getQueriesList())) return false;
       if (hasStartTime() != other.hasStartTime()) return false;
       if (hasStartTime()) {
         if (!getStartTime()
@@ -12673,9 +12623,9 @@ public int hashCode() {
       hash = (53 * hash) + getTaskType().hashCode();
       hash = (37 * hash) + RESOURCE_META_FIELD_NUMBER;
       hash = (53 * hash) + getResourceMeta().hashCode();
-      if (getMetricsCount() > 0) {
-        hash = (37 * hash) + METRICS_FIELD_NUMBER;
-        hash = (53 * hash) + metrics_.hashCode();
+      if (getQueriesCount() > 0) {
+        hash = (37 * hash) + QUERIES_FIELD_NUMBER;
+        hash = (53 * hash) + getQueriesList().hashCode();
       }
       if (hasStartTime()) {
         hash = (37 * hash) + START_TIME_FIELD_NUMBER;
@@ -12830,7 +12780,7 @@ public Builder clear() {
 
         resourceMeta_ = com.google.protobuf.ByteString.EMPTY;
 
-        metrics_ = java.util.Collections.emptyList();
+        queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (startTimeBuilder_ == null) {
           startTime_ = null;
@@ -12881,10 +12831,10 @@ public flyteidl.admin.AgentOuterClass.GetTaskMetricsRequest buildPartial() {
         result.taskType_ = taskType_;
         result.resourceMeta_ = resourceMeta_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          metrics_ = java.util.Collections.unmodifiableList(metrics_);
+          queries_ = queries_.getUnmodifiableView();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.metrics_ = metrics_;
+        result.queries_ = queries_;
         if (startTimeBuilder_ == null) {
           result.startTime_ = startTime_;
         } else {
@@ -12956,13 +12906,13 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.GetTaskMetricsRequest ot
         if (other.getResourceMeta() != com.google.protobuf.ByteString.EMPTY) {
           setResourceMeta(other.getResourceMeta());
         }
-        if (!other.metrics_.isEmpty()) {
-          if (metrics_.isEmpty()) {
-            metrics_ = other.metrics_;
+        if (!other.queries_.isEmpty()) {
+          if (queries_.isEmpty()) {
+            queries_ = other.queries_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureMetricsIsMutable();
-            metrics_.addAll(other.metrics_);
+            ensureQueriesIsMutable();
+            queries_.addAll(other.queries_);
           }
           onChanged();
         }
@@ -13135,91 +13085,69 @@ public Builder clearResourceMeta() {
         return this;
       }
 
-      private java.util.List<java.lang.Integer> metrics_ =
-        java.util.Collections.emptyList();
-      private void ensureMetricsIsMutable() {
+      private com.google.protobuf.LazyStringList queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureQueriesIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          metrics_ = new java.util.ArrayList<java.lang.Integer>(metrics_);
+          queries_ = new com.google.protobuf.LazyStringArrayList(queries_);
           bitField0_ |= 0x00000004;
-        }
+         }
       }
       /**
        * <pre>
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public java.util.List<flyteidl.core.Metrics.ExecutionMetric> getMetricsList() {
-        return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer, flyteidl.core.Metrics.ExecutionMetric>(metrics_, metrics_converter_);
+      public com.google.protobuf.ProtocolStringList
+          getQueriesList() {
+        return queries_.getUnmodifiableView();
       }
       /**
        * <pre>
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public int getMetricsCount() {
-        return metrics_.size();
+      public int getQueriesCount() {
+        return queries_.size();
       }
       /**
        * <pre>
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public flyteidl.core.Metrics.ExecutionMetric getMetrics(int index) {
-        return metrics_converter_.convert(metrics_.get(index));
+      public java.lang.String getQueries(int index) {
+        return queries_.get(index);
       }
       /**
        * <pre>
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder setMetrics(
-          int index, flyteidl.core.Metrics.ExecutionMetric value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMetricsIsMutable();
-        metrics_.set(index, value.getNumber());
-        onChanged();
-        return this;
+      public com.google.protobuf.ByteString
+          getQueriesBytes(int index) {
+        return queries_.getByteString(index);
       }
       /**
        * <pre>
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder addMetrics(flyteidl.core.Metrics.ExecutionMetric value) {
+      public Builder setQueries(
+          int index, java.lang.String value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureMetricsIsMutable();
-        metrics_.add(value.getNumber());
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * The metrics to query. If empty, will return a default set of metrics.
-       * </pre>
-       *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
-       */
-      public Builder addAllMetrics(
-          java.lang.Iterable<? extends flyteidl.core.Metrics.ExecutionMetric> values) {
-        ensureMetricsIsMutable();
-        for (flyteidl.core.Metrics.ExecutionMetric value : values) {
-          metrics_.add(value.getNumber());
-        }
+    throw new NullPointerException();
+  }
+  ensureQueriesIsMutable();
+        queries_.set(index, value);
         onChanged();
         return this;
       }
@@ -13228,11 +13156,15 @@ public Builder addAllMetrics(
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder clearMetrics() {
-        metrics_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+      public Builder addQueries(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureQueriesIsMutable();
+        queries_.add(value);
         onChanged();
         return this;
       }
@@ -13241,33 +13173,13 @@ public Builder clearMetrics() {
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
-       */
-      public java.util.List<java.lang.Integer>
-      getMetricsValueList() {
-        return java.util.Collections.unmodifiableList(metrics_);
-      }
-      /**
-       * <pre>
-       * The metrics to query. If empty, will return a default set of metrics.
-       * </pre>
-       *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
-       */
-      public int getMetricsValue(int index) {
-        return metrics_.get(index);
-      }
-      /**
-       * <pre>
-       * The metrics to query. If empty, will return a default set of metrics.
-       * </pre>
-       *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder setMetricsValue(
-          int index, int value) {
-        ensureMetricsIsMutable();
-        metrics_.set(index, value);
+      public Builder addAllQueries(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureQueriesIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, queries_);
         onChanged();
         return this;
       }
@@ -13276,11 +13188,11 @@ public Builder setMetricsValue(
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder addMetricsValue(int value) {
-        ensureMetricsIsMutable();
-        metrics_.add(value);
+      public Builder clearQueries() {
+        queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
@@ -13289,14 +13201,16 @@ public Builder addMetricsValue(int value) {
        * The metrics to query. If empty, will return a default set of metrics.
        * </pre>
        *
-       * <code>repeated .flyteidl.core.ExecutionMetric metrics = 3;</code>
+       * <code>repeated string queries = 3;</code>
        */
-      public Builder addAllMetricsValue(
-          java.lang.Iterable<java.lang.Integer> values) {
-        ensureMetricsIsMutable();
-        for (int value : values) {
-          metrics_.add(value);
-        }
+      public Builder addQueriesBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        ensureQueriesIsMutable();
+        queries_.add(value);
         onChanged();
         return this;
       }
@@ -16673,23 +16587,22 @@ public flyteidl.admin.AgentOuterClass.GetTaskLogsResponse getDefaultInstanceForT
       "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt" +
       "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n" +
       "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl" +
-      "yteidl.admin.Agent\"\371\001\n\025GetTaskMetricsReq" +
+      "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq" +
       "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" +
-      "\030\002 \001(\014\022/\n\007metrics\030\003 \003(\0162\036.flyteidl.core." +
-      "ExecutionMetric\022.\n\nstart_time\030\004 \001(\0132\032.go" +
-      "ogle.protobuf.Timestamp\022,\n\010end_time\030\005 \001(" +
-      "\0132\032.google.protobuf.Timestamp\022\'\n\004step\030\006 " +
-      "\001(\0132\031.google.protobuf.Duration\"O\n\026GetTas" +
-      "kMetricsResponse\0225\n\007results\030\001 \003(\0132$.flyt" +
-      "eidl.core.ExecutionMetricResult\"\\\n\022GetTa" +
-      "skLogsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rreso" +
-      "urce_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r\n\005token\030" +
-      "\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007results\030" +
-      "\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n\021RETRYAB" +
-      "LE_FAILURE\020\000\022\025\n\021PERMANENT_FAILURE\020\001\022\013\n\007P" +
-      "ENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004B=Z;" +
-      "github.com/flyteorg/flyte/flyteidl/gen/p" +
-      "b-go/flyteidl/adminb\006proto3"
+      "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 " +
+      "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t" +
+      "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n" +
+      "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O" +
+      "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003(" +
+      "\0132$.flyteidl.core.ExecutionMetricResult\"" +
+      "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t" +
+      "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r" +
+      "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007" +
+      "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n" +
+      "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR" +
+      "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED" +
+      "ED\020\004B=Z;github.com/flyteorg/flyte/flytei" +
+      "dl/gen/pb-go/flyteidl/adminb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -16811,7 +16724,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_flyteidl_admin_GetTaskMetricsRequest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_admin_GetTaskMetricsRequest_descriptor,
-        new java.lang.String[] { "TaskType", "ResourceMeta", "Metrics", "StartTime", "EndTime", "Step", });
+        new java.lang.String[] { "TaskType", "ResourceMeta", "Queries", "StartTime", "EndTime", "Step", });
     internal_static_flyteidl_admin_GetTaskMetricsResponse_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_flyteidl_admin_GetTaskMetricsResponse_fieldAccessorTable = new
diff --git a/flyteidl/gen/pb-java/flyteidl/core/Metrics.java b/flyteidl/gen/pb-java/flyteidl/core/Metrics.java
index da260746a5..b013138da2 100644
--- a/flyteidl/gen/pb-java/flyteidl/core/Metrics.java
+++ b/flyteidl/gen/pb-java/flyteidl/core/Metrics.java
@@ -14,165 +14,6 @@ public static void registerAllExtensions(
     registerAllExtensions(
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
-  /**
-   * Protobuf enum {@code flyteidl.core.ExecutionMetric}
-   */
-  public enum ExecutionMetric
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>EXECUTION_METRIC_UNDEFINED = 0;</code>
-     */
-    EXECUTION_METRIC_UNDEFINED(0),
-    /**
-     * <pre>
-     * Average memory usage, measured in bytes
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_USED_MEMORY_BYTES_AVG = 1;</code>
-     */
-    EXECUTION_METRIC_USED_MEMORY_BYTES_AVG(1),
-    /**
-     * <pre>
-     * Average memory allocation, measured in bytes
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG = 2;</code>
-     */
-    EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG(2),
-    /**
-     * <pre>
-     * CPU metrics
-     * Average CPU usage, measured in CPU cores
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_USED_CPU_AVG = 20;</code>
-     */
-    EXECUTION_METRIC_USED_CPU_AVG(20),
-    /**
-     * <pre>
-     * Average CPU allocation, measured in CPU cores
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_ALLOCATED_CPU_AVG = 21;</code>
-     */
-    EXECUTION_METRIC_ALLOCATED_CPU_AVG(21),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>EXECUTION_METRIC_UNDEFINED = 0;</code>
-     */
-    public static final int EXECUTION_METRIC_UNDEFINED_VALUE = 0;
-    /**
-     * <pre>
-     * Average memory usage, measured in bytes
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_USED_MEMORY_BYTES_AVG = 1;</code>
-     */
-    public static final int EXECUTION_METRIC_USED_MEMORY_BYTES_AVG_VALUE = 1;
-    /**
-     * <pre>
-     * Average memory allocation, measured in bytes
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG = 2;</code>
-     */
-    public static final int EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG_VALUE = 2;
-    /**
-     * <pre>
-     * CPU metrics
-     * Average CPU usage, measured in CPU cores
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_USED_CPU_AVG = 20;</code>
-     */
-    public static final int EXECUTION_METRIC_USED_CPU_AVG_VALUE = 20;
-    /**
-     * <pre>
-     * Average CPU allocation, measured in CPU cores
-     * </pre>
-     *
-     * <code>EXECUTION_METRIC_ALLOCATED_CPU_AVG = 21;</code>
-     */
-    public static final int EXECUTION_METRIC_ALLOCATED_CPU_AVG_VALUE = 21;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static ExecutionMetric valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static ExecutionMetric forNumber(int value) {
-      switch (value) {
-        case 0: return EXECUTION_METRIC_UNDEFINED;
-        case 1: return EXECUTION_METRIC_USED_MEMORY_BYTES_AVG;
-        case 2: return EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG;
-        case 20: return EXECUTION_METRIC_USED_CPU_AVG;
-        case 21: return EXECUTION_METRIC_ALLOCATED_CPU_AVG;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<ExecutionMetric>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        ExecutionMetric> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<ExecutionMetric>() {
-            public ExecutionMetric findValueByNumber(int number) {
-              return ExecutionMetric.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return flyteidl.core.Metrics.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final ExecutionMetric[] VALUES = values();
-
-    public static ExecutionMetric valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private ExecutionMetric(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:flyteidl.core.ExecutionMetric)
-  }
-
   public interface SpanOrBuilder extends
       // @@protoc_insertion_point(interface_extends:flyteidl.core.Span)
       com.google.protobuf.MessageOrBuilder {
@@ -2697,17 +2538,18 @@ public interface ExecutionMetricResultOrBuilder extends
      * The metric this data represents
      * </pre>
      *
-     * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+     * <code>string metric = 1;</code>
      */
-    int getMetricValue();
+    java.lang.String getMetric();
     /**
      * <pre>
      * The metric this data represents
      * </pre>
      *
-     * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+     * <code>string metric = 1;</code>
      */
-    flyteidl.core.Metrics.ExecutionMetric getMetric();
+    com.google.protobuf.ByteString
+        getMetricBytes();
 
     /**
      * <pre>
@@ -2759,7 +2601,7 @@ private ExecutionMetricResult(com.google.protobuf.GeneratedMessageV3.Builder<?>
       super(builder);
     }
     private ExecutionMetricResult() {
-      metric_ = 0;
+      metric_ = "";
     }
 
     @java.lang.Override
@@ -2786,10 +2628,10 @@ private ExecutionMetricResult(
             case 0:
               done = true;
               break;
-            case 8: {
-              int rawValue = input.readEnum();
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              metric_ = rawValue;
+              metric_ = s;
               break;
             }
             case 18: {
@@ -2838,28 +2680,45 @@ private ExecutionMetricResult(
     }
 
     public static final int METRIC_FIELD_NUMBER = 1;
-    private int metric_;
+    private volatile java.lang.Object metric_;
     /**
      * <pre>
      * The metric this data represents
      * </pre>
      *
-     * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+     * <code>string metric = 1;</code>
      */
-    public int getMetricValue() {
-      return metric_;
+    public java.lang.String getMetric() {
+      java.lang.Object ref = metric_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        metric_ = s;
+        return s;
+      }
     }
     /**
      * <pre>
      * The metric this data represents
      * </pre>
      *
-     * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+     * <code>string metric = 1;</code>
      */
-    public flyteidl.core.Metrics.ExecutionMetric getMetric() {
-      @SuppressWarnings("deprecation")
-      flyteidl.core.Metrics.ExecutionMetric result = flyteidl.core.Metrics.ExecutionMetric.valueOf(metric_);
-      return result == null ? flyteidl.core.Metrics.ExecutionMetric.UNRECOGNIZED : result;
+    public com.google.protobuf.ByteString
+        getMetricBytes() {
+      java.lang.Object ref = metric_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        metric_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     public static final int DATA_FIELD_NUMBER = 2;
@@ -2921,8 +2780,8 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (metric_ != flyteidl.core.Metrics.ExecutionMetric.EXECUTION_METRIC_UNDEFINED.getNumber()) {
-        output.writeEnum(1, metric_);
+      if (!getMetricBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, metric_);
       }
       if (data_ != null) {
         output.writeMessage(2, getData());
@@ -2936,9 +2795,8 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (metric_ != flyteidl.core.Metrics.ExecutionMetric.EXECUTION_METRIC_UNDEFINED.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, metric_);
+      if (!getMetricBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, metric_);
       }
       if (data_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -2959,7 +2817,8 @@ public boolean equals(final java.lang.Object obj) {
       }
       flyteidl.core.Metrics.ExecutionMetricResult other = (flyteidl.core.Metrics.ExecutionMetricResult) obj;
 
-      if (metric_ != other.metric_) return false;
+      if (!getMetric()
+          .equals(other.getMetric())) return false;
       if (hasData() != other.hasData()) return false;
       if (hasData()) {
         if (!getData()
@@ -2977,7 +2836,7 @@ public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + METRIC_FIELD_NUMBER;
-      hash = (53 * hash) + metric_;
+      hash = (53 * hash) + getMetric().hashCode();
       if (hasData()) {
         hash = (37 * hash) + DATA_FIELD_NUMBER;
         hash = (53 * hash) + getData().hashCode();
@@ -3115,7 +2974,7 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        metric_ = 0;
+        metric_ = "";
 
         if (dataBuilder_ == null) {
           data_ = null;
@@ -3203,8 +3062,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(flyteidl.core.Metrics.ExecutionMetricResult other) {
         if (other == flyteidl.core.Metrics.ExecutionMetricResult.getDefaultInstance()) return this;
-        if (other.metric_ != 0) {
-          setMetricValue(other.getMetricValue());
+        if (!other.getMetric().isEmpty()) {
+          metric_ = other.metric_;
+          onChanged();
         }
         if (other.hasData()) {
           mergeData(other.getData());
@@ -3238,54 +3098,73 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int metric_ = 0;
+      private java.lang.Object metric_ = "";
       /**
        * <pre>
        * The metric this data represents
        * </pre>
        *
-       * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+       * <code>string metric = 1;</code>
        */
-      public int getMetricValue() {
-        return metric_;
+      public java.lang.String getMetric() {
+        java.lang.Object ref = metric_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          metric_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
        * <pre>
        * The metric this data represents
        * </pre>
        *
-       * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+       * <code>string metric = 1;</code>
        */
-      public Builder setMetricValue(int value) {
-        metric_ = value;
-        onChanged();
-        return this;
+      public com.google.protobuf.ByteString
+          getMetricBytes() {
+        java.lang.Object ref = metric_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          metric_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
       /**
        * <pre>
        * The metric this data represents
        * </pre>
        *
-       * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+       * <code>string metric = 1;</code>
        */
-      public flyteidl.core.Metrics.ExecutionMetric getMetric() {
-        @SuppressWarnings("deprecation")
-        flyteidl.core.Metrics.ExecutionMetric result = flyteidl.core.Metrics.ExecutionMetric.valueOf(metric_);
-        return result == null ? flyteidl.core.Metrics.ExecutionMetric.UNRECOGNIZED : result;
+      public Builder setMetric(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        metric_ = value;
+        onChanged();
+        return this;
       }
       /**
        * <pre>
        * The metric this data represents
        * </pre>
        *
-       * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+       * <code>string metric = 1;</code>
        */
-      public Builder setMetric(flyteidl.core.Metrics.ExecutionMetric value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder clearMetric() {
         
-        metric_ = value.getNumber();
+        metric_ = getDefaultInstance().getMetric();
         onChanged();
         return this;
       }
@@ -3294,11 +3173,16 @@ public Builder setMetric(flyteidl.core.Metrics.ExecutionMetric value) {
        * The metric this data represents
        * </pre>
        *
-       * <code>.flyteidl.core.ExecutionMetric metric = 1;</code>
+       * <code>string metric = 1;</code>
        */
-      public Builder clearMetric() {
+      public Builder setMetricBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        metric_ = 0;
+        metric_ = value;
         onChanged();
         return this;
       }
@@ -3575,17 +3459,11 @@ public flyteidl.core.Metrics.ExecutionMetricResult getDefaultInstanceForType() {
       "tifierH\000\0229\n\007task_id\030\005 \001(\0132&.flyteidl.cor" +
       "e.TaskExecutionIdentifierH\000\022\026\n\014operation" +
       "_id\030\006 \001(\tH\000\022\"\n\005spans\030\007 \003(\0132\023.flyteidl.co" +
-      "re.SpanB\004\n\002id\"n\n\025ExecutionMetricResult\022." +
-      "\n\006metric\030\001 \001(\0162\036.flyteidl.core.Execution" +
-      "Metric\022%\n\004data\030\002 \001(\0132\027.google.protobuf.S" +
-      "truct*\331\001\n\017ExecutionMetric\022\036\n\032EXECUTION_M" +
-      "ETRIC_UNDEFINED\020\000\022*\n&EXECUTION_METRIC_US" +
-      "ED_MEMORY_BYTES_AVG\020\001\022/\n+EXECUTION_METRI" +
-      "C_ALLOCATED_MEMORY_BYTES_AVG\020\002\022!\n\035EXECUT" +
-      "ION_METRIC_USED_CPU_AVG\020\024\022&\n\"EXECUTION_M" +
-      "ETRIC_ALLOCATED_CPU_AVG\020\025B<Z:github.com/" +
-      "flyteorg/flyte/flyteidl/gen/pb-go/flytei" +
-      "dl/coreb\006proto3"
+      "re.SpanB\004\n\002id\"N\n\025ExecutionMetricResult\022\016" +
+      "\n\006metric\030\001 \001(\t\022%\n\004data\030\002 \001(\0132\027.google.pr" +
+      "otobuf.StructB<Z:github.com/flyteorg/fly" +
+      "te/flyteidl/gen/pb-go/flyteidl/coreb\006pro" +
+      "to3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts
index e431f85bfc..22abec2f46 100644
--- a/flyteidl/gen/pb-js/flyteidl.d.ts
+++ b/flyteidl/gen/pb-js/flyteidl.d.ts
@@ -7352,20 +7352,11 @@ export namespace flyteidl {
             public static verify(message: { [k: string]: any }): (string|null);
         }
 
-        /** ExecutionMetric enum. */
-        enum ExecutionMetric {
-            EXECUTION_METRIC_UNDEFINED = 0,
-            EXECUTION_METRIC_USED_MEMORY_BYTES_AVG = 1,
-            EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG = 2,
-            EXECUTION_METRIC_USED_CPU_AVG = 20,
-            EXECUTION_METRIC_ALLOCATED_CPU_AVG = 21
-        }
-
         /** Properties of an ExecutionMetricResult. */
         interface IExecutionMetricResult {
 
             /** ExecutionMetricResult metric */
-            metric?: (flyteidl.core.ExecutionMetric|null);
+            metric?: (string|null);
 
             /** ExecutionMetricResult data */
             data?: (google.protobuf.IStruct|null);
@@ -7381,7 +7372,7 @@ export namespace flyteidl {
             constructor(properties?: flyteidl.core.IExecutionMetricResult);
 
             /** ExecutionMetricResult metric. */
-            public metric: flyteidl.core.ExecutionMetric;
+            public metric: string;
 
             /** ExecutionMetricResult data. */
             public data?: (google.protobuf.IStruct|null);
@@ -9617,8 +9608,8 @@ export namespace flyteidl {
             /** GetTaskMetricsRequest resourceMeta */
             resourceMeta?: (Uint8Array|null);
 
-            /** GetTaskMetricsRequest metrics */
-            metrics?: (flyteidl.core.ExecutionMetric[]|null);
+            /** GetTaskMetricsRequest queries */
+            queries?: (string[]|null);
 
             /** GetTaskMetricsRequest startTime */
             startTime?: (google.protobuf.ITimestamp|null);
@@ -9645,8 +9636,8 @@ export namespace flyteidl {
             /** GetTaskMetricsRequest resourceMeta. */
             public resourceMeta: Uint8Array;
 
-            /** GetTaskMetricsRequest metrics. */
-            public metrics: flyteidl.core.ExecutionMetric[];
+            /** GetTaskMetricsRequest queries. */
+            public queries: string[];
 
             /** GetTaskMetricsRequest startTime. */
             public startTime?: (google.protobuf.ITimestamp|null);
diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js
index b1d69aa9c5..44ba937ad3 100644
--- a/flyteidl/gen/pb-js/flyteidl.js
+++ b/flyteidl/gen/pb-js/flyteidl.js
@@ -17789,33 +17789,13 @@
                 return Span;
             })();
     
-            /**
-             * ExecutionMetric enum.
-             * @name flyteidl.core.ExecutionMetric
-             * @enum {string}
-             * @property {number} EXECUTION_METRIC_UNDEFINED=0 EXECUTION_METRIC_UNDEFINED value
-             * @property {number} EXECUTION_METRIC_USED_MEMORY_BYTES_AVG=1 EXECUTION_METRIC_USED_MEMORY_BYTES_AVG value
-             * @property {number} EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG=2 EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG value
-             * @property {number} EXECUTION_METRIC_USED_CPU_AVG=20 EXECUTION_METRIC_USED_CPU_AVG value
-             * @property {number} EXECUTION_METRIC_ALLOCATED_CPU_AVG=21 EXECUTION_METRIC_ALLOCATED_CPU_AVG value
-             */
-            core.ExecutionMetric = (function() {
-                var valuesById = {}, values = Object.create(valuesById);
-                values[valuesById[0] = "EXECUTION_METRIC_UNDEFINED"] = 0;
-                values[valuesById[1] = "EXECUTION_METRIC_USED_MEMORY_BYTES_AVG"] = 1;
-                values[valuesById[2] = "EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG"] = 2;
-                values[valuesById[20] = "EXECUTION_METRIC_USED_CPU_AVG"] = 20;
-                values[valuesById[21] = "EXECUTION_METRIC_ALLOCATED_CPU_AVG"] = 21;
-                return values;
-            })();
-    
             core.ExecutionMetricResult = (function() {
     
                 /**
                  * Properties of an ExecutionMetricResult.
                  * @memberof flyteidl.core
                  * @interface IExecutionMetricResult
-                 * @property {flyteidl.core.ExecutionMetric|null} [metric] ExecutionMetricResult metric
+                 * @property {string|null} [metric] ExecutionMetricResult metric
                  * @property {google.protobuf.IStruct|null} [data] ExecutionMetricResult data
                  */
     
@@ -17836,11 +17816,11 @@
     
                 /**
                  * ExecutionMetricResult metric.
-                 * @member {flyteidl.core.ExecutionMetric} metric
+                 * @member {string} metric
                  * @memberof flyteidl.core.ExecutionMetricResult
                  * @instance
                  */
-                ExecutionMetricResult.prototype.metric = 0;
+                ExecutionMetricResult.prototype.metric = "";
     
                 /**
                  * ExecutionMetricResult data.
@@ -17875,7 +17855,7 @@
                     if (!writer)
                         writer = $Writer.create();
                     if (message.metric != null && message.hasOwnProperty("metric"))
-                        writer.uint32(/* id 1, wireType 0 =*/8).int32(message.metric);
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.metric);
                     if (message.data != null && message.hasOwnProperty("data"))
                         $root.google.protobuf.Struct.encode(message.data, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim();
                     return writer;
@@ -17900,7 +17880,7 @@
                         var tag = reader.uint32();
                         switch (tag >>> 3) {
                         case 1:
-                            message.metric = reader.int32();
+                            message.metric = reader.string();
                             break;
                         case 2:
                             message.data = $root.google.protobuf.Struct.decode(reader, reader.uint32());
@@ -17925,16 +17905,8 @@
                     if (typeof message !== "object" || message === null)
                         return "object expected";
                     if (message.metric != null && message.hasOwnProperty("metric"))
-                        switch (message.metric) {
-                        default:
-                            return "metric: enum value expected";
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 20:
-                        case 21:
-                            break;
-                        }
+                        if (!$util.isString(message.metric))
+                            return "metric: string expected";
                     if (message.data != null && message.hasOwnProperty("data")) {
                         var error = $root.google.protobuf.Struct.verify(message.data);
                         if (error)
@@ -23491,7 +23463,7 @@
                  * @interface IGetTaskMetricsRequest
                  * @property {string|null} [taskType] GetTaskMetricsRequest taskType
                  * @property {Uint8Array|null} [resourceMeta] GetTaskMetricsRequest resourceMeta
-                 * @property {Array.<flyteidl.core.ExecutionMetric>|null} [metrics] GetTaskMetricsRequest metrics
+                 * @property {Array.<string>|null} [queries] GetTaskMetricsRequest queries
                  * @property {google.protobuf.ITimestamp|null} [startTime] GetTaskMetricsRequest startTime
                  * @property {google.protobuf.ITimestamp|null} [endTime] GetTaskMetricsRequest endTime
                  * @property {google.protobuf.IDuration|null} [step] GetTaskMetricsRequest step
@@ -23506,7 +23478,7 @@
                  * @param {flyteidl.admin.IGetTaskMetricsRequest=} [properties] Properties to set
                  */
                 function GetTaskMetricsRequest(properties) {
-                    this.metrics = [];
+                    this.queries = [];
                     if (properties)
                         for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                             if (properties[keys[i]] != null)
@@ -23530,12 +23502,12 @@
                 GetTaskMetricsRequest.prototype.resourceMeta = $util.newBuffer([]);
     
                 /**
-                 * GetTaskMetricsRequest metrics.
-                 * @member {Array.<flyteidl.core.ExecutionMetric>} metrics
+                 * GetTaskMetricsRequest queries.
+                 * @member {Array.<string>} queries
                  * @memberof flyteidl.admin.GetTaskMetricsRequest
                  * @instance
                  */
-                GetTaskMetricsRequest.prototype.metrics = $util.emptyArray;
+                GetTaskMetricsRequest.prototype.queries = $util.emptyArray;
     
                 /**
                  * GetTaskMetricsRequest startTime.
@@ -23589,12 +23561,9 @@
                         writer.uint32(/* id 1, wireType 2 =*/10).string(message.taskType);
                     if (message.resourceMeta != null && message.hasOwnProperty("resourceMeta"))
                         writer.uint32(/* id 2, wireType 2 =*/18).bytes(message.resourceMeta);
-                    if (message.metrics != null && message.metrics.length) {
-                        writer.uint32(/* id 3, wireType 2 =*/26).fork();
-                        for (var i = 0; i < message.metrics.length; ++i)
-                            writer.int32(message.metrics[i]);
-                        writer.ldelim();
-                    }
+                    if (message.queries != null && message.queries.length)
+                        for (var i = 0; i < message.queries.length; ++i)
+                            writer.uint32(/* id 3, wireType 2 =*/26).string(message.queries[i]);
                     if (message.startTime != null && message.hasOwnProperty("startTime"))
                         $root.google.protobuf.Timestamp.encode(message.startTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
                     if (message.endTime != null && message.hasOwnProperty("endTime"))
@@ -23629,14 +23598,9 @@
                             message.resourceMeta = reader.bytes();
                             break;
                         case 3:
-                            if (!(message.metrics && message.metrics.length))
-                                message.metrics = [];
-                            if ((tag & 7) === 2) {
-                                var end2 = reader.uint32() + reader.pos;
-                                while (reader.pos < end2)
-                                    message.metrics.push(reader.int32());
-                            } else
-                                message.metrics.push(reader.int32());
+                            if (!(message.queries && message.queries.length))
+                                message.queries = [];
+                            message.queries.push(reader.string());
                             break;
                         case 4:
                             message.startTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32());
@@ -23672,20 +23636,12 @@
                     if (message.resourceMeta != null && message.hasOwnProperty("resourceMeta"))
                         if (!(message.resourceMeta && typeof message.resourceMeta.length === "number" || $util.isString(message.resourceMeta)))
                             return "resourceMeta: buffer expected";
-                    if (message.metrics != null && message.hasOwnProperty("metrics")) {
-                        if (!Array.isArray(message.metrics))
-                            return "metrics: array expected";
-                        for (var i = 0; i < message.metrics.length; ++i)
-                            switch (message.metrics[i]) {
-                            default:
-                                return "metrics: enum value[] expected";
-                            case 0:
-                            case 1:
-                            case 2:
-                            case 20:
-                            case 21:
-                                break;
-                            }
+                    if (message.queries != null && message.hasOwnProperty("queries")) {
+                        if (!Array.isArray(message.queries))
+                            return "queries: array expected";
+                        for (var i = 0; i < message.queries.length; ++i)
+                            if (!$util.isString(message.queries[i]))
+                                return "queries: string[] expected";
                     }
                     if (message.startTime != null && message.hasOwnProperty("startTime")) {
                         var error = $root.google.protobuf.Timestamp.verify(message.startTime);
diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
index c5bdc13746..b2d282011b 100644
--- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
@@ -20,7 +20,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xbb\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\xb4\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x38\n\x07metrics\x18\x03 \x03(\x0e\x32\x1e.flyteidl.core.ExecutionMetricR\x07metrics\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xbb\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -35,8 +35,8 @@
   _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001'
   _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None
   _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001'
-  _globals['_STATE']._serialized_start=2700
-  _globals['_STATE']._serialized_end=2794
+  _globals['_STATE']._serialized_start=2668
+  _globals['_STATE']._serialized_end=2762
   _globals['_TASKEXECUTIONMETADATA']._serialized_start=261
   _globals['_TASKEXECUTIONMETADATA']._serialized_end=925
   _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=731
@@ -70,11 +70,11 @@
   _globals['_LISTAGENTSRESPONSE']._serialized_start=2026
   _globals['_LISTAGENTSRESPONSE']._serialized_end=2093
   _globals['_GETTASKMETRICSREQUEST']._serialized_start=2096
-  _globals['_GETTASKMETRICSREQUEST']._serialized_end=2404
-  _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2406
-  _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2494
-  _globals['_GETTASKLOGSREQUEST']._serialized_start=2497
-  _globals['_GETTASKLOGSREQUEST']._serialized_end=2627
-  _globals['_GETTASKLOGSRESPONSE']._serialized_start=2629
-  _globals['_GETTASKLOGSRESPONSE']._serialized_end=2698
+  _globals['_GETTASKMETRICSREQUEST']._serialized_end=2372
+  _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2374
+  _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2462
+  _globals['_GETTASKLOGSREQUEST']._serialized_start=2465
+  _globals['_GETTASKLOGSREQUEST']._serialized_end=2595
+  _globals['_GETTASKLOGSRESPONSE']._serialized_start=2597
+  _globals['_GETTASKLOGSRESPONSE']._serialized_end=2666
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
index 46fa47d729..2d7254090f 100644
--- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
@@ -154,20 +154,20 @@ class ListAgentsResponse(_message.Message):
     def __init__(self, agents: _Optional[_Iterable[_Union[Agent, _Mapping]]] = ...) -> None: ...
 
 class GetTaskMetricsRequest(_message.Message):
-    __slots__ = ["task_type", "resource_meta", "metrics", "start_time", "end_time", "step"]
+    __slots__ = ["task_type", "resource_meta", "queries", "start_time", "end_time", "step"]
     TASK_TYPE_FIELD_NUMBER: _ClassVar[int]
     RESOURCE_META_FIELD_NUMBER: _ClassVar[int]
-    METRICS_FIELD_NUMBER: _ClassVar[int]
+    QUERIES_FIELD_NUMBER: _ClassVar[int]
     START_TIME_FIELD_NUMBER: _ClassVar[int]
     END_TIME_FIELD_NUMBER: _ClassVar[int]
     STEP_FIELD_NUMBER: _ClassVar[int]
     task_type: str
     resource_meta: bytes
-    metrics: _containers.RepeatedScalarFieldContainer[_metrics_pb2.ExecutionMetric]
+    queries: _containers.RepeatedScalarFieldContainer[str]
     start_time: _timestamp_pb2.Timestamp
     end_time: _timestamp_pb2.Timestamp
     step: _duration_pb2.Duration
-    def __init__(self, task_type: _Optional[str] = ..., resource_meta: _Optional[bytes] = ..., metrics: _Optional[_Iterable[_Union[_metrics_pb2.ExecutionMetric, str]]] = ..., start_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., end_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., step: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ...) -> None: ...
+    def __init__(self, task_type: _Optional[str] = ..., resource_meta: _Optional[bytes] = ..., queries: _Optional[_Iterable[str]] = ..., start_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., end_time: _Optional[_Union[_timestamp_pb2.Timestamp, _Mapping]] = ..., step: _Optional[_Union[_duration_pb2.Duration, _Mapping]] = ...) -> None: ...
 
 class GetTaskMetricsResponse(_message.Message):
     __slots__ = ["results"]
diff --git a/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.py
index ef2a03fcdf..4624badde3 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.py
@@ -16,7 +16,7 @@
 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66lyteidl/core/metrics.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xa3\x03\n\x04Span\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12M\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\nworkflowId\x12\x41\n\x07node_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierH\x00R\x06nodeId\x12\x41\n\x07task_id\x18\x05 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x06taskId\x12#\n\x0coperation_id\x18\x06 \x01(\tH\x00R\x0boperationId\x12)\n\x05spans\x18\x07 \x03(\x0b\x32\x13.flyteidl.core.SpanR\x05spansB\x04\n\x02id\"|\n\x15\x45xecutionMetricResult\x12\x36\n\x06metric\x18\x01 \x01(\x0e\x32\x1e.flyteidl.core.ExecutionMetricR\x06metric\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x04\x64\x61ta*\xd9\x01\n\x0f\x45xecutionMetric\x12\x1e\n\x1a\x45XECUTION_METRIC_UNDEFINED\x10\x00\x12*\n&EXECUTION_METRIC_USED_MEMORY_BYTES_AVG\x10\x01\x12/\n+EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG\x10\x02\x12!\n\x1d\x45XECUTION_METRIC_USED_CPU_AVG\x10\x14\x12&\n\"EXECUTION_METRIC_ALLOCATED_CPU_AVG\x10\x15\x42\xb2\x01\n\x11\x63om.flyteidl.coreB\x0cMetricsProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66lyteidl/core/metrics.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xa3\x03\n\x04Span\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12M\n\x0bworkflow_id\x18\x03 \x01(\x0b\x32*.flyteidl.core.WorkflowExecutionIdentifierH\x00R\nworkflowId\x12\x41\n\x07node_id\x18\x04 \x01(\x0b\x32&.flyteidl.core.NodeExecutionIdentifierH\x00R\x06nodeId\x12\x41\n\x07task_id\x18\x05 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierH\x00R\x06taskId\x12#\n\x0coperation_id\x18\x06 \x01(\tH\x00R\x0boperationId\x12)\n\x05spans\x18\x07 \x03(\x0b\x32\x13.flyteidl.core.SpanR\x05spansB\x04\n\x02id\"\\\n\x15\x45xecutionMetricResult\x12\x16\n\x06metric\x18\x01 \x01(\tR\x06metric\x12+\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x04\x64\x61taB\xb2\x01\n\x11\x63om.flyteidl.coreB\x0cMetricsProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,10 +25,8 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\021com.flyteidl.coreB\014MetricsProtoP\001Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\242\002\003FCX\252\002\rFlyteidl.Core\312\002\rFlyteidl\\Core\342\002\031Flyteidl\\Core\\GPBMetadata\352\002\016Flyteidl::Core'
-  _globals['_EXECUTIONMETRIC']._serialized_start=690
-  _globals['_EXECUTIONMETRIC']._serialized_end=907
   _globals['_SPAN']._serialized_start=142
   _globals['_SPAN']._serialized_end=561
   _globals['_EXECUTIONMETRICRESULT']._serialized_start=563
-  _globals['_EXECUTIONMETRICRESULT']._serialized_end=687
+  _globals['_EXECUTIONMETRICRESULT']._serialized_end=655
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.pyi
index 53a2dc2481..5e3c7d871e 100644
--- a/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/core/metrics_pb2.pyi
@@ -2,26 +2,12 @@ from flyteidl.core import identifier_pb2 as _identifier_pb2
 from google.protobuf import timestamp_pb2 as _timestamp_pb2
 from google.protobuf import struct_pb2 as _struct_pb2
 from google.protobuf.internal import containers as _containers
-from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class ExecutionMetric(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-    __slots__ = []
-    EXECUTION_METRIC_UNDEFINED: _ClassVar[ExecutionMetric]
-    EXECUTION_METRIC_USED_MEMORY_BYTES_AVG: _ClassVar[ExecutionMetric]
-    EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG: _ClassVar[ExecutionMetric]
-    EXECUTION_METRIC_USED_CPU_AVG: _ClassVar[ExecutionMetric]
-    EXECUTION_METRIC_ALLOCATED_CPU_AVG: _ClassVar[ExecutionMetric]
-EXECUTION_METRIC_UNDEFINED: ExecutionMetric
-EXECUTION_METRIC_USED_MEMORY_BYTES_AVG: ExecutionMetric
-EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG: ExecutionMetric
-EXECUTION_METRIC_USED_CPU_AVG: ExecutionMetric
-EXECUTION_METRIC_ALLOCATED_CPU_AVG: ExecutionMetric
-
 class Span(_message.Message):
     __slots__ = ["start_time", "end_time", "workflow_id", "node_id", "task_id", "operation_id", "spans"]
     START_TIME_FIELD_NUMBER: _ClassVar[int]
@@ -44,6 +30,6 @@ class ExecutionMetricResult(_message.Message):
     __slots__ = ["metric", "data"]
     METRIC_FIELD_NUMBER: _ClassVar[int]
     DATA_FIELD_NUMBER: _ClassVar[int]
-    metric: ExecutionMetric
+    metric: str
     data: _struct_pb2.Struct
-    def __init__(self, metric: _Optional[_Union[ExecutionMetric, str]] = ..., data: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
+    def __init__(self, metric: _Optional[str] = ..., data: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs
index e0f114e2be..69c291d220 100644
--- a/flyteidl/gen/pb_rust/flyteidl.admin.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs
@@ -167,8 +167,8 @@ pub struct GetTaskMetricsRequest {
     #[prost(bytes="vec", tag="2")]
     pub resource_meta: ::prost::alloc::vec::Vec<u8>,
     /// The metrics to query. If empty, will return a default set of metrics.
-    #[prost(enumeration="super::core::ExecutionMetric", repeated, tag="3")]
-    pub metrics: ::prost::alloc::vec::Vec<i32>,
+    #[prost(string, repeated, tag="3")]
+    pub queries: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     /// Start timestamp, inclusive.
     #[prost(message, optional, tag="4")]
     pub start_time: ::core::option::Option<::prost_types::Timestamp>,
diff --git a/flyteidl/gen/pb_rust/flyteidl.core.rs b/flyteidl/gen/pb_rust/flyteidl.core.rs
index 3f2b35f7a0..551b0da7a4 100644
--- a/flyteidl/gen/pb_rust/flyteidl.core.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.core.rs
@@ -2069,8 +2069,8 @@ pub mod span {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExecutionMetricResult {
     /// The metric this data represents
-    #[prost(enumeration="ExecutionMetric", tag="1")]
-    pub metric: i32,
+    #[prost(string, tag="1")]
+    pub metric: ::prost::alloc::string::String,
     /// The result data in prometheus range query result format
     /// <https://prometheus.io/docs/prometheus/latest/querying/api/#expression-query-result-formats.>
     /// This may include multiple time series, differentiated by their metric labels.
@@ -2079,48 +2079,6 @@ pub struct ExecutionMetricResult {
     #[prost(message, optional, tag="2")]
     pub data: ::core::option::Option<::prost_types::Struct>,
 }
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
-#[repr(i32)]
-pub enum ExecutionMetric {
-    Undefined = 0,
-    // Memory metrics
-
-    /// Average memory usage, measured in bytes
-    UsedMemoryBytesAvg = 1,
-    /// Average memory allocation, measured in bytes
-    AllocatedMemoryBytesAvg = 2,
-    /// CPU metrics
-    /// Average CPU usage, measured in CPU cores
-    UsedCpuAvg = 20,
-    /// Average CPU allocation, measured in CPU cores
-    AllocatedCpuAvg = 21,
-}
-impl ExecutionMetric {
-    /// String value of the enum field names used in the ProtoBuf definition.
-    ///
-    /// The values are not transformed in any way and thus are considered stable
-    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
-    pub fn as_str_name(&self) -> &'static str {
-        match self {
-            ExecutionMetric::Undefined => "EXECUTION_METRIC_UNDEFINED",
-            ExecutionMetric::UsedMemoryBytesAvg => "EXECUTION_METRIC_USED_MEMORY_BYTES_AVG",
-            ExecutionMetric::AllocatedMemoryBytesAvg => "EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG",
-            ExecutionMetric::UsedCpuAvg => "EXECUTION_METRIC_USED_CPU_AVG",
-            ExecutionMetric::AllocatedCpuAvg => "EXECUTION_METRIC_ALLOCATED_CPU_AVG",
-        }
-    }
-    /// Creates an enum from field names used in the ProtoBuf definition.
-    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
-        match value {
-            "EXECUTION_METRIC_UNDEFINED" => Some(Self::Undefined),
-            "EXECUTION_METRIC_USED_MEMORY_BYTES_AVG" => Some(Self::UsedMemoryBytesAvg),
-            "EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG" => Some(Self::AllocatedMemoryBytesAvg),
-            "EXECUTION_METRIC_USED_CPU_AVG" => Some(Self::UsedCpuAvg),
-            "EXECUTION_METRIC_ALLOCATED_CPU_AVG" => Some(Self::AllocatedCpuAvg),
-            _ => None,
-        }
-    }
-}
 /// Defines a 2-level tree where the root is a comparison operator and Operands are primitives or known variables.
 /// Each expression results in a boolean result.
 #[allow(clippy::derive_partial_eq_without_eq)]
diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto
index 13675f8b25..a391a8df50 100644
--- a/flyteidl/protos/flyteidl/admin/agent.proto
+++ b/flyteidl/protos/flyteidl/admin/agent.proto
@@ -136,7 +136,7 @@ message GetTaskMetricsRequest {
   // Metadata is created by the agent. It could be a string (jobId) or a dict (more complex metadata).
   bytes resource_meta = 2;
   // The metrics to query. If empty, will return a default set of metrics.
-  repeated core.ExecutionMetric metrics = 3;
+  repeated string queries = 3;
   // Start timestamp, inclusive.
   google.protobuf.Timestamp start_time = 4;
   // End timestamp, inclusive..
diff --git a/flyteidl/protos/flyteidl/core/metrics.proto b/flyteidl/protos/flyteidl/core/metrics.proto
index 8093acf0ff..032f9072d1 100644
--- a/flyteidl/protos/flyteidl/core/metrics.proto
+++ b/flyteidl/protos/flyteidl/core/metrics.proto
@@ -36,26 +36,9 @@ message Span {
     repeated Span spans = 7;
 }
 
-enum ExecutionMetric {
-    EXECUTION_METRIC_UNDEFINED = 0;
-
-    // Memory metrics
-
-    // Average memory usage, measured in bytes
-    EXECUTION_METRIC_USED_MEMORY_BYTES_AVG = 1;
-    // Average memory allocation, measured in bytes
-    EXECUTION_METRIC_ALLOCATED_MEMORY_BYTES_AVG = 2;
-
-    // CPU metrics
-    // Average CPU usage, measured in CPU cores
-    EXECUTION_METRIC_USED_CPU_AVG = 20;
-    // Average CPU allocation, measured in CPU cores
-    EXECUTION_METRIC_ALLOCATED_CPU_AVG = 21;
-}
-
 message ExecutionMetricResult {
     // The metric this data represents
-    ExecutionMetric metric = 1;
+    string metric = 1;
 
     // The result data in prometheus range query result format
     // https://prometheus.io/docs/prometheus/latest/querying/api/#expression-query-result-formats.