add additional debug logging

Author: joshhunt

backport/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+	"fmt"
 	"log/slog"
 	"os"
 	"strings"
@@ -57,14 +58,15 @@ func main() {
 		panic("token can not be empty")
 	}
 
-	prInfo, err := GetBackportPrInfo(ctx, client, ghctx)
+	prInfo, err := GetBackportPrInfo(ctx, log, client, ghctx)
 	if err != nil {
 		log.Error("error getting PR info", "error", err)
 		panic(err)
 	}
 
-	log = log.With("pull_request", prInfo.Pr.Number)
-	branches, err := ghutil.GetReleaseBranches(ctx, client.Repositories, prInfo.RepoOwner, prInfo.RepoName)
+	log = log.With("repo", fmt.Sprintf("%s/%s", prInfo.RepoOwner, prInfo.RepoName), "pull_request", prInfo.Pr.GetNumber())
+
+	branches, err := ghutil.GetReleaseBranches(ctx, log, client.Repositories, prInfo.RepoOwner, prInfo.RepoName)
 	if err != nil {
 		log.Error("error getting branches", "error", err)
 		panic(err)
@@ -101,7 +103,8 @@ func main() {
 			MergeBase:         mergeBase,
 		}
 
-		prOut, err := Backport(ctx, log, client.PullRequests, client.Issues, client.Issues, NewShellCommandRunner(log), opts)
+		commandRunner := NewShellCommandRunner(log)
+		prOut, err := Backport(ctx, log, client.PullRequests, client.Issues, client.Issues, commandRunner, opts)
 		if err != nil {
 			log.Error("backport failed", "error", err)
 			continue

backport/pr_info.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"strconv"
 
@@ -22,20 +23,23 @@ type PrInfo struct {
 	RepoName  string
 }
 
-func GetBackportPrInfo(ctx context.Context, client *github.Client, ghctx *githubactions.GitHubContext) (PrInfo, error) {
+func GetBackportPrInfo(ctx context.Context, log *slog.Logger, client *github.Client, ghctx *githubactions.GitHubContext) (PrInfo, error) {
 	prLabel := os.Getenv("PR_LABEL")
 	prNumber, _ := strconv.Atoi(os.Getenv("PR_NUMBER"))
 	repoOwner := os.Getenv("REPO_OWNER")
 	repoName := os.Getenv("REPO_NAME")
 
+	log.Debug("getting PR info", "event_path", ghctx.EventPath, "env_pr_label", prLabel, "env_pr_number", prNumber, "env_repo_owner", repoOwner, "env_repo_name", repoName)
+
 	// First, try to use the API to get the PR info
 	if prNumber != 0 && repoOwner != "" && repoName != "" {
+		log.Debug("getting PR info from API")
 		return getFromApi(ctx, client, prLabel, repoOwner, repoName, prNumber)
 	}
 
 	// Try to use event data if present
-	eventPath := ghctx.EventPath
-	if eventPath != "" {
+	if ghctx.EventPath != "" {
+		log.Debug("getting PR info from event")
 		return getFromEvent(ghctx)
 	}
 

pkg/ghutil/release_branches.go

@@ -3,6 +3,7 @@ package ghutil
 import (
 	"context"
 	"errors"
+	"log/slog"
 	"slices"
 	"strconv"
 	"strings"
@@ -92,14 +93,15 @@ func MajorMinorPatch(v string) (string, string, string) {
 	return groups["major"], groups["minor"], groups["patch"]
 }
 
-func GetReleaseBranches(ctx context.Context, client BranchClient, owner, repo string) ([]*github.Branch, error) {
+func GetReleaseBranches(ctx context.Context, log *slog.Logger, client BranchClient, owner, repo string) ([]*github.Branch, error) {
 	var (
 		page     int
 		count    = 50
 		branches = []*github.Branch{}
 	)
 
 	for {
+		log.Debug("listing branches", "page", page, "count", count)
 		b, r, err := client.ListBranches(ctx, owner, repo, &github.BranchListOptions{
 			Protected: github.Bool(true),
 			ListOptions: github.ListOptions{