From c16c17acfca2aac79802bb7f0b1bab59bad67997 Mon Sep 17 00:00:00 2001
From: tanvi-jagtap <tjagtap@google.com>
Date: Thu, 30 May 2024 05:15:01 +0000
Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Disable the ConfigVar because it
 wont work anymore.

---
 src/core/lib/config/config_vars.cc     | 7 +------
 src/core/lib/config/config_vars.h      | 4 ----
 src/core/lib/config/config_vars.yaml   | 5 -----
 test/core/test_util/fuzz_config_vars.h | 6 +++---
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc
index b01070f81a7..7a4fed1a7c9 100644
--- a/src/core/lib/config/config_vars.cc
+++ b/src/core/lib/config/config_vars.cc
@@ -75,8 +75,6 @@ ABSL_FLAG(absl::optional<bool>, grpc_not_use_system_ssl_roots, {},
           "Disable loading system root certificates.");
 ABSL_FLAG(absl::optional<std::string>, grpc_ssl_cipher_suites, {},
           "A colon separated list of cipher suites to use with OpenSSL");
-ABSL_FLAG(absl::optional<bool>, grpc_absl_logging, {},
-          "Use absl logging from within gpr_log.");
 
 namespace grpc_core {
 
@@ -94,8 +92,6 @@ ConfigVars::ConfigVars(const Overrides& overrides)
       not_use_system_ssl_roots_(LoadConfig(
           FLAGS_grpc_not_use_system_ssl_roots, "GRPC_NOT_USE_SYSTEM_SSL_ROOTS",
           overrides.not_use_system_ssl_roots, false)),
-      absl_logging_(LoadConfig(FLAGS_grpc_absl_logging, "GRPC_ABSL_LOGGING",
-                               overrides.absl_logging, true)),
       dns_resolver_(LoadConfig(FLAGS_grpc_dns_resolver, "GRPC_DNS_RESOLVER",
                                overrides.dns_resolver, "")),
       verbosity_(LoadConfig(FLAGS_grpc_verbosity, "GRPC_VERBOSITY",
@@ -147,8 +143,7 @@ std::string ConfigVars::ToString() const {
       "\"", ", default_ssl_roots_file_path: ", "\"",
       absl::CEscape(DefaultSslRootsFilePath()), "\"",
       ", not_use_system_ssl_roots: ", NotUseSystemSslRoots() ? "true" : "false",
-      ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"",
-      ", absl_logging: ", AbslLogging() ? "true" : "false");
+      ", ssl_cipher_suites: ", "\"", absl::CEscape(SslCipherSuites()), "\"");
 }
 
 }  // namespace grpc_core
diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h
index 20ca3c2d6d9..8c534bf7c33 100644
--- a/src/core/lib/config/config_vars.h
+++ b/src/core/lib/config/config_vars.h
@@ -38,7 +38,6 @@ class GPR_DLL ConfigVars {
     absl::optional<bool> enable_fork_support;
     absl::optional<bool> abort_on_leaks;
     absl::optional<bool> not_use_system_ssl_roots;
-    absl::optional<bool> absl_logging;
     absl::optional<std::string> dns_resolver;
     absl::optional<std::string> verbosity;
     absl::optional<std::string> stacktrace_minloglevel;
@@ -103,8 +102,6 @@ class GPR_DLL ConfigVars {
   bool NotUseSystemSslRoots() const { return not_use_system_ssl_roots_; }
   // A colon separated list of cipher suites to use with OpenSSL
   absl::string_view SslCipherSuites() const { return ssl_cipher_suites_; }
-  // Use absl logging from within gpr_log.
-  bool AbslLogging() const { return absl_logging_; }
 
  private:
   explicit ConfigVars(const Overrides& overrides);
@@ -114,7 +111,6 @@ class GPR_DLL ConfigVars {
   bool enable_fork_support_;
   bool abort_on_leaks_;
   bool not_use_system_ssl_roots_;
-  bool absl_logging_;
   std::string dns_resolver_;
   std::string verbosity_;
   std::string stacktrace_minloglevel_;
diff --git a/src/core/lib/config/config_vars.yaml b/src/core/lib/config/config_vars.yaml
index 3496ee6c096..8ccd41c2d41 100644
--- a/src/core/lib/config/config_vars.yaml
+++ b/src/core/lib/config/config_vars.yaml
@@ -126,8 +126,3 @@
     ECDHE-ECDSA-AES256-GCM-SHA384:\
     ECDHE-RSA-AES128-GCM-SHA256:\
     ECDHE-RSA-AES256-GCM-SHA384"
-- name: absl_logging
-  type: bool
-  default: true
-  description:
-    Use absl logging from within gpr_log.
diff --git a/test/core/test_util/fuzz_config_vars.h b/test/core/test_util/fuzz_config_vars.h
index 4ee69ee2aa0..af797d94b50 100644
--- a/test/core/test_util/fuzz_config_vars.h
+++ b/test/core/test_util/fuzz_config_vars.h
@@ -16,8 +16,8 @@
 // Automatically generated by tools/codegen/core/gen_config_vars.py
 //
 
-#ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H
-#define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H
+#ifndef GRPC_TEST_CORE_UTIL_FUZZ_CONFIG_VARS_H
+#define GRPC_TEST_CORE_UTIL_FUZZ_CONFIG_VARS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -32,4 +32,4 @@ void ApplyFuzzConfigVars(const grpc::testing::FuzzConfigVars& vars);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_H
+#endif  // GRPC_TEST_CORE_UTIL_FUZZ_CONFIG_VARS_H