address preston's comments

Author: Inspector-Butters

.github/workflows/check-logs.yml

@@ -16,7 +16,8 @@ jobs:
         with:
           go-version: '1.25.1'
 
+      - name: Install ripgrep
+        run: sudo apt-get install -y ripgrep
+
       - name: Check log.go files
-        run: |
-          chmod +x hack/gen-logs.sh hack/check-logs.sh
-          ./hack/check-logs.sh
+        run: ./hack/check-logs.sh

hack/gen-logs.sh

@@ -25,6 +25,7 @@ EXCLUDED_PATH_PREFIXES=(
   "bazel-prysm"
   "bazel-testlogs"
   "build"
+  ".git"
   ".github"
   ".jj"
   ".idea"
@@ -35,6 +36,12 @@ EXCLUDED_PATH_PREFIXES=(
 LOGRUS_IMPORT="github.com/sirupsen/logrus"
 # ----------------------------
 
+# Require ripgrep
+if ! command -v rg >/dev/null 2>&1; then
+  echo "Error: ripgrep (rg) is required but not installed." >&2
+  exit 1
+fi
+
 # Find project root (git repo root if available, else current dir)
 ROOT_DIR="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
 cd "$ROOT_DIR"
@@ -52,30 +59,28 @@ is_excluded() {
   return 1
 }
 
-# Build a find command that:
-# - starts at .
-# - prunes all EXCLUDED_PATH_PREFIXES
-# - returns only *.go files that are NOT *_test.go
-find_cmd=(find .)
-
-find_cmd+=( \( -path './.git' )
+# Build rg command:
+# - respects .gitignore automatically
+# - searches only *.go, excluding *_test.go
+# - excludes EXCLUDED_PATH_PREFIXES via negative globs so rg doesn't even enter them
+rg_args=(
+  rg -F "$LOGRUS_IMPORT"
+  --glob '*.go'
+  --glob '!*_test.go'
+  -l    # list matching files
+  -0    # NUL-delimited output
+)
 
-# Add all excluded prefixes to prune group
 for ex in "${EXCLUDED_PATH_PREFIXES[@]}"; do
-  find_cmd+=( -o -path "./$ex" )
+  rg_args+=( --glob "!$ex/**" )
 done
 
-# Close prune group, then search for go files
-find_cmd+=( \) -prune -o -type f -name '*.go' ! -name '*_test.go' -print0 )
-
-# Find all non-test .go files that import logrus, respecting exclusions
-mapfile -t FILES < <(
-  "${find_cmd[@]}" \
-    | xargs -0 -r grep -Il "$LOGRUS_IMPORT" \
-    || true
+# 1) Use ripgrep to find all non-test .go files that import logrus.
+mapfile -d '' -t FILES < <(
+  "${rg_args[@]}" . || true
 )
 
-# Collect unique directories containing such files
+# 2) Collect unique directories containing such files (is_excluded is now redundant but harmless)
 declare -A DIRS=()
 for f in "${FILES[@]}"; do
   dir="$(dirname "$f")"
@@ -85,6 +90,7 @@ for f in "${FILES[@]}"; do
   DIRS["$dir"]=1
 done
 
+# 3) For each directory, (re)generate log.go
 for dir in "${!DIRS[@]}"; do
   # Collect Go files in this directory
   shopt -s nullglob