fix viewer api, restore monitoring ui (#5015)

ydb-platform · May 30, 2024 · 5b7a720 · 5b7a720
1 parent f2fac86
commit 5b7a720
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/ydb/core/viewer/json_browse.h b/ydb/core/viewer/json_browse.h
@@ -189,9 +189,8 @@ class TJsonBrowse : public TActorBootstrapped<TJsonBrowse> {
             }
         }
         TStringStream result;
-        result << Viewer->GetHTTPGATEWAYTIMEOUT(Event->Get());
         RenderPendingRequests(result);
-        ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(result.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
+        ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPGATEWAYTIMEOUT(Event->Get(), result.Str()), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
         Die(ctx);
     }
 

diff --git a/ydb/core/viewer/json_metainfo.h b/ydb/core/viewer/json_metainfo.h
@@ -114,9 +114,8 @@ class TJsonMetaInfo : public TActorBootstrapped<TJsonMetaInfo> {
 
     void HandleTimeout(const TActorContext &ctx) {
         TStringStream result;
-        result << Viewer->GetHTTPGATEWAYTIMEOUT(Event->Get());
         RenderPendingRequests(result);
-        ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(result.Str(), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
+        ctx.Send(Event->Sender, new NMon::TEvHttpInfoRes(Viewer->GetHTTPGATEWAYTIMEOUT(Event->Get(), result.Str()), 0, NMon::IEvHttpInfoRes::EContentType::Custom));
         Die(ctx);
     }
 

diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h
@@ -389,12 +389,11 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
 
     void Handle(NKikimrKqp::TEvQueryResponse& record) {
         if (Event) {
-            TStringBuilder out;
             NJson::TJsonValue jsonResponse;
             if (record.GetYdbStatus() == Ydb::StatusIds::SUCCESS) {
-                MakeOkReply(out, jsonResponse, record);
+                MakeOkReply(jsonResponse, record);
             } else {
-                MakeErrorReply(out, jsonResponse, record);
+                MakeErrorReply(jsonResponse, record);
             }
 
             if (Schema == ESchemaType::Classic && Stats.empty() && (Action.empty() || Action == "execute")) {
@@ -406,9 +405,8 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
             config.ValidateUtf8 = false;
             config.WriteNanAsString = true;
             NJson::WriteJson(&stream, &jsonResponse, config);
-            out << stream.Str();
 
-            ReplyAndPassAway(out);
+            ReplyAndPassAway(stream.Str());
         } else {
             TEvViewer::TEvViewerResponse* response = new TEvViewer::TEvViewerResponse();
             response->Record.MutableQueryResponse()->CopyFrom(record);
@@ -471,8 +469,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
     }
 
 private:
-    void MakeErrorReply(TStringBuilder& out, NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
-        out << Viewer->GetHTTPBADREQUEST(Event->Get(), "application/json");
+    void MakeErrorReply(NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
         NJson::TJsonValue& jsonIssues = jsonResponse["issues"];
 
         // find first deepest error
@@ -493,7 +490,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
         }
     }
 
-    void MakeOkReply(TStringBuilder& out, NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
+    void MakeOkReply(NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
         const auto& response = record.GetResponse();
 
         if (response.ResultsSize() > 0 || response.YdbResultsSize() > 0) {
@@ -512,7 +509,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
                 Ydb::Issue::IssueMessage* issue = record.MutableResponse()->AddQueryIssues();
                 issue->set_message(Sprintf("Convert error: %s", ex.what()));
                 issue->set_severity(NYql::TSeverityIds::S_ERROR);
-                MakeErrorReply(out, jsonResponse, record);
+                MakeErrorReply(jsonResponse, record);
                 return;
             }
         }