chore: add some error logging

DanielleMaywood · DanielleMaywood · commit 7d8a7966153a · 2025-07-24T09:42:12.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -471,12 +471,16 @@ func (api *API) discoverDevcontainerProjects() error {
 }
 
 func (api *API) discoverDevcontainersInProject(projectPath string) error {
+	logger := api.logger.
+		Named("project-discovery").
+		With(slog.F("project_path", projectPath))
+
 	globalPatterns, err := ignore.LoadGlobalPatterns(api.fs)
 	if err != nil {
 		return xerrors.Errorf("read global git ignore patterns: %w", err)
 	}
 
-	patterns, err := ignore.ReadPatterns(api.fs, projectPath)
+	patterns, err := ignore.ReadPatterns(api.ctx, logger, api.fs, projectPath)
 	if err != nil {
 		return xerrors.Errorf("read git ignore patterns: %w", err)
 	}
@@ -488,7 +492,14 @@ func (api *API) discoverDevcontainersInProject(projectPath string) error {
 		"/.devcontainer.json",
 	}
 
-	return afero.Walk(api.fs, projectPath, func(path string, info fs.FileInfo, _ error) error {
+	return afero.Walk(api.fs, projectPath, func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			logger.Error(api.ctx, "encountered error while walking for dev container projects",
+				slog.F("path", path),
+				slog.Error(err))
+			return nil
+		}
+
 		pathParts := ignore.FilePathToParts(path)
 
 		// We know that a directory entry cannot be a `devcontainer.json` file, so we
@@ -513,11 +524,11 @@ func (api *API) discoverDevcontainersInProject(projectPath string) error {
 
 			workspaceFolder := strings.TrimSuffix(path, relativeConfigPath)
 
-			api.logger.Debug(api.ctx, "discovered dev container project", slog.F("workspace_folder", workspaceFolder))
+			logger.Debug(api.ctx, "discovered dev container project", slog.F("workspace_folder", workspaceFolder))
 
 			api.mu.Lock()
 			if _, found := api.knownDevcontainers[workspaceFolder]; !found {
-				api.logger.Debug(api.ctx, "adding dev container project", slog.F("workspace_folder", workspaceFolder))
+				logger.Debug(api.ctx, "adding dev container project", slog.F("workspace_folder", workspaceFolder))
 
 				dc := codersdk.WorkspaceAgentDevcontainer{
 					ID:              uuid.New(),
diff --git a/agent/agentcontainers/ignore/dir.go b/agent/agentcontainers/ignore/dir.go
@@ -2,12 +2,14 @@ package ignore
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"cdr.dev/slog"
 	"github.com/go-git/go-git/v5/plumbing/format/config"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
 	"github.com/spf13/afero"
@@ -53,7 +55,7 @@ func readIgnoreFile(fileSystem afero.Fs, path, ignore string) ([]gitignore.Patte
 	return ps, nil
 }
 
-func ReadPatterns(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {
+func ReadPatterns(ctx context.Context, logger slog.Logger, fileSystem afero.Fs, path string) ([]gitignore.Pattern, error) {
 	var ps []gitignore.Pattern
 
 	subPs, err := readIgnoreFile(fileSystem, path, gitInfoExcludeFile)
@@ -63,7 +65,14 @@ func ReadPatterns(fileSystem afero.Fs, path string) ([]gitignore.Pattern, error)
 
 	ps = append(ps, subPs...)
 
-	if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, _ error) error {
+	if err := afero.Walk(fileSystem, path, func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			logger.Error(ctx, "encountered error while walking for git ignore files",
+				slog.F("path", path),
+				slog.Error(err))
+			return nil
+		}
+
 		if !info.IsDir() {
 			return nil
 		}
