Merge branch 'master' into MakeServerGlobalCallbacksDefaultTrue

Author: yashykt

.pylintrc

@@ -1,4 +1,9 @@
-[MASTER]
+[MAIN]
+load-plugins=
+	pylint.extensions.no_self_use,
+	pylint.extensions.comparison_placement,
+	pylint.extensions.redefined_variable_type,
+
 ignore=
 	src/python/grpcio/grpc/beta,
 	src/python/grpcio/grpc/framework,
@@ -49,9 +54,6 @@ disable=
 	# TODO(https://github.com/grpc/grpc/issues/261): This doesn't seem to
 	# work for now? Try with a later pylint?
 	locally-disabled,
-	# NOTE(nathaniel): What even is this? *Enabling* an inspection results
-	# in a warning? How does that encourage more analysis and coverage?
-	locally-enabled,
 	# NOTE(nathaniel): We don't write doc strings for most private code
 	# elements.
 	missing-docstring,
@@ -60,9 +62,6 @@ disable=
 	# expression is true than it is to worry about which is an identifier
 	# and which a literal value.
 	misplaced-comparison-constant,
-	# NOTE(nathaniel): Our completely abstract interface classes don't have
-	# constructors.
-	no-init,
 	# TODO(https://github.com/grpc/grpc/issues/261): Doesn't yet play
 	# nicely with some of our code being implemented in Cython. Maybe in a
 	# later version?
@@ -99,5 +98,32 @@ disable=
 	wrong-import-order,
 	# TODO(https://github.com/PyCQA/pylint/issues/3882): Upgrade Pylint
 	unsubscriptable-object,
-  # NOTE(sergiitk): yapf compatibility, ref #25071
-  bad-continuation,
+
+	# NOTE(sergiitk): From here: just to make it work with pylint==2.17.7
+	#                 Pylint will be replaced with ruff anyway.
+	# Not enforced by ruff:
+	consider-using-f-string,
+	# TODO(sergiitk): Check; should probably be caught by pytype
+	abstract-class-instantiated,
+	# TODO(sergiitk): This is broken for protobuf enums.
+	redefined-variable-type,
+	# Expect to be caught (and fixed) by ruff.
+	# https://github.com/astral-sh/ruff/issues/970
+	# pylint                              | ruff          |
+	# ----------------------------------- | ------------- |
+	f-string-without-interpolation,       # F541
+	format-string-without-interpolation,  # F541
+	no-else-raise,                        # RET506
+	no-else-continue,                     # RET507
+	super-with-arguments,                 # UP008
+	unnecessary-lambda-assignment,        # E731
+	unnecessary-dunder-call,              # PLC2801
+	import-outside-toplevel,              # PLC0415
+	broad-exception-raised,               # TRY002
+	raise-missing-from,                   # B904
+	no-self-use,                          # PLR6301
+	inconsistent-return-statements,       # RET501, RET502
+	consider-using-dict-items,            # PLC0206
+	use-dict-literal,                     # C406
+	consider-iterating-dictionary,        # SIM118
+	unspecified-encoding,                 # PLW1514

.pylintrc-examples

@@ -1,4 +1,9 @@
-[MASTER]
+[MAIN]
+load-plugins=
+	pylint.extensions.no_self_use,
+	pylint.extensions.comparison_placement,
+	pylint.extensions.redefined_variable_type,
+
 ignore=
 	src/python/grpcio/grpc/beta,
 	src/python/grpcio/grpc/framework,
@@ -52,9 +57,6 @@ disable=
 	# TODO(https://github.com/grpc/grpc/issues/261): This doesn't seem to
 	# work for now? Try with a later pylint?
 	locally-disabled,
-	# NOTE(nathaniel): What even is this? *Enabling* an inspection results
-	# in a warning? How does that encourage more analysis and coverage?
-	locally-enabled,
 	# NOTE(nathaniel): We don't write doc strings for most private code
 	# elements.
 	missing-docstring,
@@ -63,9 +65,6 @@ disable=
 	# expression is true than it is to worry about which is an identifier
 	# and which a literal value.
 	misplaced-comparison-constant,
-	# NOTE(nathaniel): Our completely abstract interface classes don't have
-	# constructors.
-	no-init,
 	# TODO(https://github.com/grpc/grpc/issues/261): Doesn't yet play
 	# nicely with some of our code being implemented in Cython. Maybe in a
 	# later version?
@@ -104,5 +103,32 @@ disable=
 	unsubscriptable-object,
 	# NOTE(rbellevi): Pylint doesn't understand .pyi files.
 	no-member,
-  # NOTE(sergiitk): yapf compatibility, ref #25071
-  bad-continuation,
+
+	# NOTE(sergiitk): From here: just to make it work with pylint==2.17.7
+	#                 Pylint will be replaced with ruff anyway.
+	# Not enforced by ruff:
+	consider-using-f-string,
+	invalid-overridden-method,  # not found in main
+	# Expect to be caught (and fixed) by ruff.
+	# https://github.com/astral-sh/ruff/issues/970
+	# pylint                              | ruff          |
+	# ----------------------------------- | ------------- |
+	super-with-arguments,                 # UP008
+	raise-missing-from,                   # B904
+	unspecified-encoding,                 # PLW1514
+	# Found in examples, but not in main:
+	consider-using-with,                  # SIM115
+	# Found in main, but not in examples:
+	# f-string-without-interpolation,       # F541
+	# format-string-without-interpolation,  # F541
+	# no-else-raise,                        # RET506
+	# no-else-continue,                     # RET507
+	# unnecessary-lambda-assignment,        # E731
+	# unnecessary-dunder-call,              # PLC2801
+	# import-outside-toplevel,              # PLC0415
+	# broad-exception-raised,               # TRY002
+	# no-self-use,                          # PLR6301
+	# inconsistent-return-statements,       # RET501, RET502
+	# consider-using-dict-items,            # PLC0206
+	# use-dict-literal,                     # C406
+	# consider-iterating-dictionary,        # SIM118

.pylintrc-tests

@@ -1,4 +1,9 @@
-[MASTER]
+[MAIN]
+load-plugins=
+	pylint.extensions.no_self_use,
+	pylint.extensions.comparison_placement,
+	pylint.extensions.redefined_variable_type,
+
 ignore=
 	src/python/grpcio_tests/tests/unit/beta,
 	src/python/grpcio_tests/tests/unit/framework,
@@ -78,9 +83,6 @@ disable=
 	# TODO(https://github.com/grpc/grpc/issues/261): This doesn't seem to
 	# work for now? Try with a later pylint?
 	locally-disabled,
-	# NOTE(nathaniel): What even is this? *Enabling* an inspection results
-	# in a warning? How does that encourage more analysis and coverage?
-	locally-enabled,
 	# NOTE(nathaniel): We don't write doc strings for most private code
 	# elements.
 	missing-docstring,
@@ -89,9 +91,6 @@ disable=
 	# expression is true than it is to worry about which is an identifier
 	# and which a literal value.
 	misplaced-comparison-constant,
-	# NOTE(nathaniel): Our completely abstract interface classes don't have
-	# constructors.
-	no-init,
 	# TODO(https://github.com/grpc/grpc/issues/261): Doesn't yet play
 	# nicely with some of our code being implemented in Cython. Maybe in a
 	# later version?
@@ -128,5 +127,34 @@ disable=
 	wrong-import-order,
 	# TODO(https://github.com/PyCQA/pylint/issues/3882): Upgrade Pylint
 	unsubscriptable-object,
-  # NOTE(sergiitk): yapf compatibility, ref #25071
-  bad-continuation,
+
+	# NOTE(sergiitk): From here: just to make it work with pylint==2.17.7
+	#                 Pylint will be replaced with ruff anyway.
+	# Not enforced by ruff:
+	consider-using-f-string,
+	# Expect to be caught (and fixed) by ruff.
+	# https://github.com/astral-sh/ruff/issues/970
+	# pylint                              | ruff          |
+	# ----------------------------------- | ------------- |
+	f-string-without-interpolation,       # F541
+	format-string-without-interpolation,  # F541
+	no-else-raise,                        # RET506
+	super-with-arguments,                 # UP008
+	unnecessary-lambda-assignment,        # E731
+	unnecessary-dunder-call,              # PLC2801
+	import-outside-toplevel,              # PLC0415
+	broad-exception-raised,               # TRY002
+	raise-missing-from,                   # B904
+	use-dict-literal,                     # C406
+	unspecified-encoding,                 # PLW1514
+	# Found in tests, but not in main:
+	consider-using-with,                  # SIM115
+	broad-exception-caught,               # BLE001
+	consider-using-in,                    # PLR1714
+	consider-using-enumerate,             # C0200
+	# Found in main, but not in tests:
+	# no-else-continue,                     # RET507
+	# no-self-use,                          # PLR6301
+	# inconsistent-return-statements,       # RET501, RET502
+	# consider-using-dict-items,            # PLC0206
+	# consider-iterating-dictionary,        # SIM118

BUILD

@@ -2717,8 +2717,9 @@ grpc_cc_library(
         "src/cpp/server/channelz/channelz_service.h",
     ],
     external_deps = [
-        "protobuf_headers",
         "absl/log",
+        "absl/strings",
+        "protobuf_headers",
     ],
     public_hdrs = [
         "include/grpcpp/ext/channelz_service_plugin.h",
@@ -2731,6 +2732,8 @@ grpc_cc_library(
         "grpc",
         "grpc++",
         "grpc++_config_proto",
+        "//src/core:channelz_v2tov1_convert",
+        "//src/core:experiments",
         "//src/proto/grpc/channelz:channelz_proto",
         "//src/proto/grpc/channelz/v2:service_cc_grpc",
     ],
@@ -4400,7 +4403,6 @@ grpc_cc_library(
         "absl/cleanup",
         "absl/log:check",
         "absl/log:log",
-        "absl/memory",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
@@ -4415,7 +4417,6 @@ grpc_cc_library(
     visibility = ["//bazel:xds_client_core"],
     deps = [
         "backoff",
-        "call_tracer",
         "debug_location",
         "endpoint_addresses",
         "envoy_admin_upb",
@@ -4440,7 +4441,6 @@ grpc_cc_library(
         "ref_counted_ptr",
         "uri",
         "work_serializer",
-        "//src/core:default_event_engine",
         "//src/core:down_cast",
         "//src/core:dual_ref_counted",
         "//src/core:env",
@@ -4800,6 +4800,7 @@ grpc_cc_library(
         "//src/core:experiments",
         "//src/core:gpr_manual_constructor",
         "//src/core:http2_settings",
+        "//src/core:http2_settings_manager",
         "//src/core:http2_stats_collector",
         "//src/core:http2_status",
         "//src/core:http2_ztrace_collector",