Merge 3a05c56 into c7fc296

Author: nshestakov

ydb/core/client/server/grpc_server.cpp

@@ -268,9 +268,13 @@ class TSimpleRequest
     void Finish(const TOut& resp, ui32 status) {
         auto makeResponseString = [&] {
             TString x;
-            google::protobuf::TextFormat::Printer printer;
-            printer.SetSingleLineMode(true);
-            printer.PrintToString(resp, &x);
+            if (NYdbGrpc::LogBodyEnabled) {
+                google::protobuf::TextFormat::Printer printer;
+                printer.SetSingleLineMode(true);
+                printer.PrintToString(resp, &x);
+            } else {
+                x = "<hidden>";
+            }
             return x;
         };
         LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] issuing response Name# %s data# %s peer# %s", this,
@@ -303,9 +307,13 @@ class TSimpleRequest
         auto makeRequestString = [&] {
             TString resp;
             if (ok) {
-                google::protobuf::TextFormat::Printer printer;
-                printer.SetSingleLineMode(true);
-                printer.PrintToString(Request, &resp);
+                if (NYdbGrpc::LogBodyEnabled) {
+                    google::protobuf::TextFormat::Printer printer;
+                    printer.SetSingleLineMode(true);
+                    printer.PrintToString(Request, &resp);
+                } else {
+                    resp = "<hidden>";
+                }
             } else {
                 resp = "<not ok>";
             }

ydb/core/grpc_streaming/grpc_streaming.h

@@ -350,9 +350,13 @@ class TGRpcStreamingRequest final
         auto dumpResultText = [&] {
             TString text;
             if (status == NYdbGrpc::EQueueEventStatus::OK) {
-                google::protobuf::TextFormat::Printer printer;
-                printer.SetSingleLineMode(true);
-                printer.PrintToString(ReadInProgress->Record, &text);
+                if (NYdbGrpc::LogBodyEnabled) {
+                    google::protobuf::TextFormat::Printer printer;
+                    printer.SetSingleLineMode(true);
+                    printer.PrintToString(ReadInProgress->Record, &text);
+                } else {
+                    text = "<hidden>";
+                }
             } else {
                 text = "<not ok>";
             }
@@ -402,9 +406,13 @@ class TGRpcStreamingRequest final
     bool Write(TOut&& message, const grpc::WriteOptions& options = { }, const grpc::Status* status = nullptr) {
         auto dumpMessageText = [&] {
             TString text;
-            google::protobuf::TextFormat::Printer printer;
-            printer.SetSingleLineMode(true);
-            printer.PrintToString(message, &text);
+            if (NYdbGrpc::LogBodyEnabled) {
+                google::protobuf::TextFormat::Printer printer;
+                printer.SetSingleLineMode(true);
+                printer.PrintToString(message, &text);
+            } else {
+                text = "<hidden>";
+            }
             return text;
         };
 

ydb/library/grpc/server/logger.h

@@ -3,9 +3,13 @@
 #include <library/cpp/logger/priority.h>
 
 #include <util/generic/ptr.h>
+#include <util/system/env.h>
+
 
 namespace NYdbGrpc {
 
+static bool LogBodyEnabled = "BODY" == GetEnv("YDB_GRPC_SERVER_LOGGING");    
+
 class TLogger: public TThrRefBase {
 protected:
     TLogger() = default;