Merge github.com:grpc/grpc

.bazelversion

@@ -1 +1 @@
-7.1.0
+7.3.1

.clang-format

@@ -8,36 +8,6 @@ IncludeCategories:
   # ruby.h is even more first if it's included
   - Regex: '^<ruby/ruby.h>'
     Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
 ---
 Language: ObjC
 BasedOnStyle: Google

.clang-tidy

@@ -69,31 +69,38 @@ Checks: '-*,
   bugprone-*,
   -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
+  -bugprone-casting-through-void,
+  -bugprone-crtp-constructor-accessibility,
   -bugprone-easily-swappable-parameters,
   -bugprone-empty-catch,
   -bugprone-exception-escape,
   -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-inc-dec-in-conditions,
   -bugprone-infinite-loop,
+  -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
   -bugprone-reserved-identifier,
+  -bugprone-return-const-ref-from-parameter,
   -bugprone-signed-char-misuse,
   -bugprone-sizeof-expression,
+  -bugprone-suspicious-stringview-data-usage,
   -bugprone-switch-missing-default-case,
   -bugprone-too-small-loop-variable,
   -bugprone-unchecked-optional-access,
+  -bugprone-unused-local-non-trivial-variable,
   google-*,
   -google-readability-casting,
   -google-runtime-int,
-  -google-runtime-references,
   performance-*,
   -performance-avoid-endl,
+  -performance-enum-size,
+  -performance-inefficient-vector-operation,
   -performance-no-automatic-move,
   -performance-no-int-to-ptr,
   -performance-noexcept-swap,
   -performance-unnecessary-copy-initialization,
   -performance-unnecessary-value-param,
-  clang-diagnostic-deprecated-declarations,
   clang-diagnostic-deprecated-register,
   clang-diagnostic-expansion-to-defined,
   clang-diagnostic-ignored-attributes,
@@ -102,6 +109,7 @@ Checks: '-*,
   clang-diagnostic-shift-sign-overflow,
   clang-diagnostic-tautological-undefined-compare,
   clang-diagnostic-thread-safety*,
+  -clang-diagnostic-thread-safety-reference-return,
   clang-diagnostic-undefined-bool-conversion,
   clang-diagnostic-unreachable-code,
   clang-diagnostic-unreachable-code-loop-increment,
@@ -126,6 +134,7 @@ Checks: '-*,
   modernize-use-noexcept,
   modernize-use-nullptr,
   modernize-use-override,
+  modernize-use-starts-ends-with,
   modernize-use-transparent-functors,
   readability-braces-around-statements,
   readability-const-return-type,
@@ -135,27 +144,27 @@ Checks: '-*,
   readability-duplicate-include,
   readability-function-size,
   readability-inconsistent-declaration-parameter-name,
+  -readability-math-missing-parentheses,
   readability-misleading-indentation,
   readability-misplaced-array-index,
   readability-redundant-access-specifiers,
   readability-redundant-control-flow,
   readability-redundant-function-ptr-dereference,
   readability-redundant-smartptr-get,
-  -readability-redundant-string-cstr,
   readability-redundant-string-init,
   readability-simplify-boolean-expr,
   readability-static-definition-in-anonymous-namespace,
   readability-string-compare,
   readability-uniqueptr-delete-release'
 WarningsAsErrors: '*'
 CheckOptions:
-  - key:    readability-function-size.StatementThreshold
+  - key:    bugprone-unused-return-value.AllowCastToVoid
+    value:  true
+  - key:    readability-braces-around-statements.ShortStatementLines
     value:  '450'
+  - key:    readability-simplify-boolean-expr.SimplifyDeMorgan
+    value:  false
   - key:    modernize-make-unique.MakeSmartPtrFunction
     value:  'absl::make_unique'
   - key:    modernize-make-unique.MakeSmartPtrFunctionHeader
     value:  'absl/memory/memory.h'
-  - key:    readability-braces-around-statements.ShortStatementLines
-    value:  1
-  - key:    readability-simplify-boolean-expr.SimplifyDeMorgan
-    value:  false

.gitattributes

@@ -20,6 +20,7 @@ src/ruby/ext/grpc/rb_grpc_imports.generated.h linguist-generated=true
 src/ruby/ext/grpc/rb_grpc_imports.generated.c linguist-generated=true
 include/grpc/module.modulemap linguist-generated=true
 test/core/security/grpc_tls_credentials_options_comparator_test.cc linguist-generated=true
+tools/distrib/python/xds_protos/** linguist-generated=true
 tools/doxygen/Doxyfile.c++ linguist-generated=true
 tools/doxygen/Doxyfile.c++.internal linguist-generated=true
 tools/doxygen/Doxyfile.core linguist-generated=true

.github/ISSUE_TEMPLATE/bug_report_python.md

@@ -5,6 +5,8 @@ labels: kind/bug, priority/P2, lang/Python
 assignees:
   - gnossen
   - XuanWang-Amos
+  - sreenithi
+  - sourabhsinghs
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request_python.md

@@ -5,6 +5,8 @@ labels: kind/enhancement, priority/P2, lang/Python
 assignees:
   - gnossen
   - XuanWang-Amos
+  - sreenithi
+  - sourabhsinghs
 
 ---
 

.github/workflows/pr-auto-fix.yaml

@@ -66,7 +66,7 @@ jobs:
         run: test "${{ steps.check.outputs.result }}" = "stay"
       # Setup to run sanity suite
       - name: Install Python Interpreter
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: 3.8
       - name: Install Python Packages
@@ -75,7 +75,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install python3-dev
       - name: Check out repository code
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: True
       - name: Get the upstream code
@@ -90,7 +90,7 @@ jobs:
         run: ANDROID_NDK_HOME= ${{ github.workspace }}/tools/distrib/sanitize.sh
       # Report back with a PR if things are broken
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
           delete-branch: true
           branch-suffix: short-commit-hash

.github/workflows/update-artifacts-branch.yaml

@@ -0,0 +1,34 @@
+name: EXPERIMENTAL -- Update artifacts branch
+
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: write
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          fetch-depth: 0
+      - name: Setup git user
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "<EMAIL>"
+      - name: Update artifacts branch
+        run: |
+          git checkout master
+          git fetch origin
+          git checkout artifacts
+          git reset master .
+          git clean -fd
+          git rev-parse master > .source-revision
+          git add .
+          git commit -m "Update artifacts branch"
+          git push origin artifacts

.pylintrc

@@ -73,7 +73,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of

.pylintrc-examples

@@ -76,7 +76,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of

.pylintrc-tests

@@ -102,7 +102,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of