Fix clang-format formatting for trace_flags.cc and gen_trace_flags

Author: AgraVator

src/core/lib/debug/trace_flags.cc

@@ -170,9 +170,9 @@ std::string GenerateCpp(const std::vector<std::string>& trace_flags_yaml,
       "tools/codegen/core/generate_trace_flags.cc\n"
       "//\n"
       "\n"
-      "#include \"%sabsl/container/flat_hash_map.h\"\n"
       "#include \"src/core/lib/debug/trace.h\"\n"
       "#include \"src/core/util/no_destruct.h\"\n"
+      "#include \"%sabsl/container/flat_hash_map.h\"\n"
       "\n"
       "namespace grpc_core {\n\n",
       header_prefix);
@@ -183,9 +183,24 @@ std::string GenerateCpp(const std::vector<std::string>& trace_flags_yaml,
       const std::string declaration =
           is_debug ? "DebugOnlyTraceFlag " : "TraceFlag ";
       const std::string flag_name_and_trace = flag.name + "_trace";
-      if (declaration.length() + flag_name_and_trace.length() + 10 > 80) {
-        absl::StrAppend(&result, declaration, flag_name_and_trace,
-                        "(false,\n    \"", flag.name, "\");\n");
+      const size_t full_len = declaration.length() +
+                              flag_name_and_trace.length() +
+                              flag.name.length() + 12;
+      if (full_len > 80) {
+        const size_t aligned_len = declaration.length() +
+                                   flag_name_and_trace.length() + 8 +
+                                   flag.name.length() + 3;
+        if (aligned_len > 80) {
+          absl::StrAppend(&result, declaration, flag_name_and_trace,
+                          "(\n    false, \"", flag.name, "\");\n");
+        } else {
+          absl::StrAppend(
+              &result, declaration, flag_name_and_trace, "(false,\n",
+              std::string(
+                  declaration.length() + flag_name_and_trace.length() + 1,
+                  ' '),
+              "\"", flag.name, "\");\n");
+        }
       } else {
         absl::StrAppend(&result, declaration, flag_name_and_trace, "(false, \"",
                         flag.name, "\");\n");
@@ -207,8 +222,15 @@ std::string GenerateCpp(const std::vector<std::string>& trace_flags_yaml,
     for (const auto& flag : flags) {
       if (!first) result += "\n";
       first = false;
-      absl::StrAppend(&result, "          {\"", flag.name, "\", &", flag.name,
-                      "_trace},");
+      const std::string flag_name_and_trace = flag.name + "_trace";
+      const size_t line_len = 18 + flag.name.length() + flag_name_and_trace.length();
+      if (line_len > 80) {
+        absl::StrAppend(&result, "          {\"", flag.name, "\",\n           &",
+                        flag_name_and_trace, "},");
+      } else {
+        absl::StrAppend(&result, "          {\"", flag.name, "\", &",
+                        flag_name_and_trace, "},");
+      }
     }
   };
   append_map_entries(non_debug_flags);

tools/codegen/core/generate_trace_flags.cc

@@ -181,17 +181,18 @@ TEST(GenerateTraceFlagsTest, GenerateCpp) {
 // Automatically generated by tools/codegen/core/generate_trace_flags.cc
 //
 
-#include "absl/container/flat_hash_map.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/no_destruct.h"
+#include "third_party/absl/container/flat_hash_map.h"
 
 namespace grpc_core {
 
 DebugOnlyTraceFlag auth_context_refcount_trace(false, "auth_context_refcount");
 DebugOnlyTraceFlag call_combiner_trace(false, "call_combiner");
 DebugOnlyTraceFlag call_refcount_trace(false, "call_refcount");
 DebugOnlyTraceFlag call_state_trace(false, "call_state");
-DebugOnlyTraceFlag chttp2_server_refcount_trace(false, "chttp2_server_refcount");
+DebugOnlyTraceFlag chttp2_server_refcount_trace(false,
+                                                "chttp2_server_refcount");
 DebugOnlyTraceFlag closure_trace(false, "closure");
 DebugOnlyTraceFlag combiner_trace(false, "combiner");
 DebugOnlyTraceFlag cq_refcount_trace(false, "cq_refcount");
@@ -206,7 +207,8 @@ DebugOnlyTraceFlag polling_trace(false, "polling");
 DebugOnlyTraceFlag polling_api_trace(false, "polling_api");
 DebugOnlyTraceFlag promise_primitives_trace(false, "promise_primitives");
 DebugOnlyTraceFlag resolver_refcount_trace(false, "resolver_refcount");
-DebugOnlyTraceFlag security_connector_refcount_trace(false, "security_connector_refcount");
+DebugOnlyTraceFlag security_connector_refcount_trace(
+    false, "security_connector_refcount");
 DebugOnlyTraceFlag slice_refcount_trace(false, "slice_refcount");
 DebugOnlyTraceFlag stream_refcount_trace(false, "stream_refcount");
 DebugOnlyTraceFlag subchannel_refcount_trace(false, "subchannel_refcount");
@@ -236,7 +238,8 @@ TraceFlag connectivity_state_trace(false, "connectivity_state");
 TraceFlag dns_resolver_trace(false, "dns_resolver");
 TraceFlag environment_autodetect_trace(false, "environment_autodetect");
 TraceFlag event_engine_trace(false, "event_engine");
-TraceFlag event_engine_client_channel_resolver_trace(false, "event_engine_client_channel_resolver");
+TraceFlag event_engine_client_channel_resolver_trace(
+    false, "event_engine_client_channel_resolver");
 TraceFlag event_engine_dns_trace(false, "event_engine_dns");
 TraceFlag event_engine_endpoint_trace(false, "event_engine_endpoint");
 TraceFlag event_engine_endpoint_data_trace(false, "event_engine_endpoint_data");
@@ -317,7 +320,8 @@ const absl::flat_hash_map<std::string, TraceFlag*>& GetAllTraceFlags() {
           {"dns_resolver", &dns_resolver_trace},
           {"environment_autodetect", &environment_autodetect_trace},
           {"event_engine", &event_engine_trace},
-          {"event_engine_client_channel_resolver", &event_engine_client_channel_resolver_trace},
+          {"event_engine_client_channel_resolver",
+           &event_engine_client_channel_resolver_trace},
           {"event_engine_dns", &event_engine_dns_trace},
           {"event_engine_endpoint", &event_engine_endpoint_trace},
           {"event_engine_endpoint_data", &event_engine_endpoint_data_trace},