From 5e8215d2b4659fb9dd11c9c5e83438c907c9b45e Mon Sep 17 00:00:00 2001
From: Yijie Ma <yijiem@google.com>
Date: Wed, 10 Jan 2024 12:43:07 -0800
Subject: [PATCH] [SOT] Update release note automation (#35494)

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #35494

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35494 from yijiem:fix-release-note-script ed04b18ee8c260c4839a6e9b036d4549c2843790
PiperOrigin-RevId: 597327879
---
 tools/release/release_notes.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/release/release_notes.py b/tools/release/release_notes.py
index e931fee0d7b..a015a69b8af 100644
--- a/tools/release/release_notes.py
+++ b/tools/release/release_notes.py
@@ -95,7 +95,6 @@ def get_commit_log(prevRelLabel, relBranch):
         "git",
         "log",
         "--pretty=oneline",
-        "--committer=GitHub",
         "%s..%s" % (prevRelLabel, relBranch),
     ]
     print(("Running ", " ".join(glg_command)))
@@ -161,15 +160,11 @@ def get_pr_titles(gitLogs):
         body = pr["title"]
         if not body.endswith("."):
             body = body + "."
-        if not pr["merged_by"]:
-            print(("\n***ERROR***: No merge_by found for PR " + pr_num + "\n"))
-            error_count += 1
-            continue
 
         prline = (
             "-  " + body + " ([#" + pr_num + "](" + HTML_URL + pr_num + "))"
         )
-        detail = "- " + pr["merged_by"]["login"] + "@ " + prline
+        detail = "- " + pr["user"]["login"] + "@ " + prline
         print(detail)
         # if no RL label
         if not rl_no_found and not rl_yes_found:
@@ -192,6 +187,7 @@ def get_pr_titles(gitLogs):
             )
             langs_pr["inrel"].append(detail)
             langs_pr[lang].append(prline)
+        print(("State: " + pr["state"]))
 
     return langs_pr, error_count