Skip to content

Modern Docker Management, Designed for Everyone

chore: fix slog linter

Kyle Mendell0a58fd5b7e41
diff --git a/.golangci.yml b/.golangci.yml
index 87305ff56..4e12bc61f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,8 +1,8 @@
# Slightly Modified Version of docker's golangci lint configuration to fit arcanes standards
-version: '2'
+version: "2"
run:
- go: '1.27.1'
+ go: "1.27.1"
build-tags:
- exclude_frontend
- playwright
@@ -54,6 +54,7 @@ linters:
- nolintlint
- perfsprint
- revive
+ - sloglint
- staticcheck
- testifylint
- unconvert
@@ -76,20 +77,20 @@ linters:
desc: use stdlib maps package
- pkg: golang.org/x/exp/slices
desc: use stdlib slices package
- - pkg: 'github.com/google/uuid'
+ - pkg: "github.com/google/uuid"
desc: Use stdlib uuid instead.
- - pkg: 'gopkg.in/yaml.v3'
+ - pkg: "gopkg.in/yaml.v3"
desc: Use go.yaml.in/yaml/v4 instead.
forbidigo:
analyze-types: true
forbid:
- pattern: 'context\.Background'
- pkg: '^context$'
- msg: 'in tests, use t.Context() instead of context.Background()'
+ pkg: "^context$"
+ msg: "in tests, use t.Context() instead of context.Background()"
- pattern: 'context\.TODO'
- pkg: '^context$'
- msg: 'in tests, use t.Context() instead of context.TODO()'
+ pkg: "^context$"
+ msg: "in tests, use t.Context() instead of context.TODO()"
gocritic:
disabled-checks:
@@ -116,6 +117,11 @@ linters:
grouper:
const-require-single-const: true
+ const-require-grouping: true
+ var-require-single-var: true
+ var-require-grouping: true
+ type-require-single-type: true
+ type-require-grouping: true
nakedret:
# Disallow naked returns if func has more lines of code than this setting.
@@ -128,10 +134,10 @@ linters:
disabled: true
sloglint:
- context: 'all' # https://github.com/go-simpler/sloglint#context-only
+ context: "all" # https://github.com/go-simpler/sloglint#context-only
kv-only: true # https://github.com/go-simpler/sloglint#key-value-pairs-only
static-msg: true # https://github.com/go-simpler/sloglint#static-message
- key-naming-case: snake
+ key-naming-case: camel
exclusions:
generated: strict
diff --git a/backend/api/ws/container_stats.go b/backend/api/ws/container_stats.go
index 154a9ba46..3c3032a5c 100644
--- a/backend/api/ws/container_stats.go
+++ b/backend/api/ws/container_stats.go
@@ -50,10 +50,10 @@ func (h *WebSocketHandler) ContainerStats(c *echo.Context) error {
}
h.containerStatsHubs.CompareAndDelete(containerID, hub)
slog.DebugContext(c.Request().Context(), "container stats hub stopped before client registration; retrying",
- "containerID", containerID, "attempt", attempt+1)
+ "containerId", containerID, "attempt", attempt+1)
}
- slog.WarnContext(c.Request().Context(), "failed to register container stats client", "containerID", containerID)
+ slog.WarnContext(c.Request().Context(), "failed to register container stats client", "containerId", containerID)
_ = conn.CloseNow()
onRemove()
return nil
@@ -103,7 +103,7 @@ func (h *WebSocketHandler) runContainerStatsHubInternal(containerID string, hub
return
}
h.containerStatsHubs.CompareAndDelete(containerID, hub)
- slog.Debug("container stats hub idle, cleaning up upstream stream", "containerID", containerID)
+ slog.DebugContext(ctx, "container stats hub idle, cleaning up upstream stream", "containerId", containerID)
cleanupTimer = nil
cancel()
})
@@ -136,7 +136,7 @@ func (h *WebSocketHandler) runContainerStatsHubInternal(containerID string, hub
// socket that would never emit another sample. Tell them why, then drop
// the hub so the next connect rebuilds a producer instead of attaching
// to this dead one.
- slog.Warn("container stats stream failed", "containerID", containerID, "error", err)
+ slog.WarnContext(ctx, "container stats stream failed", "containerId", containerID, "error", err)
if b, marshalErr := json.Marshal(map[string]any{
"error": "Failed to stream container stats: " + err.Error(),
"timestamp": wshub.NowRFC3339(),
diff --git a/backend/api/ws/diagnostics.go b/backend/api/ws/diagnostics.go
index 522ed96c6..743ebd37c 100644
--- a/backend/api/ws/diagnostics.go
+++ b/backend/api/ws/diagnostics.go
@@ -139,7 +139,7 @@ func (h *WebSocketHandler) streamSnapshotsInternal(c *echo.Context, interval tim
defer unregister()
defer func() {
if closeNowErr := conn.CloseNow(); closeNowErr != nil {
- slog.Debug("Failed to close diagnostics websocket connection", "error", closeNowErr)
+ slog.DebugContext(c.Request().Context(), "Failed to close diagnostics websocket connection", "error", closeNowErr)
}
}()
@@ -197,7 +197,7 @@ func (h *WebSocketHandler) ServerLogsStream(c *echo.Context) error {
defer unregister()
defer func() {
if closeNowErr := conn.CloseNow(); closeNowErr != nil {
- slog.Debug("Failed to close server logs websocket connection", "error", closeNowErr)
+ slog.DebugContext(c.Request().Context(), "Failed to close server logs websocket connection", "error", closeNowErr)
}
}()
diff --git a/backend/api/ws/exec.go b/backend/api/ws/exec.go
index 05ca5a7d4..8b2476c69 100644
--- a/backend/api/ws/exec.go
+++ b/backend/api/ws/exec.go
@@ -80,11 +80,11 @@ func (h *WebSocketHandler) runContainerExecInternal(ctx context.Context, cancel
// run on cancellation while the stdout pipe is blocked in a read — closing
// the session is what unblocks it.
cleanup := sync.OnceFunc(func() {
- slog.Debug("Cleaning up exec session", "execID", execID, "containerID", containerID, "contextErr", ctx.Err())
+ slog.DebugContext(ctx, "Cleaning up exec session", "execId", execID, "containerId", containerID, "contextErr", ctx.Err())
cleanupCtx, cleanupCancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Second)
defer cleanupCancel()
if closeErr := execSession.Close(cleanupCtx); closeErr != nil { //nolint:contextcheck
- slog.Warn("Failed to clean up exec session", "execID", execID, "error", closeErr)
+ slog.WarnContext(ctx, "Failed to clean up exec session", "execId", execID, "error", closeErr)
}
})
defer cleanup()
@@ -129,8 +129,8 @@ func closeExecInternal(ctx context.Context, conn *websocket.Conn, containerID, e
}
closeErr := conn.Close(status, reason)
slog.Log(ctx, level, "Container exec session ended",
- "containerID", containerID,
- "execID", execID,
+ "containerId", containerID,
+ "execId", execID,
"status", int(status),
"reason", reason,
"cause", cause,
diff --git a/backend/api/ws/handler.go b/backend/api/ws/handler.go
index 7ee4e63bf..936510b47 100644
--- a/backend/api/ws/handler.go
+++ b/backend/api/ws/handler.go
@@ -122,7 +122,7 @@ func buildWSConnectionInfoInternal(c *echo.Context, kind, resourceID string) sys
func (h *WebSocketHandler) acceptWSInternal(c *echo.Context, kind, resourceID string) (*websocket.Conn, func(), bool) {
conn, err := wshub.Accept(c.Response(), c.Request(), h.checkWSOrigin)
if err != nil {
- slog.DebugContext(c.Request().Context(), "websocket accept failed", "kind", kind, "resourceID", resourceID, "error", err)
+ slog.DebugContext(c.Request().Context(), "websocket accept failed", "kind", kind, "resourceId", resourceID, "error", err)
return nil, nil, false
}
connID := h.wsMetrics.RegisterConnection(buildWSConnectionInfoInternal(c, kind, resourceID))
diff --git a/backend/api/ws/log_streams.go b/backend/api/ws/log_streams.go
index a47b09018..6c4f275e6 100644
--- a/backend/api/ws/log_streams.go
+++ b/backend/api/ws/log_streams.go
@@ -160,17 +160,17 @@ func (h *WebSocketHandler) serveLogStreamInternal(
// The stream refcount normally keeps this hub alive, so a stopped hub
// here means it was torn down out from under us; drop our reference
// rather than leaking the connection and the metrics entry.
- slog.Debug("log stream hub stopped before client registration", "streamKey", streamKey)
+ slog.DebugContext(c.Request().Context(), "log stream hub stopped before client registration", "streamKey", streamKey)
_ = conn.CloseNow()
release()
}
}
// broadcastLogStreamErrorInternal emits an error message to every client of a log stream.
-// resourceLabel is the human-readable noun used in slog/error text (e.g. "project log stream").
-// errorPrefix is the user-facing message prefix (e.g. "Failed to stream project logs: ").
-func broadcastLogStreamErrorInternal(resourceLabel, errorPrefix, resourceID, format string, err error, ls *wsLogStream) {
- slog.Warn(resourceLabel+" failed", "resourceID", resourceID, "error", err)
+// label is the human-readable resource noun (e.g. "project").
+func broadcastLogStreamErrorInternal(ctx context.Context, label, resourceID, format string, err error, ls *wsLogStream) {
+ slog.WarnContext(ctx, "log stream failed", "kind", label, "resourceId", resourceID, "error", err)
+ errorPrefix := "Failed to stream " + label + " logs: "
if format == "json" {
msg := wshub.LogMessage{
@@ -291,7 +291,7 @@ func (h *WebSocketHandler) startLogHubInternal(
if onEmptyHook != nil {
onEmptyHook(ls)
}
- slog.Debug("client disconnected, cleaning up "+label+" log hub", label+"ID", resourceID)
+ slog.DebugContext(ctx, "client disconnected, cleaning up log hub", "kind", label, "resourceId", resourceID)
})
lines := h.startLogSourceInternal(ctx, key, resourceID, label, params, stream, ls)
@@ -323,7 +323,7 @@ func (h *WebSocketHandler) startLogSourceInternal(
}
h.markLogStreamDoneInternal(key, ls)
- broadcastLogStreamErrorInternal(label+" log stream", "Failed to stream "+label+" logs: ", resourceID, params.format, err, ls)
+ broadcastLogStreamErrorInternal(ctx, label, resourceID, params.format, err, ls)
return
}
diff --git a/backend/api/ws/system_stats.go b/backend/api/ws/system_stats.go
index cf29e772c..3446c9005 100644
--- a/backend/api/ws/system_stats.go
+++ b/backend/api/ws/system_stats.go
@@ -435,7 +435,7 @@ func (h *WebSocketHandler) SystemStats(c *echo.Context) error {
defer unregister()
defer func() {
if err := conn.CloseNow(); err != nil {
- slog.Debug("Failed to close system stats websocket connection", "clientIP", clientIP, "error", err)
+ slog.DebugContext(c.Request().Context(), "Failed to close system stats websocket connection", "clientIp", clientIP, "error", err)
}
}()
diff --git a/backend/cli/recovery/recovery.go b/backend/cli/recovery/recovery.go
index c1cd15413..c96b7716a 100644
--- a/backend/cli/recovery/recovery.go
+++ b/backend/cli/recovery/recovery.go
@@ -112,7 +112,7 @@ func runRestoreInternal(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("%w; the pre-restore system backup was restored", runStagesErr)
}
if !request.ProjectsIncluded {
- slog.Warn("the restored system backup did not include the projects directory; the current projects directory was left untouched")
+ slog.WarnContext(ctx, "the restored system backup did not include the projects directory; the current projects directory was left untouched")
}
manifestData, err := os.ReadFile("/app/data/.arcane-recovery.json")
if err != nil {
@@ -279,7 +279,7 @@ func runStagesInternal(ctx context.Context, dockerClient *client.Client, request
mounts = append(mounts, stage.Target.Mounts...)
command := []string{"restore", "--delete", stage.SnapshotID + ":" + stage.SourcePath, stage.Target.Path}
if _, err := rusticruntime.Run(ctx, dockerClient, request.RecoveryKey, command, stage.Repository.Environment, mounts, container.NetworkMode(request.NetworkMode)); err != nil {
- slog.Error("Rustic system restore stage failed", "source", stage.SourcePath, "error", err)
+ slog.ErrorContext(ctx, "Rustic system restore stage failed", "source", stage.SourcePath, "error", err)
return fmt.Errorf("restore %s: %w", stage.SourcePath, err)
}
}
diff --git a/backend/cli/root.go b/backend/cli/root.go
index 5073fb200..713f1c2b8 100644
--- a/backend/cli/root.go
+++ b/backend/cli/root.go
@@ -23,7 +23,7 @@ var rootCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
err := bootstrap.Bootstrap(cmd.Context())
if err != nil {
- slog.Error("Failed to run Arcane", "error", err)
+ slog.ErrorContext(cmd.Context(), "Failed to run Arcane", "error", err)
os.Exit(1)
}
},
diff --git a/backend/cli/upgrade/logfile_test.go b/backend/cli/upgrade/logfile_test.go
index 3ccbdb202..b88abb352 100644
--- a/backend/cli/upgrade/logfile_test.go
+++ b/backend/cli/upgrade/logfile_test.go
@@ -22,7 +22,7 @@ func TestSetupMessageOnlyLogFile(t *testing.T) {
// Each entry is written atomically as it is logged, so the file is readable
// in full without any flush or close.
- slog.Info("container updated", "container", "web")
+ slog.InfoContext(t.Context(), "container updated", "container", "web")
content, err := os.ReadFile(logFile.Name())
diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.go
index 2fd83b1f8..dce71f35b 100644
--- a/backend/cli/upgrade/upgrade.go
+++ b/backend/cli/upgrade/upgrade.go
@@ -64,9 +64,9 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
logFile, err := SetupMessageOnlyLogFile(libarcane.UpgradeLogDirectory, "arcane-upgrade", slog.LevelInfo)
if err != nil {
- slog.Warn("Failed to setup file logging", "error", err)
+ slog.WarnContext(ctx, "Failed to setup file logging", "error", err)
} else {
- slog.Info("Upgrade log file created", "path", logFile.Name())
+ slog.InfoContext(ctx, "Upgrade log file created", "path", logFile.Name())
}
// Connect to Docker
@@ -79,13 +79,13 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
// Find the container
var targetContainer container.InspectResponse
if autoDetect || containerName == "" {
- slog.Info("Auto-detecting Arcane container...")
+ slog.InfoContext(ctx, "Auto-detecting Arcane container...")
targetContainer, err = findArcaneContainer(ctx, dockerClient)
if err != nil {
return fmt.Errorf("failed to find Arcane container: %w", err)
}
containerName = strings.TrimPrefix(targetContainer.Name, "/")
- slog.Info("Found Arcane container", "name", containerName, "id", targetContainer.ID[:12])
+ slog.InfoContext(ctx, "Found Arcane container", "name", containerName, "id", targetContainer.ID[:12])
} else {
inspectResult, inspectErr := compat.ContainerInspectWithCompatibility(ctx, dockerClient, containerName, client.ContainerInspectOptions{})
if inspectErr != nil {
@@ -98,11 +98,11 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
imageToPull := targetImage
if imageToPull == "" {
imageToPull = determineImageName(ctx, dockerClient, targetContainer)
- slog.Info("Determined image to pull", "image", imageToPull)
+ slog.InfoContext(ctx, "Determined image to pull", "image", imageToPull)
}
// Pull the new image
- slog.Info("Pulling new image", "image", imageToPull)
+ slog.InfoContext(ctx, "Pulling new image", "image", imageToPull)
if pullImageErr := pullImage(ctx, dockerClient, imageToPull); pullImageErr != nil {
return fmt.Errorf("failed to pull image: %w", pullImageErr)
}
@@ -111,18 +111,18 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
// the image the container already runs there is nothing to swap in. Skipping the
// recreate avoids needless downtime and, for agents, a dropped connection.
if same, pulledID := pulledImageAlreadyRunning(ctx, dockerClient, imageToPull, targetContainer.Image); same {
- slog.Info("Image unchanged after pull; already up to date, skipping recreate",
+ slog.InfoContext(ctx, "Image unchanged after pull; already up to date, skipping recreate",
"container", containerName, "image", imageToPull, "imageId", pulledID)
return nil
}
// Perform the upgrade
- slog.Info("Starting container upgrade", "container", containerName)
+ slog.InfoContext(ctx, "Starting container upgrade", "container", containerName)
if upgradeContainerErr := UpgradeContainer(ctx, dockerClient, targetContainer, imageToPull, nil); upgradeContainerErr != nil {
return fmt.Errorf("failed to upgrade container: %w", upgradeContainerErr)
}
- slog.Info("Upgrade completed successfully", "container", containerName, "image", imageToPull)
+ slog.InfoContext(ctx, "Upgrade completed successfully", "container", containerName, "image", imageToPull)
return nil
}
@@ -137,12 +137,12 @@ func findArcaneContainer(ctx context.Context, dockerClient *client.Client) (cont
}
selfID, _ := cgroup.CurrentContainerID()
- slog.Info("Searching for Arcane container", "selfID", selfID, "totalContainers", len(containers.Items))
+ slog.InfoContext(ctx, "Searching for Arcane container", "selfId", selfID, "totalContainers", len(containers.Items))
now := time.Now()
for _, c := range containers.Items {
- if shouldSkipContainer(c, selfID, now) {
+ if shouldSkipContainer(ctx, c, selfID, now) {
continue
}
@@ -153,7 +153,7 @@ func findArcaneContainer(ctx context.Context, dockerClient *client.Client) (cont
inspect := inspectResult.Container
if isAgentContainer(inspect) {
- slog.Debug("Skipping agent container", "id", c.ID[:12], "names", c.Names)
+ slog.DebugContext(ctx, "Skipping agent container", "id", c.ID[:12], "names", c.Names)
continue
}
@@ -164,20 +164,20 @@ func findArcaneContainer(ctx context.Context, dockerClient *client.Client) (cont
// New label: com.getarcaneapp.arcane=true
if labels.IsArcaneContainer(containerLabels) {
- slog.Info("Found Arcane container by label", "id", c.ID[:12], "image", c.Image, "names", c.Names)
+ slog.InfoContext(ctx, "Found Arcane container by label", "id", c.ID[:12], "image", c.Image, "names", c.Names)
return inspect, nil
}
// Legacy label (pre-migration): com.getarcaneapp.arcane.server=true
// NOTE: older agent images also used this label, so we must additionally exclude AGENT_MODE=true.
if isLegacyServerLabel(containerLabels) {
- slog.Info("Found Arcane container by legacy label", "id", c.ID[:12], "image", c.Image, "names", c.Names)
+ slog.InfoContext(ctx, "Found Arcane container by legacy label", "id", c.ID[:12], "image", c.Image, "names", c.Names)
return inspect, nil
}
// Fallback: image name heuristic
if strings.Contains(strings.ToLower(c.Image), "arcane") {
- slog.Info("Found matching container by image name", "id", c.ID[:12], "image", c.Image, "names", c.Names)
+ slog.InfoContext(ctx, "Found matching container by image name", "id", c.ID[:12], "image", c.Image, "names", c.Names)
return inspect, nil
}
}
@@ -260,7 +260,7 @@ func refreshRecreatedContainerLabelsInternal(ctx context.Context, dockerClient *
imageInspect, imageInspectErr = dockerClient.ImageInspect(ctx, targetImage)
}
if imageInspectErr != nil {
- slog.Warn("Could not inspect target image labels; preserving container OCI overrides",
+ slog.WarnContext(ctx, "Could not inspect target image labels; preserving container OCI overrides",
"image", targetImage,
"error", imageInspectErr,
)
@@ -274,7 +274,7 @@ func refreshRecreatedContainerLabelsInternal(ctx context.Context, dockerClient *
if hasOCIImageLabelInternal(containerLabels) && strings.TrimSpace(previousImage) != "" {
previousImageInspect, previousImageInspectErr := dockerClient.ImageInspect(ctx, previousImage)
if previousImageInspectErr != nil {
- slog.Warn("Could not inspect previous image labels; preserving existing OCI labels",
+ slog.WarnContext(ctx, "Could not inspect previous image labels; preserving existing OCI labels",
"image", previousImage,
"error", previousImageInspectErr,
)
@@ -317,10 +317,10 @@ func isAgentContainer(inspect container.InspectResponse) bool {
}
// shouldSkipContainer determines if a container should be skipped during search
-func shouldSkipContainer(c container.Summary, selfID string, now time.Time) bool {
+func shouldSkipContainer(ctx context.Context, c container.Summary, selfID string, now time.Time) bool {
// Skip ourselves (the upgrader container) by ID
if selfID != "" && strings.HasPrefix(c.ID, selfID) {
- slog.Info("Skipping self by ID", "id", c.ID[:12], "names", c.Names)
+ slog.InfoContext(ctx, "Skipping self by ID", "id", c.ID[:12], "names", c.Names)
return true
}
@@ -329,7 +329,7 @@ func shouldSkipContainer(c container.Summary, selfID string, now time.Time) bool
createdTime := time.Unix(c.Created, 0)
age := now.Sub(createdTime)
if age < 30*time.Second {
- slog.Info("Skipping recently created container", "id", c.ID[:12], "age", age, "names", c.Names)
+ slog.InfoContext(ctx, "Skipping recently created container", "id", c.ID[:12], "age", age, "names", c.Names)
return true
}
}
@@ -337,7 +337,7 @@ func shouldSkipContainer(c container.Summary, selfID string, now time.Time) bool
// Skip containers with "upgrader" in the name
for _, name := range c.Names {
if strings.Contains(strings.ToLower(name), "upgrader") {
- slog.Info("Skipping upgrader container by name", "name", name)
+ slog.InfoContext(ctx, "Skipping upgrader container by name", "name", name)
return true
}
}
@@ -429,7 +429,7 @@ func pulledImageAlreadyRunning(ctx context.Context, dockerClient *client.Client,
}
inspect, err := dockerClient.ImageInspect(ctx, imageRef)
if err != nil {
- slog.Warn("Could not inspect pulled image; continuing with recreate", "image", imageRef, "error", err)
+ slog.WarnContext(ctx, "Could not inspect pulled image; continuing with recreate", "image", imageRef, "error", err)
return false, ""
}
return inspect.ID == runningImageID, inspect.ID
@@ -471,7 +471,7 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
return fmt.Errorf("prepare host config: %w", err)
}
if sanitizedMemorySwappiness {
- slog.Info("Stripped unsupported host config field for recreate",
+ slog.InfoContext(ctx, "Stripped unsupported host config field for recreate",
"container", originalName,
"containerId", oldContainer.ID,
"engine", engineInfo.Name,
@@ -485,7 +485,7 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
if hostConfig == nil {
hostConfig = &container.HostConfig{}
}
- hostConfig.Binds, hostConfig.Mounts, err = docker.PreserveVolumeMounts(hostConfig.Binds, hostConfig.Mounts, oldContainer.Mounts)
+ hostConfig.Binds, hostConfig.Mounts, err = docker.PreserveVolumeMounts(ctx, hostConfig.Binds, hostConfig.Mounts, oldContainer.Mounts)
if err != nil {
return fmt.Errorf("preserve volumes of container %s: %w", originalName, err)
}
@@ -501,7 +501,7 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
// Clear hostname if it looks like a container ID (auto-generated by Docker)
// This allows Docker to assign the new container's ID as the hostname
if looksLikeContainerID(config.Hostname) {
- slog.Debug("Clearing auto-generated hostname", "oldHostname", config.Hostname)
+ slog.DebugContext(ctx, "Clearing auto-generated hostname", "oldHostname", config.Hostname)
config.Hostname = ""
}
@@ -521,9 +521,9 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
if !nm.IsContainer() {
apiVersion = compat.DetectDockerAPIVersion(ctx, dockerClient)
if apiVersion != "" && !compat.IsDockerAPIVersionAtLeast(apiVersion, compat.NetworkScopedMacAddressMinAPIVersion) {
- slog.Info("daemon API does not support per-network mac-address on create; stripping endpoint mac addresses",
- "dockerAPIVersion", apiVersion,
- "minimumRequiredAPIVersion", compat.NetworkScopedMacAddressMinAPIVersion,
+ slog.InfoContext(ctx, "daemon API does not support per-network mac-address on create; stripping endpoint mac addresses",
+ "dockerApiVersion", apiVersion,
+ "minimumRequiredApiVersion", compat.NetworkScopedMacAddressMinAPIVersion,
)
}
@@ -538,13 +538,13 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
}
fmt.Println("PROGRESS:65:Renaming old container")
- slog.Info("Renaming old container", "from", originalName, "to", oldName)
+ slog.InfoContext(ctx, "Renaming old container", "from", originalName, "to", oldName)
if _, containerRenameErr := dockerClient.ContainerRename(ctx, oldContainer.ID, client.ContainerRenameOptions{NewName: oldName}); containerRenameErr != nil {
return fmt.Errorf("rename old container: %w", containerRenameErr)
}
fmt.Println("PROGRESS:70:Stopping old container")
- slog.Info("Stopping old container", "name", oldName)
+ slog.InfoContext(ctx, "Stopping old container", "name", oldName)
// Allow graceful shutdown and longer finite timeouts, but never wait forever.
stopTimeout := 40
if configured := oldContainer.Config.StopTimeout; configured != nil && *configured > stopTimeout {
@@ -556,7 +556,7 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
}
fmt.Println("PROGRESS:75:Creating new container")
- slog.Info("Creating new container", "name", originalName)
+ slog.InfoContext(ctx, "Creating new container", "name", originalName)
resp, err := compat.ContainerCreateWithCompatibilityForAPIVersion(ctx, dockerClient, client.ContainerCreateOptions{
Config: &config,
HostConfig: hostConfig,
@@ -571,7 +571,7 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
}
fmt.Println("PROGRESS:80:Starting new container")
- slog.Info("Starting new container", "id", resp.ID[:12])
+ slog.InfoContext(ctx, "Starting new container", "id", resp.ID[:12])
if _, containerStartErr := dockerClient.ContainerStart(ctx, resp.ID, client.ContainerStartOptions{}); containerStartErr != nil {
// Cleanup new container and restart old one
_, _ = dockerClient.ContainerRemove(ctx, resp.ID, client.ContainerRemoveOptions{Force: true})
@@ -586,9 +586,9 @@ func UpgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta
time.Sleep(2 * time.Second)
fmt.Println("PROGRESS:90:Removing old container")
- slog.Info("Removing old container", "id", oldContainer.ID[:12])
+ slog.InfoContext(ctx, "Removing old container", "id", oldContainer.ID[:12])
if _, containerRemoveErr := dockerClient.ContainerRemove(ctx, oldContainer.ID, client.ContainerRemoveOptions{}); containerRemoveErr != nil {
- slog.Warn("Failed to remove old container", "error", containerRemoveErr)
+ slog.WarnContext(ctx, "Failed to remove old container", "error", containerRemoveErr)
}
fmt.Println("PROGRESS:95:Upgrade complete")
diff --git a/backend/internal/activity/service.go b/backend/internal/activity/service.go
index 3f3ca2cc8..c3cc1f943 100644
--- a/backend/internal/activity/service.go
+++ b/backend/internal/activity/service.go
@@ -170,7 +170,9 @@ func (sub *activitySubscriber) dropOldestMessageLockedInternal() {
sub.queue = append(sub.queue[:i], sub.queue[i+1:]...)
sub.messageCount--
sub.missed = true
- slog.Warn("activity subscriber message buffer full; snapshot will be sent on next heartbeat", "environmentId", sub.environmentID)
+ ctx := context.Background() //nolint:forbidigo // Subscriber buffer trimming runs outside any request context.
+ slog.WarnContext(ctx, "activity subscriber message buffer full; snapshot will be sent on next heartbeat",
+ "environmentId", sub.environmentID)
return
}
}
@@ -451,7 +453,7 @@ func (s *ActivityService) AwaitActivitySlot(ctx context.Context, activityID, env
s.registerSlotReleaseInternal(activityID, release)
if _, updateErr := s.UpdateActivity(ctx, activityID, UpdateActivityRequest{Status: activity.StatusRunning}); updateErr != nil {
- slog.Warn("failed to mark queued activity running", "activityId", activityID, "error", updateErr)
+ slog.WarnContext(ctx, "failed to mark queued activity running", "activityId", activityID, "error", updateErr)
}
return nil
}
diff --git a/backend/internal/apikey/service.go b/backend/internal/apikey/service.go
index a0d5f9c4d..1bab990ea 100644
--- a/backend/internal/apikey/service.go
+++ b/backend/internal/apikey/service.go
@@ -164,7 +164,7 @@ func (s *ApiKeyService) BackfillApiKeyPermissions(ctx context.Context) error {
return fmt.Errorf("failed to seed api key permission: %w", createKeyPermissionErr)
}
}
- slog.InfoContext(ctx, "Backfilled missing permissions for bootstrap api key", "api_key_id", key.ID, "perm_count", len(perms), "env_id", key.EnvironmentID)
+ slog.InfoContext(ctx, "Backfilled missing permissions for bootstrap api key", "apiKeyId", key.ID, "permCount", len(perms), "envId", key.EnvironmentID)
}
return nil
})
@@ -267,7 +267,7 @@ func (s *ApiKeyService) markApiKeyUsedDebouncedInternal(ctx context.Context, key
s.lastUsedMu.Unlock()
if err := s.markApiKeyUsedInternal(ctx, keyID); err != nil {
- slog.WarnContext(ctx, "failed to persist API key usage", "api_key_id", keyID, "error", err)
+ slog.WarnContext(ctx, "failed to persist API key usage", "apiKeyId", keyID, "error", err)
// Release the reservation so the next use retries instead of silently
// skipping writes for the rest of the window — but only if it is still
// ours, to avoid clobbering a newer reservation made after an
@@ -952,7 +952,7 @@ func (s *ApiKeyService) loadKeyGrantsInternal(ctx context.Context, apiKeyID stri
}
var rows []role.ApiKeyPermission
if err := s.db.WithContext(ctx).Where("api_key_id = ?", apiKeyID).Find(&rows).Error; err != nil {
- slog.WarnContext(ctx, "failed to load api key permission grants", "api_key_id", apiKeyID, "error", err)
+ slog.WarnContext(ctx, "failed to load api key permission grants", "apiKeyId", apiKeyID, "error", err)
return empty
}
out := make([]apikey.PermissionGrant, len(rows))
diff --git a/backend/internal/auth/handler.go b/backend/internal/auth/handler.go
index 789567e1b..66cdb548c 100644
--- a/backend/internal/auth/handler.go
+++ b/backend/internal/auth/handler.go
@@ -170,7 +170,7 @@ func (h *AuthHandler) Logout(ctx context.Context, input *struct{}) (*LogoutOutpu
if h.authService != nil {
if sessionID, exists := middleware.GetCurrentSessionIDFromContext(ctx); exists {
if err := h.authService.RevokeSession(ctx, sessionID); err != nil {
- slog.ErrorContext(ctx, "Failed to revoke session on logout; clearing cookie anyway", "sessionID", sessionID, "error", err)
+ slog.ErrorContext(ctx, "Failed to revoke session on logout; clearing cookie anyway", "sessionId", sessionID, "error", err)
}
}
if userModel, exists := userdomain.CurrentUserFromContext(ctx); exists {
@@ -447,7 +447,7 @@ func (h *AuthHandler) UploadMyAvatar(ctx context.Context, input *UploadMyAvatarI
data, mimeType = normalizeAvatarImageInternal(data, mimeType)
if uploadAvatarErr := h.userService.UploadAvatar(ctx, currentUser.ID, data, mimeType); uploadAvatarErr != nil {
- slog.ErrorContext(ctx, "Failed to save avatar", "user_id", currentUser.ID, "error", uploadAvatarErr)
+ slog.ErrorContext(ctx, "Failed to save avatar", "userId", currentUser.ID, "error", uploadAvatarErr)
return nil, huma.Error500InternalServerError("failed to save avatar")
}
h.authService.InvalidateUserTokenCache(currentUser.ID)
@@ -488,7 +488,7 @@ func (h *AuthHandler) DeleteMyAvatar(ctx context.Context, input *struct{}) (*han
}
if deleteAvatarErr := h.userService.DeleteAvatar(ctx, currentUser.ID); deleteAvatarErr != nil {
- slog.ErrorContext(ctx, "Failed to delete avatar", "user_id", currentUser.ID, "error", deleteAvatarErr)
+ slog.ErrorContext(ctx, "Failed to delete avatar", "userId", currentUser.ID, "error", deleteAvatarErr)
return nil, huma.Error500InternalServerError("failed to delete avatar")
}
h.authService.InvalidateUserTokenCache(currentUser.ID)
@@ -914,7 +914,7 @@ func resolveUserPermissionsInternal(ctx context.Context, permResolver Permission
}
ps, err := permResolver.ResolvePermissions(ctx, authenticatedUser.ID)
if err != nil {
- slog.WarnContext(ctx, "failed to resolve user permissions", "error", err, "user_id", authenticatedUser.ID)
+ slog.WarnContext(ctx, "failed to resolve user permissions", "error", err, "userId", authenticatedUser.ID)
return nil
}
return ps
@@ -926,7 +926,7 @@ func resolveApiKeyPermissionsInternal(ctx context.Context, permResolver Permissi
}
ps, err := permResolver.ResolveApiKeyPermissions(ctx, apiKeyID)
if err != nil {
- slog.WarnContext(ctx, "failed to resolve api key permissions", "error", err, "api_key_id", apiKeyID)
+ slog.WarnContext(ctx, "failed to resolve api key permissions", "error", err, "apiKeyId", apiKeyID)
return nil
}
return ps
@@ -1070,8 +1070,8 @@ func (m *AuthMiddleware) agentAuth(ctx context.Context, c *echo.Context, next ec
ctx, "Agent auth forbidden",
"path", req.URL.Path,
"method", req.Method,
- "has_agent_token_hdr", req.Header.Get(middleware.HeaderAgentToken) != "",
- "agent_token_config_set", m.cfg.AgentToken != "",
+ "hasAgentTokenHdr", req.Header.Get(middleware.HeaderAgentToken) != "",
+ "agentTokenConfigSet", m.cfg.AgentToken != "",
)
return c.JSON(http.StatusForbidden, common.APIError{
Code: "FORBIDDEN",
diff --git a/backend/internal/auth/service.go b/backend/internal/auth/service.go
index c151b28cf..a8b4a2eb4 100644
--- a/backend/internal/auth/service.go
+++ b/backend/internal/auth/service.go
@@ -439,11 +439,11 @@ func (s *AuthService) tryMergeOidcUser(ctx context.Context, userInfo auth.OidcUs
return nil, false, nil
}
- if err := s.validateMergeEmailVerification(userInfo); err != nil {
+ if err := s.validateMergeEmailVerification(ctx, userInfo); err != nil {
return nil, false, err
}
- slog.Info("Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)
+ slog.InfoContext(ctx, "Merging OIDC account with existing user", "email", userInfo.Email, "subject", userInfo.Subject)
if mergeErr := s.mergeOidcWithExistingUser(ctx, existingUser, userInfo, tokenResp); mergeErr != nil {
return nil, false, mergeErr
}
@@ -455,7 +455,7 @@ func (s *AuthService) isOidcMergeEnabled(ctx context.Context) bool {
return settingsErr == nil && localSettings.OidcMergeAccounts.IsTrue()
}
-func (s *AuthService) validateMergeEmailVerification(userInfo auth.OidcUserInfo) error {
+func (s *AuthService) validateMergeEmailVerification(ctx context.Context, userInfo auth.OidcUserInfo) error {
emailVerifiedPresent := false
if userInfo.Extra != nil {
if _, ok := userInfo.Extra["email_verified"]; ok {
@@ -466,7 +466,7 @@ func (s *AuthService) validateMergeEmailVerification(userInfo auth.OidcUserInfo)
return errors.New("email not verified by OIDC provider; cannot merge accounts")
}
if !emailVerifiedPresent {
- slog.Warn("OIDC email_verified claim missing; allowing merge", "email", userInfo.Email, "subject", userInfo.Subject)
+ slog.WarnContext(ctx, "OIDC email_verified claim missing; allowing merge", "email", userInfo.Email, "subject", userInfo.Subject)
}
return nil
}
@@ -516,7 +516,7 @@ func (s *AuthService) createOidcUser(ctx context.Context, userInfo auth.OidcUser
return nil, createErr
}
if syncOidcRoleAssignmentsErr := s.syncOidcRoleAssignments(ctx, localUser, userInfo, tokenResp); syncOidcRoleAssignmentsErr != nil {
- slog.WarnContext(ctx, "failed to sync OIDC role assignments on user create", "error", syncOidcRoleAssignmentsErr, "user_id", localUser.ID)
+ slog.WarnContext(ctx, "failed to sync OIDC role assignments on user create", "error", syncOidcRoleAssignmentsErr, "userId", localUser.ID)
}
return localUser, nil
}
@@ -547,7 +547,7 @@ func (s *AuthService) resolveOidcUsernameInternal(ctx context.Context, userInfo
_, candidateErr := s.userService.GetUserByUsername(ctx, unique)
if errors.Is(candidateErr, common.ErrUserNotFound) {
slog.InfoContext(ctx, "OIDC username already taken by an existing account; assigning a unique username instead",
- "username", username, "unique_username", unique, "subject", userInfo.Subject)
+ "username", username, "uniqueUsername", unique, "subject", userInfo.Subject)
return unique, nil
}
if candidateErr != nil {
@@ -572,7 +572,7 @@ func (s *AuthService) updateOidcUser(ctx context.Context, localUser *user.User,
return err
}
if err := s.syncOidcRoleAssignments(ctx, localUser, userInfo, tokenResp); err != nil {
- slog.WarnContext(ctx, "failed to sync OIDC role assignments on user update", "error", err, "user_id", localUser.ID)
+ slog.WarnContext(ctx, "failed to sync OIDC role assignments on user update", "error", err, "userId", localUser.ID)
}
return nil
}
@@ -591,7 +591,7 @@ func (s *AuthService) mergeOidcWithExistingUser(ctx context.Context, localUser *
}
if merged != nil {
if syncErr := s.syncOidcRoleAssignments(ctx, merged, userInfo, tokenResp); syncErr != nil {
- slog.WarnContext(ctx, "failed to sync OIDC role assignments on user merge", "error", syncErr, "user_id", merged.ID)
+ slog.WarnContext(ctx, "failed to sync OIDC role assignments on user merge", "error", syncErr, "userId", merged.ID)
}
}
return nil
diff --git a/backend/internal/backup/service.go b/backend/internal/backup/service.go
index fe8c61883..68b7e4559 100644
--- a/backend/internal/backup/service.go
+++ b/backend/internal/backup/service.go
@@ -964,7 +964,7 @@ func (e *Engine) SubmitDurableRun(ctx context.Context, command backup.DurableRun
readErr := e.service.GetState(ctx, backupRunTypeInternal, command.RunID, &state)
switch {
case readErr == nil && sameDurableCommandInternal(state.Command, command):
- slog.WarnContext(ctx, "backup run accepted after submit error", "runID", command.RunID, "error", err)
+ slog.WarnContext(ctx, "backup run accepted after submit error", "runId", command.RunID, "error", err)
return nil
case readErr == nil || errors.Is(readErr, actor.ErrStateNotFound):
e.mu.Lock()
@@ -973,7 +973,7 @@ func (e *Engine) SubmitDurableRun(ctx context.Context, command backup.DurableRun
return err
default:
// Keep admission parked until reconciliation can read the intent back.
- slog.WarnContext(ctx, "backup run outcome unresolved", "runID", command.RunID, "error", err, "readError", readErr)
+ slog.WarnContext(ctx, "backup run outcome unresolved", "runId", command.RunID, "error", err, "readError", readErr)
e.mu.Lock()
e.unresolved[command.RunID] = command
e.mu.Unlock()
@@ -1016,7 +1016,7 @@ func (a *backupRunActorInternal) Invoke(ctx context.Context, _ string, data acto
}
// The intent is persisted, so ReconcileDispatches repairs a failed dispatch.
if _, _, dispatchErr := a.service.Dispatch(ctx, backupRunTypeInternal, a.id, "execute", nil, actor.WithIdempotencyKey(a.id)); dispatchErr != nil {
- slog.WarnContext(ctx, "dispatch accepted backup run", "runID", a.id, "error", dispatchErr)
+ slog.WarnContext(ctx, "dispatch accepted backup run", "runId", a.id, "error", dispatchErr)
}
return nil, nil
}
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index ead916c70..e8b129086 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -66,7 +66,7 @@ func Bootstrap(ctx context.Context) error {
slog.SetDefault(slog.New(logs.NewSlogHandler(slog.Default().Handler(), ws.LogBroadcaster())))
database.SetGormLogger(BuildGormLogger(cfg))
slog.InfoContext(ctx, "Arcane is starting...", "version", config.Version)
- slog.InfoContext(ctx, "Arcane Identity Configuration", "PUID", os.Getuid(), "PGID", os.Getgid())
+ slog.InfoContext(ctx, "Arcane Identity Configuration", "puid", os.Getuid(), "pgid", os.Getgid())
appCtx, cancelApp := context.WithCancel(ctx)
appCtx = utils.WithAppLifecycleContext(appCtx)
@@ -79,7 +79,7 @@ func Bootstrap(ctx context.Context) error {
defer func() {
cancelApp()
if closeErr := db.Close(); closeErr != nil {
- slog.Error("Error closing database", "error", closeErr)
+ slog.ErrorContext(ctx, "Error closing database", "error", closeErr)
}
}()
@@ -150,9 +150,9 @@ func isWeakProductionEncryptionKeyInternal(encryptionKey, localEnvironment strin
return len(strings.TrimPrefix(key, "raw:")) < 32
}
-func warnDeprecatedEnvVarsInternal(cfg *config.Config) {
+func warnDeprecatedEnvVarsInternal(ctx context.Context, cfg *config.Config) {
for _, envName := range cfg.DeprecatedEnvVarsSet() {
- slog.Warn("Deprecated environment variable is set and no longer used; remove it from your environment", "env", envName)
+ slog.WarnContext(ctx, "Deprecated environment variable is set and no longer used; remove it from your environment", "env", envName)
}
}
@@ -207,7 +207,7 @@ func initializeStartupState(p initializeStartupStateParams) {
AdminStaticAPIKey: cfg.AdminStaticAPIKey,
}
- warnDeprecatedEnvVarsInternal(cfg)
+ warnDeprecatedEnvVarsInternal(appCtx, cfg)
startup.LoadAgentToken(appCtx, runtimeCfg, p.Settings.GetStringSetting)
startup.EnsureEncryptionKey(appCtx, runtimeCfg, p.Settings.EnsureEncryptionKey)
@@ -272,7 +272,7 @@ func initializeStartupState(p initializeStartupStateParams) {
}
effectiveAPIVersion := cmp.Or(strings.TrimSpace(dockerClient.ClientVersion()), strings.TrimSpace(version.APIVersion))
- slog.InfoContext(ctx, "Docker API versions detected", "client_api_version", dockerClient.ClientVersion(), "server_api_version", version.APIVersion, "effective_api_version", effectiveAPIVersion)
+ slog.InfoContext(ctx, "Docker API versions detected", "clientApiVersion", dockerClient.ClientVersion(), "serverApiVersion", version.APIVersion, "effectiveApiVersion", effectiveAPIVersion)
return nil
})
if p.Swarm != nil {
@@ -427,7 +427,7 @@ func startEdgeTunnelClientIfConfigured(appCtx context.Context, cfg *config.Confi
return nil, fmt.Errorf("failed to start edge tunnel client: %w", err)
}
- slog.InfoContext(appCtx, "Edge tunnel client started", "manager_url", cfg.ManagerApiUrl)
+ slog.InfoContext(appCtx, "Edge tunnel client started", "managerUrl", cfg.ManagerApiUrl)
return stop, nil
}
@@ -499,6 +499,6 @@ func initializeDBAndMigrateInternal(ctx context.Context, cfg *config.Config) (*d
return nil, fmt.Errorf("failed to initialize database: %w", err)
}
- slog.Info("Database initialized successfully")
+ slog.InfoContext(ctx, "Database initialized successfully")
return db, nil
}
diff --git a/backend/internal/bootstrap/edge_bootstrap.go b/backend/internal/bootstrap/edge_bootstrap.go
index dec29c111..5b2e61687 100644
--- a/backend/internal/bootstrap/edge_bootstrap.go
+++ b/backend/internal/bootstrap/edge_bootstrap.go
@@ -118,9 +118,9 @@ func registerEdgeTunnelRoutes(
apiGroup.POST("/tunnel/mtls/enroll", server.HandleMTLSEnroll, middleware.PerIPRateLimit(10, 3), middleware.PerAgentTokenRateLimit(10, 3))
apiGroup.GET("/tunnel/connect", server.HandleConnect, middleware.PerIPRateLimit(60, 30), middleware.PerAgentTokenRateLimit(10, 3))
slog.InfoContext(ctx, "Configured edge tunnel server",
- "poll_enabled", true,
- "grpc_enabled", !cfg.AgentMode,
- "websocket_enabled", true,
+ "pollEnabled", true,
+ "grpcEnabled", !cfg.AgentMode,
+ "websocketEnabled", true,
)
return server
}
@@ -160,15 +160,15 @@ func handleEdgeStatusChange(ctx context.Context, environmentService *environment
envName := envID
env, getErr := environmentService.GetEnvironmentByID(ctx, envID)
if getErr != nil {
- slog.WarnContext(ctx, "Failed to load environment before edge status update", "environment_id", envID, "error", getErr)
+ slog.WarnContext(ctx, "Failed to load environment before edge status update", "environmentId", envID, "error", getErr)
} else if env != nil && env.Name != "" {
envName = env.Name
}
if err := environmentService.UpdateEnvironmentConnectionState(ctx, envID, connected); err != nil {
- slog.WarnContext(ctx, "Failed to update environment status on edge connect/disconnect", "environment_id", envID, "connected", connected, "error", err)
+ slog.WarnContext(ctx, "Failed to update environment status on edge connect/disconnect", "environmentId", envID, "connected", connected, "error", err)
} else {
- slog.InfoContext(ctx, "Updated edge environment connection state", "environment_id", envID, "connected", connected)
+ slog.InfoContext(ctx, "Updated edge environment connection state", "environmentId", envID, "connected", connected)
}
// Only log an event on an actual state transition; poll-mode tunnels can
@@ -179,7 +179,7 @@ func handleEdgeStatusChange(ctx context.Context, environmentService *environment
(!connected && env.Status == string(environment.EnvironmentStatusOffline)))
if !alreadyInState {
if err := createEdgeConnectionEvent(ctx, eventService, envID, envName, connected); err != nil {
- slog.WarnContext(ctx, "Failed to create edge connection event", "environment_id", envID, "connected", connected, "error", err)
+ slog.WarnContext(ctx, "Failed to create edge connection event", "environmentId", envID, "connected", connected, "error", err)
}
}
diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.go
index 019d59f2d..6af06284f 100644
--- a/backend/internal/bootstrap/jobs_bootstrap.go
+++ b/backend/internal/bootstrap/jobs_bootstrap.go
@@ -609,13 +609,13 @@ func syncTimeoutSettingsToAgentsInternal(ctx context.Context, localEnvironment t
for _, env := range envs {
responseBody, statusCode, proxyRequestErr := localEnvironment.ProxyRequest(ctx, env.ID, http.MethodPut, "/api/environments/0/settings", body)
if proxyRequestErr != nil {
- slog.WarnContext(ctx, "Failed to sync timeout settings to environment", "environmentID", env.ID, "environmentName", env.Name, "error", proxyRequestErr)
+ slog.WarnContext(ctx, "Failed to sync timeout settings to environment", "environmentId", env.ID, "environmentName", env.Name, "error", proxyRequestErr)
continue
}
if statusCode < http.StatusOK || statusCode >= http.StatusMultipleChoices {
- slog.WarnContext(ctx, "Environment returned non-OK status for timeout sync", "environmentID", env.ID, "environmentName", env.Name, "statusCode", statusCode, "response", string(responseBody))
+ slog.WarnContext(ctx, "Environment returned non-OK status for timeout sync", "environmentId", env.ID, "environmentName", env.Name, "statusCode", statusCode, "response", string(responseBody))
continue
}
- slog.DebugContext(ctx, "Successfully synced timeout settings to environment", "environmentID", env.ID, "environmentName", env.Name)
+ slog.DebugContext(ctx, "Successfully synced timeout settings to environment", "environmentId", env.ID, "environmentName", env.Name)
}
}
diff --git a/backend/internal/bootstrap/logger_bootstrap_test.go b/backend/internal/bootstrap/logger_bootstrap_test.go
index ceb102bdb..6473bd31c 100644
--- a/backend/internal/bootstrap/logger_bootstrap_test.go
+++ b/backend/internal/bootstrap/logger_bootstrap_test.go
@@ -18,7 +18,7 @@ func TestRequestLogHandler(t *testing.T) {
logger.LogAttrs(t.Context(), slog.LevelWarn, "Not Found",
slog.Group("request",
- slog.Time("time", time.Now()),
+ slog.Time("time", time.Now()), //nolint:sloglint // Mirrors the attribute shape slog-echo emits.
slog.String("method", "GET"),
slog.String("host", "localhost:3552"),
slog.String("path", "/api/missing"),
@@ -29,12 +29,12 @@ func TestRequestLogHandler(t *testing.T) {
slog.Int("length", 0),
),
slog.Group("response",
- slog.Time("time", time.Now()),
+ slog.Time("time", time.Now()), //nolint:sloglint // Mirrors the attribute shape slog-echo emits.
slog.Duration("latency", 1500*time.Microsecond),
slog.Int("status", 404),
slog.Int("length", 24),
),
- slog.Any("error", map[string]any{
+ slog.Any("error", map[string]any{ //nolint:sloglint // Mirrors the attribute shape slog-echo emits.
"code": 404,
"message": "Not Found",
"internal": nil,
diff --git a/backend/internal/bootstrap/playwright_router_bootstrap.go b/backend/internal/bootstrap/playwright_router_bootstrap.go
index b98c134ec..ebfbd76fe 100644
--- a/backend/internal/bootstrap/playwright_router_bootstrap.go
+++ b/backend/internal/bootstrap/playwright_router_bootstrap.go
@@ -3,6 +3,7 @@
package bootstrap
import (
+ "context"
"log/slog"
"github.com/labstack/echo/v5"
@@ -12,18 +13,19 @@ import (
)
func init() {
+ ctx := context.Background() //nolint:forbidigo // Package init has no request context.
registerPlaywrightRoutes = []func(apiGroup *echo.Group, deps api.HandlerDeps){
func(apiGroup *echo.Group, deps api.HandlerDeps) {
apiKeyService := deps.ApiKey.Service()
userService := deps.User.Service()
if apiKeyService == nil || userService == nil || deps.Federated == nil || deps.GitRepository.Service() == nil || deps.GitOpsSync.Service() == nil {
- slog.Warn("Playwright service not available, skipping playwright routes")
+ slog.WarnContext(ctx, "Playwright service not available, skipping playwright routes")
return
}
playwrightService := playwright.NewPlaywrightService(apiKeyService, userService, deps.GitRepository.Service(), deps.GitOpsSync.Service(), deps.Project.Service())
playwright.SetupRoutes(apiGroup, playwrightService, deps.Federated)
- slog.Info("Playwright routes registered for E2E testing")
+ slog.InfoContext(ctx, "Playwright routes registered for E2E testing")
},
}
}
diff --git a/backend/internal/bootstrap/router_bootstrap.go b/backend/internal/bootstrap/router_bootstrap.go
index c910e40d5..20b67c5d6 100644
--- a/backend/internal/bootstrap/router_bootstrap.go
+++ b/backend/internal/bootstrap/router_bootstrap.go
@@ -189,7 +189,7 @@ func newRouter(p RouterParams) (*echo.Echo, *edge.TunnelServer) {
trustedProxyNets := parseTrustedProxyCIDRsInternal(cfg.TrustedProxies)
if cfg.TrustedProxies != "" && len(trustedProxyNets) == 0 {
- slog.Warn("TRUSTED_PROXIES set but no valid CIDRs found; falling back to direct IP extraction")
+ slog.WarnContext(ctx, "TRUSTED_PROXIES set but no valid CIDRs found; falling back to direct IP extraction")
}
if len(trustedProxyNets) == 0 {
e.IPExtractor = echo.ExtractIPDirect()
@@ -317,9 +317,9 @@ func newRouter(p RouterParams) (*echo.Echo, *edge.TunnelServer) {
//nolint:staticcheck,nolintlint // SA4023 only under exclude_frontend: the stub always returns ErrFrontendNotIncluded
if err := frontend.RegisterFrontend(e); err != nil {
if errors.Is(err, frontend.ErrFrontendNotIncluded) {
- slog.Debug("Frontend not included in this build; skipping frontend registration")
+ slog.DebugContext(ctx, "Frontend not included in this build; skipping frontend registration")
} else {
- slog.Error("Failed to register frontend", "error", err)
+ slog.ErrorContext(ctx, "Failed to register frontend", "error", err)
}
}
@@ -340,7 +340,7 @@ func parseTrustedProxyCIDRsInternal(raw string) []*net.IPNet {
}
_, ipnet, err := net.ParseCIDR(cidr)
if err != nil {
- slog.Warn("invalid TRUSTED_PROXIES CIDR, ignoring", "cidr", cidr, "error", err)
+ slog.WarnContext(context.Background(), "invalid TRUSTED_PROXIES CIDR, ignoring", "cidr", cidr, "error", err) //nolint:forbidigo // Startup configuration parsing has no request context.
continue
}
nets = append(nets, ipnet)
diff --git a/backend/internal/bootstrap/server_bootstrap.go b/backend/internal/bootstrap/server_bootstrap.go
index f93016bef..10d390bbe 100644
--- a/backend/internal/bootstrap/server_bootstrap.go
+++ b/backend/internal/bootstrap/server_bootstrap.go
@@ -83,7 +83,7 @@ func NewHTTPServer(lc fx.Lifecycle, p HTTPServerParams) (*http.Server, error) {
}
srv.Addr = listener.Addr().String()
- slog.InfoContext(ctx, "Starting HTTP server", "addr", listenAddr, "listen", p.Config.Listen, "port", p.Config.Port, "tls_enabled", useTLS)
+ slog.InfoContext(ctx, "Starting HTTP server", "addr", listenAddr, "listen", p.Config.Listen, "port", p.Config.Port, "tlsEnabled", useTLS)
go func() {
defer func() { _ = listener.Close() }()
var serveErr error
diff --git a/backend/internal/build/children/workspace/service.go b/backend/internal/build/children/workspace/service.go
index e4951d741..093617212 100644
--- a/backend/internal/build/children/workspace/service.go
+++ b/backend/internal/build/children/workspace/service.go
@@ -58,7 +58,7 @@ func (s *Service) ListDirectory(ctx context.Context, dirPath string) ([]workspac
}
func (s *Service) GetFileContent(ctx context.Context, filePath string, maxBytes int64) ([]byte, string, error) {
- slog.DebugContext(ctx, "build workspace: get file content", "path", filePath, "max_bytes", maxBytes)
+ slog.DebugContext(ctx, "build workspace: get file content", "path", filePath, "maxBytes", maxBytes)
root, err := s.resolveRoot()
if err != nil {
return nil, "", err
@@ -109,7 +109,7 @@ func (s *Service) DownloadFile(ctx context.Context, filePath string) (io.ReadClo
}
func (s *Service) UploadFile(ctx context.Context, destPath string, content io.Reader, filename string, size int64) error {
- slog.DebugContext(ctx, "build workspace: upload file", "dest_path", destPath, "filename", filename)
+ slog.DebugContext(ctx, "build workspace: upload file", "destPath", destPath, "filename", filename)
root, err := s.resolveRoot()
if err != nil {
return err
diff --git a/backend/internal/build/service.go b/backend/internal/build/service.go
index 9c35b7ce8..d39ecbe17 100644
--- a/backend/internal/build/service.go
+++ b/backend/internal/build/service.go
@@ -301,17 +301,17 @@ func (s *BuildService) resolveBuildRequestInternal(
return req, func() error { return nil }, nil
}
- writeBuildProgressStatusInternal(progressWriter, serviceName, "resolving remote git context "+source.RepositoryURL)
+ writeBuildProgressStatusInternal(ctx, progressWriter, serviceName, "resolving remote git context "+source.RepositoryURL)
authConfig, matchedRepository, err := s.resolveGitBuildAuthInternal(ctx, source.RepositoryURL)
if err != nil {
return types.BuildRequest{}, func() error { return nil }, err
}
if matchedRepository {
- writeBuildProgressStatusInternal(progressWriter, serviceName, "using saved git credentials for "+source.RepositoryURL)
+ writeBuildProgressStatusInternal(ctx, progressWriter, serviceName, "using saved git credentials for "+source.RepositoryURL)
}
if gitkit.RequiresRemoteProbe(source.RepositoryURL) {
- writeBuildProgressStatusInternal(progressWriter, serviceName, "verifying remote git repository "+source.RepositoryURL)
+ writeBuildProgressStatusInternal(ctx, progressWriter, serviceName, "verifying remote git repository "+source.RepositoryURL)
if probeGitContextErr := s.probeGitContextInternal(ctx, source.RepositoryURL, authConfig); probeGitContextErr != nil {
return types.BuildRequest{}, func() error { return nil }, fmt.Errorf("failed to verify remote git repository %q: %w", source.RepositoryURL, probeGitContextErr)
}
@@ -343,7 +343,7 @@ func (s *BuildService) resolveBuildRequestInternal(
return types.BuildRequest{}, func() error { return nil }, errors.New("resolved git build context is not a directory")
}
- writeBuildProgressStatusInternal(progressWriter, serviceName, "using remote build context "+source.Raw)
+ writeBuildProgressStatusInternal(ctx, progressWriter, serviceName, "using remote build context "+source.Raw)
resolvedReq := req
resolvedReq.ContextDir = contextDir
@@ -409,7 +409,7 @@ func (s *BuildService) cleanupGitContextInternal(repoPath string) error {
return errors.New("git repository service not available")
}
-func writeBuildProgressStatusInternal(progressWriter io.Writer, serviceName, status string) {
+func writeBuildProgressStatusInternal(ctx context.Context, progressWriter io.Writer, serviceName, status string) {
if progressWriter == nil || strings.TrimSpace(status) == "" {
return
}
@@ -419,7 +419,7 @@ func writeBuildProgressStatusInternal(progressWriter io.Writer, serviceName, sta
line = service + ": " + status
}
if _, err := io.WriteString(progressWriter, line+"\n"); err != nil {
- slog.Debug("failed to write build progress status", "error", err)
+ slog.DebugContext(ctx, "failed to write build progress status", "error", err)
}
}
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index f2cee8638..3a295ee36 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -2,6 +2,7 @@ package config
import (
"cmp"
+ "context"
"fmt"
"log/slog"
"net"
@@ -198,7 +199,8 @@ func applyProxyDefaults(cfg *Config) {
return
}
cfg.TrustedProxies = "127.0.0.0/8,::1/128"
- slog.Info("LISTEN bound to loopback; trusting loopback proxies for X-Forwarded headers", "listen", cfg.Listen, "trusted_proxies", cfg.TrustedProxies)
+ slog.InfoContext(context.Background(), "LISTEN bound to loopback; trusting loopback proxies for X-Forwarded headers", //nolint:forbidigo // Configuration loads before any request context exists.
+ "listen", cfg.Listen, "trustedProxies", cfg.TrustedProxies)
}
// loadFromEnv uses reflection to load configuration from environment variables.
@@ -313,6 +315,7 @@ func visitConfigFields(v reflect.Value, fn func(reflect.Value, reflect.StructFie
// setFieldValueInternal sets a reflect.Value from a string based on the field's type.
func setFieldValueInternal(field reflect.Value, fieldType reflect.StructField, value string) {
+ ctx := context.Background() //nolint:forbidigo // Configuration loads before any request context exists.
if !field.CanSet() {
return
}
@@ -350,14 +353,14 @@ func setFieldValueInternal(field reflect.Value, fieldType reflect.StructField, v
defaultValue := fieldType.Tag.Get("default")
if fallback, fallbackErr := time.ParseDuration(defaultValue); fallbackErr == nil {
- slog.Warn("Invalid duration for config field, using tagged default",
+ slog.WarnContext(ctx, "Invalid duration for config field, using tagged default",
"reason", reason,
"field", envTag,
"value", value,
"default", defaultValue)
field.SetInt(int64(fallback))
} else {
- slog.Warn("Invalid duration for config field and invalid tagged default",
+ slog.WarnContext(ctx, "Invalid duration for config field and invalid tagged default",
"reason", reason,
"field", envTag,
"value", value,
@@ -420,7 +423,7 @@ func (c *Config) GetLocation() *time.Location {
loc, err := time.LoadLocation(tz)
if err != nil {
- slog.Warn("Failed to load timezone, falling back to UTC", "timezone", tz, "error", err)
+ slog.WarnContext(context.Background(), "Failed to load timezone, falling back to UTC", "timezone", tz, "error", err) //nolint:forbidigo // Timezone resolution is a process-wide setting lookup.
return time.UTC
}
return loc
diff --git a/backend/internal/container/children/stats/service.go b/backend/internal/container/children/stats/service.go
index 510ed5db9..6948eca13 100644
--- a/backend/internal/container/children/stats/service.go
+++ b/backend/internal/container/children/stats/service.go
@@ -147,7 +147,7 @@ func (s *Service) Collect(ctx context.Context, items []containertypes.Summary) (
if groupCtx.Err() != nil {
return groupCtx.Err()
}
- slog.WarnContext(groupCtx, "Failed to collect container resource sample", "container_id", id, "error", err)
+ slog.WarnContext(groupCtx, "Failed to collect container resource sample", "containerId", id, "error", err)
return nil
}
mu.Lock()
diff --git a/backend/internal/container/service.go b/backend/internal/container/service.go
index 773f5d7ce..42f0eadf3 100644
--- a/backend/internal/container/service.go
+++ b/backend/internal/container/service.go
@@ -2200,7 +2200,7 @@ func (e *ExecSession) Stdout() io.Reader { return e.hijackedResp.Reader }
func (e *ExecSession) Close(ctx context.Context) error {
var closeErr error
e.closeOnce.Do(func() {
- slog.Debug("Closing exec session", "execID", e.execID, "containerID", e.containerID)
+ slog.DebugContext(ctx, "Closing exec session", "execId", e.execID, "containerId", e.containerID)
// Send EOF (Ctrl-D) then exit to terminate the shell gracefully.
_, _ = e.hijackedResp.Conn.Write([]byte{0x04})
diff --git a/backend/internal/database/database.go b/backend/internal/database/database.go
index 9d83409ad..784ff0cf3 100644
--- a/backend/internal/database/database.go
+++ b/backend/internal/database/database.go
@@ -97,7 +97,7 @@ func Initialize(ctx context.Context, databaseURL string, options MigrationOption
}
if migrateDatabaseErr := migrateDatabaseInternal(ctx, sqlDB, dbProvider, options); migrateDatabaseErr != nil {
- slog.Error("Failed to run migrations", "error", migrateDatabaseErr)
+ slog.ErrorContext(ctx, "Failed to run migrations", "error", migrateDatabaseErr)
return nil, fmt.Errorf("failed to run migrations: %w", migrateDatabaseErr)
}
@@ -158,7 +158,7 @@ func connectDatabaseInternal(ctx context.Context, databaseURL string) (*DB, erro
return &DB{db}, nil
}
- slog.Info("Failed to initialize database", "attempt", i)
+ slog.InfoContext(ctx, "Failed to initialize database", "attempt", i)
if i < 3 {
select {
case <-time.After(3 * time.Second):
@@ -195,7 +195,7 @@ func migrateDatabaseToVersionInternal(ctx context.Context, db *sql.DB, dbProvide
return fmt.Errorf("failed to determine current migration version for %s: %w", dbProvider, err)
}
- slog.Info("Resolved database migration state", "provider", dbProvider, "currentVersion", currentVersion, "requiredVersion", requiredVersion)
+ slog.InfoContext(ctx, "Resolved database migration state", "provider", dbProvider, "currentVersion", currentVersion, "requiredVersion", requiredVersion)
if currentVersion > requiredVersion {
if !options.AllowDowngrade {
@@ -228,12 +228,12 @@ func migrateDatabaseToVersionInternal(ctx context.Context, db *sql.DB, dbProvide
return fmt.Errorf("failed to downgrade database from version %d to %d for %s using embedded Goose migrations: %w", currentVersion, requiredVersion, dbProvider, downToErr)
}
- slog.Info("Database downgrade completed successfully", "provider", dbProvider, "fromVersion", currentVersion, "toVersion", requiredVersion)
+ slog.InfoContext(ctx, "Database downgrade completed successfully", "provider", dbProvider, "fromVersion", currentVersion, "toVersion", requiredVersion)
return nil
}
if currentVersion == requiredVersion {
- slog.Info("Database schema is up to date", "provider", dbProvider, "migrationVersion", currentVersion)
+ slog.InfoContext(ctx, "Database schema is up to date", "provider", dbProvider, "migrationVersion", currentVersion)
return nil
}
@@ -241,7 +241,7 @@ func migrateDatabaseToVersionInternal(ctx context.Context, db *sql.DB, dbProvide
return fmt.Errorf("failed to apply embedded Goose migrations for %s: %w", dbProvider, upToErr)
}
- slog.Info("Database migrations completed successfully", "provider", dbProvider, "targetVersion", requiredVersion)
+ slog.InfoContext(ctx, "Database migrations completed successfully", "provider", dbProvider, "targetVersion", requiredVersion)
return nil
}
@@ -314,7 +314,7 @@ func adoptLegacyMigrationStateInternal(ctx context.Context, db *sql.DB, dbProvid
if clearLegacyMigrationDirtyErr := clearLegacyMigrationDirtyInternal(ctx, db, dbProvider, legacyState.version); clearLegacyMigrationDirtyErr != nil {
return clearLegacyMigrationDirtyErr
}
- slog.Warn("Cleared dirty legacy migration state because ALLOW_DOWNGRADE=true", "provider", dbProvider, "version", legacyState.version)
+ slog.WarnContext(ctx, "Cleared dirty legacy migration state because ALLOW_DOWNGRADE=true", "provider", dbProvider, "version", legacyState.version)
}
hasGooseState, err := gooseVersionTableHasAppliedMigrationsInternal(ctx, db, dbProvider)
@@ -371,7 +371,7 @@ func adoptLegacyMigrationStateInternal(ctx context.Context, db *sql.DB, dbProvid
return fmt.Errorf("failed to commit legacy migration adoption for %s: %w", dbProvider, commitErr)
}
- slog.Info("Adopted legacy migration state into Goose", "provider", dbProvider, "legacyVersion", legacyState.version)
+ slog.InfoContext(ctx, "Adopted legacy migration state into Goose", "provider", dbProvider, "legacyVersion", legacyState.version)
return nil
}
diff --git a/backend/internal/docker/service.go b/backend/internal/docker/service.go
index 375e9440d..786bcc193 100644
--- a/backend/internal/docker/service.go
+++ b/backend/internal/docker/service.go
@@ -103,7 +103,7 @@ func detectDockerAPIVersionInternal(ctx context.Context, host string) (string, e
if err != nil {
return "", fmt.Errorf("failed to create Docker probe client: %w", err)
}
- defer closeDockerClientInternal(probeClient, "failed to close probe Docker client")
+ defer closeDockerClientInternal(ctx, probeClient, "probe")
ctx, cancel := context.WithTimeout(ctx, dockerClientNegotiationTimeout)
defer cancel()
@@ -115,7 +115,7 @@ func detectDockerAPIVersionInternal(ctx context.Context, host string) (string, e
apiVersion := strings.TrimSpace(pingResult.APIVersion)
if apiVersion == "" {
- slog.WarnContext(ctx, "Docker ping did not report an API version, using minimum supported client API version", "api_version", client.MinAPIVersion)
+ slog.WarnContext(ctx, "Docker ping did not report an API version, using minimum supported client API version", "apiVersion", client.MinAPIVersion)
return client.MinAPIVersion, nil
}
@@ -134,13 +134,13 @@ func newDockerClientWithAPIVersionInternal(host, apiVersion string) (*client.Cli
return configuredClient, nil
}
-func closeDockerClientInternal(cli *client.Client, message string) {
+func closeDockerClientInternal(ctx context.Context, cli *client.Client, purpose string) {
if cli == nil {
return
}
if err := cli.Close(); err != nil {
- slog.Warn(message, "error", err)
+ slog.WarnContext(ctx, "Failed to close Docker client", "purpose", purpose, "error", err)
}
}
@@ -164,7 +164,7 @@ func (s *DockerClientService) GetClient(ctx context.Context) (*client.Client, er
if s.Client != nil {
existingClient := s.Client
s.mu.Unlock()
- closeDockerClientInternal(cli, "failed to close unused Docker client after concurrent initialization")
+ closeDockerClientInternal(ctx, cli, "unused after concurrent initialization")
return existingClient, nil
}
@@ -201,7 +201,7 @@ func (s *DockerClientService) RefreshClient(ctx context.Context) error {
if s.Client != nil && apiVersion == s.clientVersion {
s.clientLastProbe = time.Now()
s.mu.Unlock()
- closeDockerClientInternal(cli, "failed to close unused Docker client after concurrent refresh")
+ closeDockerClientInternal(ctx, cli, "unused after concurrent refresh")
return nil
}
@@ -211,7 +211,7 @@ func (s *DockerClientService) RefreshClient(ctx context.Context) error {
s.clientLastProbe = time.Now()
s.mu.Unlock()
- closeDockerClientInternal(oldClient, "failed to close replaced Docker client")
+ closeDockerClientInternal(ctx, oldClient, "replaced")
return nil
}
@@ -231,7 +231,7 @@ func (s *DockerClientService) Close() {
s.Client = nil
s.mu.Unlock()
- closeDockerClientInternal(oldClient, "failed to close Docker client")
+ closeDockerClientInternal(context.Background(), oldClient, "cached") //nolint:forbidigo // Shutdown close runs without a request context.
}
func (s *DockerClientService) EventBus() *bus.DockerEventBus {
diff --git a/backend/internal/environment/children/proxy/service.go b/backend/internal/environment/children/proxy/service.go
index 8a8830837..6c39360c9 100644
--- a/backend/internal/environment/children/proxy/service.go
+++ b/backend/internal/environment/children/proxy/service.go
@@ -345,13 +345,13 @@ func (s *Service) fanOutSyncToEnvironment[Model, Item, Request any](
return fmt.Errorf("sync cancelled while waiting for an in-flight delivery: %w", err)
}
if unchanged {
- slog.DebugContext(ctx, "Skipping sync; payload unchanged since last delivery", "kind", kind, "environmentID", environmentID, "environmentName", target.name)
+ slog.DebugContext(ctx, "Skipping sync; payload unchanged since last delivery", "kind", kind, "environmentId", environmentID, "environmentName", target.name)
return nil
}
delivered := false
defer func() { finishDelivery(delivered) }()
- slog.InfoContext(ctx, "Starting sync to environment", "kind", kind, "environmentID", environmentID, "environmentName", target.name, "apiUrl", target.targetURL)
+ slog.InfoContext(ctx, "Starting sync to environment", "kind", kind, "environmentId", environmentID, "environmentName", target.name, "apiUrl", target.targetURL)
reqCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
@@ -373,7 +373,7 @@ func (s *Service) fanOutSyncToEnvironment[Model, Item, Request any](
}
delivered = true
- slog.InfoContext(ctx, "Successfully synced to environment", "kind", kind, "environmentID", environmentID, "environmentName", target.name)
+ slog.InfoContext(ctx, "Successfully synced to environment", "kind", kind, "environmentId", environmentID, "environmentName", target.name)
return nil
}
diff --git a/backend/internal/environment/children/snippets/service.go b/backend/internal/environment/children/snippets/service.go
index 6042f7fc5..6a2634eda 100644
--- a/backend/internal/environment/children/snippets/service.go
+++ b/backend/internal/environment/children/snippets/service.go
@@ -115,7 +115,7 @@ func Edge(managerURL, apiKey string) (string, string) {
func (s *Service) GenerateMTLS(ctx context.Context, edgeCfg *edge.Config, envID, envName, managerURL, apiKey string) (*edge.GeneratedMTLSAssets, string, string) {
generatedAssets, err := edge.GenerateManagerClientMTLSAssetsWithContext(ctx, edgeCfg, envID, envName)
if err != nil {
- slog.WarnContext(ctx, "Failed to generate edge mTLS assets; returning basic snippets only", "environment_id", envID, "error", err)
+ slog.WarnContext(ctx, "Failed to generate edge mTLS assets; returning basic snippets only", "environmentId", envID, "error", err)
return nil, "", ""
}
if generatedAssets == nil {
@@ -191,7 +191,7 @@ func (s *Service) logGeneratedMTLSEventsInternal(ctx context.Context, envID, env
EnvironmentID: &envIDCopy,
Metadata: database.JSON{"kind": "client"},
}); err != nil {
- slog.WarnContext(ctx, "Failed to create edge mTLS certificate issuance event", "environment_id", envID, "error", err)
+ slog.WarnContext(ctx, "Failed to create edge mTLS certificate issuance event", "environmentId", envID, "error", err)
}
}
}
diff --git a/backend/internal/environment/children/swarm/service.go b/backend/internal/environment/children/swarm/service.go
index f26b95331..91ce11d01 100644
--- a/backend/internal/environment/children/swarm/service.go
+++ b/backend/internal/environment/children/swarm/service.go
@@ -92,7 +92,7 @@ func (s *Service) EnsureApiKey(
// The new key was never linked; remove it so a failed rotation does
// not leave an orphaned valid credential behind.
if delErr := s.apiKeys.DeleteApiKey(ctx, apiKeyDto.ID); delErr != nil && !errors.Is(delErr, apikey.ErrApiKeyNotFound) {
- slog.ErrorContext(ctx, "Failed to clean up unlinked environment API key", "environmentID", environmentID, "error", delErr.Error())
+ slog.ErrorContext(ctx, "Failed to clean up unlinked environment API key", "environmentId", environmentID, "error", delErr.Error())
}
return "", linkErr
}
@@ -104,7 +104,7 @@ func (s *Service) EnsureApiKey(
// stays visible and deletable on the API Keys page.
if previousApiKeyID != nil && *previousApiKeyID != apiKeyDto.ID {
if deleteApiKeyErr := s.apiKeys.DeleteApiKey(ctx, *previousApiKeyID); deleteApiKeyErr != nil && !errors.Is(deleteApiKeyErr, apikey.ErrApiKeyNotFound) {
- slog.ErrorContext(ctx, "Failed to delete previous environment API key; the old key remains valid until deleted manually", "environmentID", environmentID, "error", deleteApiKeyErr.Error())
+ slog.ErrorContext(ctx, "Failed to delete previous environment API key; the old key remains valid until deleted manually", "environmentId", environmentID, "error", deleteApiKeyErr.Error())
}
}
diff --git a/backend/internal/environment/handler.go b/backend/internal/environment/handler.go
index dc1168f14..4bc89e3de 100644
--- a/backend/internal/environment/handler.go
+++ b/backend/internal/environment/handler.go
@@ -375,7 +375,7 @@ func (h *EnvironmentHandler) createEnvironmentWithApiKeyInternal(ctx context.Con
// Generate API key for environment
apiKeyDto, err := h.apiKeyService.CreateEnvironmentApiKey(ctx, created.ID)
if err != nil {
- slog.ErrorContext(ctx, "Failed to create environment API key", "environmentID", created.ID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to create environment API key", "environmentId", created.ID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to create environment API key")
}
@@ -395,9 +395,9 @@ func (h *EnvironmentHandler) createEnvironmentWithApiKeyInternal(ctx context.Con
// environment and must survive; deleting the environment cascades it.
if delErr := h.apiKeyService.DeleteApiKey(ctx, apiKeyDto.ID); delErr != nil &&
!errors.Is(delErr, apikey.ErrApiKeyNotFound) && !errors.Is(delErr, apikey.ErrApiKeyProtected) {
- slog.ErrorContext(ctx, "Failed to clean up unlinked environment API key", "environmentID", created.ID, "error", delErr.Error())
+ slog.ErrorContext(ctx, "Failed to clean up unlinked environment API key", "environmentId", created.ID, "error", delErr.Error())
}
- slog.ErrorContext(ctx, "Failed to link API key to environment", "environmentID", created.ID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to link API key to environment", "environmentId", created.ID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to link API key")
}
created = updated
@@ -516,14 +516,14 @@ func (h *EnvironmentHandler) UpdateEnvironment(ctx context.Context, input *Updat
apiKey, err := h.environmentService.RegenerateEnvironmentApiKey(ctx, updated, localUser.ID, localUser.Username)
if err != nil {
- slog.ErrorContext(ctx, "Failed to regenerate API key", "environmentID", input.ID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to regenerate API key", "environmentId", input.ID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to regenerate API key")
}
// Fetch updated environment
updated, err = h.environmentService.GetEnvironmentByID(ctx, input.ID)
if err != nil {
- slog.ErrorContext(ctx, "Failed to fetch updated environment", "environmentID", input.ID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to fetch updated environment", "environmentId", input.ID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to fetch updated environment")
}
@@ -719,7 +719,7 @@ func (h *EnvironmentHandler) triggerPostUpdateTasksInternal(ctx context.Context,
status, err := h.environmentService.TestConnection(syncCtx, envID, nil)
if err != nil {
slog.WarnContext(syncCtx, "Failed to test connection after environment update",
- "environment_id", envID, "environment_name", envName, "status", status, "error", err)
+ "environmentId", envID, "environmentName", envName, "status", status, "error", err)
}
}(detachedCtx, environmentID, updated.Name)
}
@@ -738,7 +738,7 @@ func (h *EnvironmentHandler) triggerEnvironmentResourceSyncInternal(ctx context.
defer cancel()
if err := h.environmentService.SyncRegistriesToEnvironment(syncCtx, envID); err != nil {
slog.WarnContext(syncCtx, "Failed to sync registries to environment",
- "environmentID", envID,
+ "environmentId", envID,
"environmentName", envName,
"reason", syncReason,
"error", err.Error())
@@ -750,7 +750,7 @@ func (h *EnvironmentHandler) triggerEnvironmentResourceSyncInternal(ctx context.
defer cancel()
if err := h.environmentService.SyncS3DestinationsToEnvironment(syncCtx, envID); err != nil {
slog.WarnContext(syncCtx, "Failed to sync S3 destinations to environment",
- "environmentID", envID,
+ "environmentId", envID,
"environmentName", envName,
"reason", syncReason,
"error", err.Error())
@@ -762,7 +762,7 @@ func (h *EnvironmentHandler) triggerEnvironmentResourceSyncInternal(ctx context.
defer cancel()
if err := h.environmentService.SyncRepositoriesToEnvironment(syncCtx, envID); err != nil {
slog.WarnContext(syncCtx, "Failed to sync git repositories to environment",
- "environmentID", envID,
+ "environmentId", envID,
"environmentName", envName,
"reason", syncReason,
"error", err.Error())
@@ -788,7 +788,7 @@ func (h *EnvironmentHandler) PairEnvironment(ctx context.Context, input *PairEnv
env, err := h.environmentService.GetEnvironmentByID(ctx, *envID)
if err != nil {
- slog.ErrorContext(ctx, "Failed to get environment", "environmentID", *envID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to get environment", "environmentId", *envID, "error", err.Error())
return nil, huma.Error404NotFound("Environment not found")
}
@@ -801,11 +801,11 @@ func (h *EnvironmentHandler) PairEnvironment(ctx context.Context, input *PairEnv
}
_, err = h.environmentService.UpdateEnvironment(ctx, *envID, updates, nil, nil)
if err != nil {
- slog.ErrorContext(ctx, "Failed to update environment status", "environmentID", *envID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to update environment status", "environmentId", *envID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to complete pairing")
}
- slog.InfoContext(ctx, "Environment pairing completed", "environmentID", *envID, "environmentName", env.Name)
+ slog.InfoContext(ctx, "Environment pairing completed", "environmentId", *envID, "environmentName", env.Name)
h.triggerEnvironmentResourceSyncInternal(ctx, *envID, env.Name, "environment pairing")
return &handlerutil.Out[base.MessageResponse]{
@@ -847,7 +847,7 @@ func (h *EnvironmentHandler) GetDeploymentSnippets(ctx context.Context, input *G
snippets, err = h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), env.ApiUrl, *env.AccessToken)
}
if err != nil {
- slog.ErrorContext(ctx, "Failed to generate deployment snippets", "environmentID", input.ID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to generate deployment snippets", "environmentId", input.ID, "error", err.Error())
return nil, huma.Error500InternalServerError("Failed to generate deployment snippets")
}
@@ -953,7 +953,7 @@ func (h *EnvironmentHandler) GetEnvironmentVersion(ctx context.Context, input *G
// Update environment status to online since we successfully contacted it
if updateErr := h.environmentService.UpdateEnvironmentHeartbeat(ctx, input.ID); updateErr != nil {
- slog.WarnContext(ctx, "Failed to update environment heartbeat", "environment_id", input.ID, "error", updateErr)
+ slog.WarnContext(ctx, "Failed to update environment heartbeat", "environmentId", input.ID, "error", updateErr)
// Don't fail the request if heartbeat update fails
}
@@ -1033,18 +1033,18 @@ func (h *EnvironmentHandler) DownloadEnvironmentMTLSBundle(ctx context.Context,
entry, createErr := zipWriter.CreateHeader(header)
if createErr != nil {
- slog.ErrorContext(ctx, "Failed to create mTLS bundle entry", "environmentID", input.ID, "fileName", downloadName, "error", createErr.Error())
+ slog.ErrorContext(ctx, "Failed to create mTLS bundle entry", "environmentId", input.ID, "fileName", downloadName, "error", createErr.Error())
return nil, huma.Error500InternalServerError("Failed to build mTLS bundle")
}
if _, writeErr := entry.Write([]byte(file.Content)); writeErr != nil {
- slog.ErrorContext(ctx, "Failed to write mTLS bundle entry", "environmentID", input.ID, "fileName", downloadName, "error", writeErr.Error())
+ slog.ErrorContext(ctx, "Failed to write mTLS bundle entry", "environmentId", input.ID, "fileName", downloadName, "error", writeErr.Error())
return nil, huma.Error500InternalServerError("Failed to build mTLS bundle")
}
}
if closeErr := zipWriter.Close(); closeErr != nil {
- slog.ErrorContext(ctx, "Failed to finalize mTLS bundle", "environmentID", input.ID, "error", closeErr.Error())
+ slog.ErrorContext(ctx, "Failed to finalize mTLS bundle", "environmentId", input.ID, "error", closeErr.Error())
return nil, huma.Error500InternalServerError("Failed to build mTLS bundle")
}
@@ -1060,7 +1060,7 @@ func (h *EnvironmentHandler) DownloadEnvironmentMTLSBundle(ctx context.Context,
slog.WarnContext(
humaCtx.Context(),
"Failed to stream edge mTLS bundle download",
- "environmentID",
+ "environmentId",
input.ID,
"fileName",
fileName,
@@ -1104,7 +1104,7 @@ func (h *EnvironmentHandler) DownloadEnvironmentMTLSFile(ctx context.Context, in
slog.WarnContext(
humaCtx.Context(),
"Failed to stream edge mTLS asset download",
- "environmentID",
+ "environmentId",
input.ID,
"fileName",
file.Name,
@@ -1165,7 +1165,7 @@ func (h *EnvironmentHandler) loadEnvironmentMTLSFilesInternal(ctx context.Contex
AppURL: h.cfg.GetAppURL(),
})
if err != nil {
- slog.ErrorContext(ctx, "Failed to generate environment mTLS assets", "environmentID", environmentID, "error", err.Error())
+ slog.ErrorContext(ctx, "Failed to generate environment mTLS assets", "environmentId", environmentID, "error", err.Error())
return nil, nil, huma.Error500InternalServerError("Failed to generate environment mTLS assets")
}
diff --git a/backend/internal/environment/service.go b/backend/internal/environment/service.go
index d84870d3c..32b3e59bf 100644
--- a/backend/internal/environment/service.go
+++ b/backend/internal/environment/service.go
@@ -227,7 +227,7 @@ func (s *EnvironmentService) ResolveEnvironmentName(ctx context.Context, environ
env, err := s.GetEnvironmentByIDCached(ctx, environmentID)
if err != nil || env == nil {
if !errors.Is(err, context.Canceled) {
- slog.WarnContext(ctx, "failed to resolve environment name", "environmentID", environmentID, "error", err)
+ slog.WarnContext(ctx, "failed to resolve environment name", "environmentId", environmentID, "error", err)
}
return DisplayName(environmentID, "")
}
@@ -628,7 +628,7 @@ func (s *EnvironmentService) GetEnabledRegistryCredentials(ctx context.Context)
decryptedToken, err := crypto.Decrypt(reg.Token)
if err != nil {
- slog.WarnContext(ctx, "Failed to decrypt registry token", "registryURL", reg.URL, "error", err.Error())
+ slog.WarnContext(ctx, "Failed to decrypt registry token", "registryUrl", reg.URL, "error", err.Error())
continue
}
@@ -661,17 +661,17 @@ func (s *EnvironmentService) SyncResourcesToEnvironment(ctx context.Context, env
s.ForgetSyncState(environmentID)
if err := s.SyncRegistriesToEnvironment(ctx, environmentID); err != nil {
- slog.WarnContext(ctx, "Failed to sync registries", "environmentID", environmentID, "error", err.Error())
+ slog.WarnContext(ctx, "Failed to sync registries", "environmentId", environmentID, "error", err.Error())
failedGroups = append(failedGroups, "container registries")
}
if err := s.SyncS3DestinationsToEnvironment(ctx, environmentID); err != nil {
- slog.WarnContext(ctx, "Failed to sync S3 destinations", "environmentID", environmentID, "error", err.Error())
+ slog.WarnContext(ctx, "Failed to sync S3 destinations", "environmentId", environmentID, "error", err.Error())
failedGroups = append(failedGroups, "S3 destinations")
}
if err := s.SyncRepositoriesToEnvironment(ctx, environmentID); err != nil {
- slog.WarnContext(ctx, "Failed to sync git repositories", "environmentID", environmentID, "error", err.Error())
+ slog.WarnContext(ctx, "Failed to sync git repositories", "environmentId", environmentID, "error", err.Error())
failedGroups = append(failedGroups, "git repositories")
}
@@ -1110,11 +1110,11 @@ func (s *EnvironmentService) RunHealthChecksNow(ctx context.Context) error {
func (s *EnvironmentService) runHealthCheckInternal(ctx context.Context, envID string) (scheduler.Outcome, error) {
lease, admitted, err := s.jobs.TryAcquire(ctx, envID)
if err != nil {
- slog.ErrorContext(ctx, "environment health check admission failed", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "environment health check admission failed", "environmentId", envID, "error", err)
return scheduler.Outcome{}, err
}
if !admitted {
- slog.WarnContext(ctx, "environment health check skipped; previous run still in progress", "environment_id", envID)
+ slog.WarnContext(ctx, "environment health check skipped; previous run still in progress", "environmentId", envID)
return scheduler.Outcome{Status: scheduler.Skipped}, nil
}
defer lease.Release(ctx)
@@ -1130,7 +1130,7 @@ func (s *EnvironmentService) runHealthCheckInternal(ctx context.Context, envID s
status, err := s.TestConnection(ctx, envID, nil)
switch {
case err != nil:
- slog.WarnContext(ctx, "environment health check failed", "environment_id", envID, "status", status, "error", err)
+ slog.WarnContext(ctx, "environment health check failed", "environmentId", envID, "status", status, "error", err)
return scheduler.Outcome{Status: scheduler.Retrying}, err
case status != "online":
return scheduler.Outcome{Status: scheduler.Retrying, Message: "Environment is offline"}, errors.New("environment is offline")
@@ -1151,20 +1151,20 @@ func (s *EnvironmentService) runHealthCheckInternal(ctx context.Context, envID s
syncCtx, cancel := context.WithTimeout(ctx, environmentHealthCheckTimeout)
defer cancel()
if syncRegistriesToEnvironmentErr := s.SyncRegistriesToEnvironment(syncCtx, envID); syncRegistriesToEnvironmentErr != nil {
- slog.WarnContext(syncCtx, "failed to sync registries during health check", "environment_id", envID, "error", syncRegistriesToEnvironmentErr)
+ slog.WarnContext(syncCtx, "failed to sync registries during health check", "environmentId", envID, "error", syncRegistriesToEnvironmentErr)
syncErrors = append(syncErrors, syncRegistriesToEnvironmentErr)
}
if syncS3DestinationsToEnvironmentErr := s.SyncS3DestinationsToEnvironment(syncCtx, envID); syncS3DestinationsToEnvironmentErr != nil {
- slog.WarnContext(syncCtx, "failed to sync S3 destinations during health check", "environment_id", envID, "error", syncS3DestinationsToEnvironmentErr)
+ slog.WarnContext(syncCtx, "failed to sync S3 destinations during health check", "environmentId", envID, "error", syncS3DestinationsToEnvironmentErr)
syncErrors = append(syncErrors, syncS3DestinationsToEnvironmentErr)
}
if syncRepositoriesToEnvironmentErr := s.SyncRepositoriesToEnvironment(syncCtx, envID); syncRepositoriesToEnvironmentErr != nil {
- slog.WarnContext(syncCtx, "failed to sync git repositories during health check", "environment_id", envID, "error", syncRepositoriesToEnvironmentErr)
+ slog.WarnContext(syncCtx, "failed to sync git repositories during health check", "environmentId", envID, "error", syncRepositoriesToEnvironmentErr)
syncErrors = append(syncErrors, syncRepositoriesToEnvironmentErr)
}
if s.variableSyncer != nil {
if syncEnvironmentErr := s.variableSyncer.SyncEnvironment(syncCtx, envID); syncEnvironmentErr != nil {
- slog.WarnContext(syncCtx, "failed to sync global variables during health check", "environment_id", envID, "error", syncEnvironmentErr)
+ slog.WarnContext(syncCtx, "failed to sync global variables during health check", "environmentId", envID, "error", syncEnvironmentErr)
syncErrors = append(syncErrors, syncEnvironmentErr)
}
}
@@ -1217,7 +1217,7 @@ func (s *EnvironmentService) TestConnection(ctx context.Context, id string, cust
return status, err
}
if err != nil {
- slog.WarnContext(ctx, "Environment custom URL connection test failed", "environment_id", id, "error", err)
+ slog.WarnContext(ctx, "Environment custom URL connection test failed", "environmentId", id, "error", err)
return "error", common.ErrEnvironmentConnectionTestFailed
}
return status, nil
@@ -1236,10 +1236,10 @@ func (s *EnvironmentService) updateEnvironmentStatusInternal(ctx context.Context
// the pairing signal. Don't promote on offline/error ticks though, or a transient
// blip during initial setup would flip the env out of pending.
if currentEnv.IsEdge || status != string(EnvironmentStatusOnline) {
- slog.DebugContext(ctx, "skipping status update for pending environment", "environment_id", id)
+ slog.DebugContext(ctx, "skipping status update for pending environment", "environmentId", id)
return nil
}
- slog.InfoContext(ctx, "promoted pending direct environment to online via reachability check", "environment_id", id)
+ slog.InfoContext(ctx, "promoted pending direct environment to online via reachability check", "environmentId", id)
}
now := time.Now()
@@ -1408,7 +1408,7 @@ func (s *EnvironmentService) SyncRegistriesToRemoteEnvironments(ctx context.Cont
for _, env := range envs {
if env.AccessToken == nil || *env.AccessToken == "" {
slog.DebugContext(ctx, "Skipping registry sync for environment without access token",
- "environmentID", env.ID,
+ "environmentId", env.ID,
"environmentName", env.Name)
continue
}
@@ -1416,7 +1416,7 @@ func (s *EnvironmentService) SyncRegistriesToRemoteEnvironments(ctx context.Cont
if syncRegistriesToEnvironmentErr := s.SyncRegistriesToEnvironment(ctx, env.ID); syncRegistriesToEnvironmentErr != nil {
failedCount++
slog.WarnContext(ctx, "Failed to sync registries to remote environment",
- "environmentID", env.ID,
+ "environmentId", env.ID,
"environmentName", env.Name,
"error", syncRegistriesToEnvironmentErr.Error())
}
@@ -1439,12 +1439,12 @@ func (s *EnvironmentService) SyncS3DestinationsToRemoteEnvironments(ctx context.
var failedCount int
for _, env := range envs {
if env.AccessToken == nil || strings.TrimSpace(*env.AccessToken) == "" {
- slog.DebugContext(ctx, "Skipping S3 destination sync for environment without access token", "environmentID", env.ID, "environmentName", env.Name)
+ slog.DebugContext(ctx, "Skipping S3 destination sync for environment without access token", "environmentId", env.ID, "environmentName", env.Name)
continue
}
if syncS3DestinationsToEnvironmentErr := s.SyncS3DestinationsToEnvironment(ctx, env.ID); syncS3DestinationsToEnvironmentErr != nil {
failedCount++
- slog.WarnContext(ctx, "Failed to sync S3 destinations to remote environment", "environmentID", env.ID, "environmentName", env.Name, "error", syncS3DestinationsToEnvironmentErr)
+ slog.WarnContext(ctx, "Failed to sync S3 destinations to remote environment", "environmentId", env.ID, "environmentName", env.Name, "error", syncS3DestinationsToEnvironmentErr)
}
}
diff --git a/backend/internal/federated/service.go b/backend/internal/federated/service.go
index 7e1970995..a0c8a96b5 100644
--- a/backend/internal/federated/service.go
+++ b/backend/internal/federated/service.go
@@ -382,7 +382,7 @@ func (s *FederatedCredentialService) ExchangeToken(ctx context.Context, req fede
Model(&FederatedCredential{}).
Where("id = ? AND (last_used_at IS NULL OR last_used_at < ?)", credential.ID, cutoff).
Update("last_used_at", localNow).Error; updateLastUsedErr != nil {
- slog.WarnContext(bgCtx, "failed to update federated credential last_used_at", "credential_id", credential.ID, "error", updateLastUsedErr)
+ slog.WarnContext(bgCtx, "failed to update federated credential last_used_at", "credentialId", credential.ID, "error", updateLastUsedErr)
}
}()
@@ -566,7 +566,7 @@ func (s *FederatedCredentialService) logExchangeInternal(ctx context.Context, re
"issuer", issuer,
"subject", subject,
"audiences", audiences,
- "credential_id", credentialID,
+ "credentialId", credentialID,
)
if s.eventService == nil {
diff --git a/backend/internal/gitops/service.go b/backend/internal/gitops/service.go
index 58e34c3c7..62e549939 100644
--- a/backend/internal/gitops/service.go
+++ b/backend/internal/gitops/service.go
@@ -540,10 +540,10 @@ func (s *GitOpsSyncService) GetSyncByID(ctx context.Context, environmentID, id s
syncRecord, err := s.getSyncByIDInternal(ctx, environmentID, id, true)
if err != nil {
if errors.Is(err, common.ErrNotFound) {
- slog.WarnContext(ctx, "GitOps sync not found", "syncID", id, "environmentID", environmentID)
+ slog.WarnContext(ctx, "GitOps sync not found", "syncId", id, "environmentId", environmentID)
return nil, err
}
- slog.ErrorContext(ctx, "Failed to get GitOps sync", "syncID", id, "environmentID", environmentID, "error", err)
+ slog.ErrorContext(ctx, "Failed to get GitOps sync", "syncId", id, "environmentId", environmentID, "error", err)
return nil, err
}
return syncRecord, nil
@@ -572,7 +572,7 @@ func (s *GitOpsSyncService) getSyncRecordByIDInternal(ctx context.Context, envir
}
func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string, req gitops.CreateSyncRequest, actor user.Actor) (*projectpkg.GitOpsSync, error) {
- slog.InfoContext(ctx, "Creating GitOps sync", "environmentID", environmentID, "name", req.Name, "repositoryID", req.RepositoryID)
+ slog.InfoContext(ctx, "Creating GitOps sync", "environmentId", environmentID, "name", req.Name, "repositoryId", req.RepositoryID)
mode, err := normalizeSyncMode(req.Mode)
if err != nil {
@@ -587,10 +587,10 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
repo, err := s.repoService.GetRepositoryByID(ctx, req.RepositoryID)
if err != nil {
- slog.ErrorContext(ctx, "Repository not found for GitOps sync", "repositoryID", req.RepositoryID, "error", err)
+ slog.ErrorContext(ctx, "Repository not found for GitOps sync", "repositoryId", req.RepositoryID, "error", err)
return nil, fmt.Errorf("repository not found: %w", err)
}
- slog.InfoContext(ctx, "Found repository for GitOps sync", "repositoryID", req.RepositoryID, "repositoryName", repo.Name)
+ slog.InfoContext(ctx, "Found repository for GitOps sync", "repositoryId", req.RepositoryID, "repositoryName", repo.Name)
// Store the project name - use sync name if project name not provided
projectName := cmp.Or(req.ProjectName, req.Name)
@@ -665,7 +665,7 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
if err != nil {
return nil, err
}
- slog.InfoContext(ctx, "GitOps sync created successfully", "syncID", syncRecord.ID, "name", syncRecord.Name)
+ slog.InfoContext(ctx, "GitOps sync created successfully", "syncId", syncRecord.ID, "name", syncRecord.Name)
if adoptedProject != nil {
adoptedProject.GitOpsManagedBy = &syncRecord.ID
@@ -758,7 +758,7 @@ func (s *GitOpsSyncService) insertSyncRecordInternal(ctx context.Context, syncRe
if isUniqueViolation(err) {
return common.Classify(common.ErrConflict, errors.New("project already has a Git backup; disconnect it first"))
}
- slog.ErrorContext(ctx, "Failed to create GitOps sync in database", "name", req.Name, "repositoryID", req.RepositoryID, "environmentID", syncRecord.EnvironmentID, "error", err)
+ slog.ErrorContext(ctx, "Failed to create GitOps sync in database", "name", req.Name, "repositoryId", req.RepositoryID, "environmentId", syncRecord.EnvironmentID, "error", err)
return fmt.Errorf("failed to create sync: %w", err)
}
if adoptedProject == nil {
diff --git a/backend/internal/image/children/patch/service.go b/backend/internal/image/children/patch/service.go
index 9fb393e8c..767153be2 100644
--- a/backend/internal/image/children/patch/service.go
+++ b/backend/internal/image/children/patch/service.go
@@ -79,7 +79,7 @@ func NewService(
if os.Getenv("DOCKER_HOST") == "" && dockerService != nil {
if host := strings.TrimSpace(dockerService.DockerHost()); host != "" {
if err := os.Setenv("DOCKER_HOST", host); err != nil {
- slog.Warn("failed to set DOCKER_HOST for image patching", "error", err)
+ slog.WarnContext(context.Background(), "failed to set DOCKER_HOST for image patching", "error", err) //nolint:forbidigo // Service construction has no request context.
}
}
}
diff --git a/backend/internal/image/service.go b/backend/internal/image/service.go
index 6bc2cae95..353aa1e45 100644
--- a/backend/internal/image/service.go
+++ b/backend/internal/image/service.go
@@ -228,7 +228,7 @@ func (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, u
"force": force,
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImageDelete, id, imageName, user.ID, user.Username, "0", metadata); logErr != nil {
- slog.Warn("could not log image deletion action", "err", logErr, "image", imageName, "image_id", id)
+ slog.WarnContext(ctx, "could not log image deletion action", "err", logErr, "image", imageName, "imageId", id)
}
return nil
@@ -285,7 +285,7 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progress
_ = logWriter.Close()
if streamErr != nil {
if errors.Is(streamErr, context.Canceled) || strings.Contains(streamErr.Error(), "context canceled") {
- slog.Debug("image pull stream canceled", "image", imageName, "err", streamErr)
+ slog.DebugContext(ctx, "image pull stream canceled", "image", imageName, "err", streamErr)
s.eventService.LogErrorEvent(ctx, event.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", streamErr, database.JSON{"action": "pull", "step": "canceled"})
return fmt.Errorf("image pull stream canceled for %s: %w", imageName, streamErr)
}
@@ -293,14 +293,14 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progress
return fmt.Errorf("error reading image pull stream for %s: %w", imageName, streamErr)
}
- slog.Debug("image pull stream completed", "image", imageName)
+ slog.DebugContext(ctx, "image pull stream completed", "image", imageName)
metadata := database.JSON{
"action": "pull",
"imageName": imageName,
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImagePull, "", imageName, user.ID, user.Username, "0", metadata); logErr != nil {
- slog.Warn("could not log image pull action", "err", logErr, "image", imageName)
+ slog.WarnContext(ctx, "could not log image pull action", "err", logErr, "image", imageName)
}
if s.registryService != nil {
if recordImagePullErr := s.registryService.RecordImagePull(ctx, imageName); recordImagePullErr != nil {
@@ -370,7 +370,7 @@ func (s *ImageService) TagImage(ctx context.Context, source string, req imagetyp
"target": target,
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImageTag, "", source, user.ID, user.Username, "0", metadata); logErr != nil {
- slog.Warn("could not log image tag action", "err", logErr, "image", source, "target", target)
+ slog.WarnContext(ctx, "could not log image tag action", "err", logErr, "image", source, "target", target)
}
return nil
@@ -507,7 +507,7 @@ func (s *ImageService) LoadImageFromReader(ctx context.Context, reader io.Reader
"fileName": fileName,
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImageLoad, "", fileName, user.ID, user.Username, "0", metadata); logErr != nil {
- slog.Warn("could not log image load action", "err", logErr, "file", fileName)
+ slog.WarnContext(ctx, "could not log image load action", "err", logErr, "file", fileName)
}
return &result, nil
@@ -640,7 +640,7 @@ func (s *ImageService) PruneImages(ctx context.Context, options system.PruneImag
"spaceReclaimed": pruneReport.SpaceReclaimed,
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImageDelete, "", "bulk_prune", usertypes.SystemUser.ID, usertypes.SystemUser.Username, "0", metadata); logErr != nil {
- slog.Warn("could not log image prune action", "err", logErr)
+ slog.WarnContext(ctx, "could not log image prune action", "err", logErr)
}
return &pruneReport, nil
diff --git a/backend/internal/imageupdate/service.go b/backend/internal/imageupdate/service.go
index c7c4faffa..db7fe6853 100644
--- a/backend/internal/imageupdate/service.go
+++ b/backend/internal/imageupdate/service.go
@@ -915,7 +915,7 @@ func (s *ImageUpdateService) CheckImageUpdateByID(ctx context.Context, imageID s
"error": err.Error(),
}
if logErr := s.eventService.LogImageEvent(ctx, event.EventTypeImageScan, imageID, "", user.SystemUser.ID, user.SystemUser.Username, "0", metadata); logErr != nil {
- slog.WarnContext(ctx, "Failed to log image update check by ID error event", "imageID", imageID, "error", logErr.Error())
+ slog.WarnContext(ctx, "Failed to log image update check by ID error event", "imageId", imageID, "error", logErr.Error())
}
return nil, fmt.Errorf("failed to get image reference: %w", err)
}
@@ -925,7 +925,7 @@ func (s *ImageUpdateService) CheckImageUpdateByID(ctx context.Context, imageID s
}
if len(result.ContainerUpdates) == 0 {
if saveErr := s.saveUpdateResultByIDInternal(ctx, imageID, result, s.parseImageReference(imageRef)); saveErr != nil {
- slog.WarnContext(ctx, "Failed to save update result by ID", "imageID", imageID, "error", saveErr.Error())
+ slog.WarnContext(ctx, "Failed to save update result by ID", "imageId", imageID, "error", saveErr.Error())
}
}
return result, nil
@@ -949,7 +949,7 @@ func (s *ImageUpdateService) saveUpdateResultWithSnapshotInternal(ctx context.Co
"error", err.Error(),
"repository", repository,
"tag", parts.Tag,
- "syntheticID", syntheticID)
+ "syntheticId", syntheticID)
// Persist registry results even when the local image no longer exists. This keeps
// project/image update status available for pruned images using a ref-scoped record.
return s.savePreparedUpdateResultInternal(ctx, syntheticID, repository, parts.Tag, result)
@@ -1100,8 +1100,8 @@ func savePreparedUpdateResultWithTxInternal(tx *gorm.DB, imageID, repo, tag stri
strings.TrimSpace(result.Error) != "" &&
registry.IsRateLimitErrorString(result.Error) &&
strings.TrimSpace(mo.PointerToOption(existingRecord.LastError).OrEmpty()) == "" {
- slog.Debug("Preserving previous image update result; check hit a registry rate limit",
- "imageID", imageID, "repository", repo, "tag", tag, "error", result.Error)
+ slog.DebugContext(tx.Statement.Context, "Preserving previous image update result; check hit a registry rate limit",
+ "imageId", imageID, "repository", repo, "tag", tag, "error", result.Error)
return nil
}
@@ -1487,7 +1487,7 @@ func (s *ImageUpdateService) resolveBatchCredentialsInternal(ctx context.Context
token, decryptErr := crypto.Decrypt(reg.Token)
if decryptErr != nil {
- slog.DebugContext(ctx, "failed to decrypt registry token for batch check", "registryURL", reg.URL, "error", decryptErr.Error())
+ slog.DebugContext(ctx, "failed to decrypt registry token for batch check", "registryUrl", reg.URL, "error", decryptErr.Error())
continue
}
token = strings.TrimSpace(token)
diff --git a/backend/internal/middleware/cors.go b/backend/internal/middleware/cors.go
index f25a12f8c..40844d81a 100644
--- a/backend/internal/middleware/cors.go
+++ b/backend/internal/middleware/cors.go
@@ -1,6 +1,7 @@
package middleware
import (
+ "context"
"log/slog"
"net/url"
"strings"
@@ -61,6 +62,7 @@ func (m *CORSMiddleware) Add() echo.MiddlewareFunc {
}
func deriveAllowedOriginsInternal(cfg *config.Config, custom []string) []string {
+ ctx := context.Background() //nolint:forbidigo // Middleware configuration is derived at startup without a request context.
if len(custom) > 0 {
return kit.Unique(custom)
}
@@ -75,7 +77,7 @@ func deriveAllowedOriginsInternal(cfg *config.Config, custom []string) []string
if u, err := url.Parse(appURL); err == nil {
origins = append(origins, u.Scheme+"://"+u.Host)
} else {
- slog.Warn("Failed to parse APP_URL for CORS origins", "url", appURL, "error", err)
+ slog.WarnContext(ctx, "Failed to parse APP_URL for CORS origins", "url", appURL, "error", err)
}
}
}
@@ -91,7 +93,7 @@ func deriveAllowedOriginsInternal(cfg *config.Config, custom []string) []string
if len(origins) == 0 {
if cfg != nil && cfg.Environment == "production" {
- slog.Warn("CORS: No origins specified for production - defaulting to https://localhost")
+ slog.WarnContext(ctx, "CORS: No origins specified for production - defaulting to https://localhost")
return []string{"https://localhost"}
}
return []string{"http://localhost:3000"}
diff --git a/backend/internal/middleware/csrf.go b/backend/internal/middleware/csrf.go
index b73ab8ec6..75e598337 100644
--- a/backend/internal/middleware/csrf.go
+++ b/backend/internal/middleware/csrf.go
@@ -1,6 +1,7 @@
package middleware
import (
+ "context"
"log/slog"
"net/http"
"strings"
@@ -51,7 +52,8 @@ func (m *CSRFMiddleware) Add() echo.MiddlewareFunc {
// AddTrustedOrigin expects scheme://host[:port]; deriveAllowedOriginsInternal
// already produces that form (shared with CORS). Skip anything malformed.
if err := cop.AddTrustedOrigin(origin); err != nil {
- slog.Warn("CSRF: ignoring invalid trusted origin", "origin", origin, "error", err)
+ slog.WarnContext(context.Background(), "CSRF: ignoring invalid trusted origin", //nolint:forbidigo // Middleware configuration is derived at startup without a request context.
+ "origin", origin, "error", err)
}
}
for _, pattern := range publicCrossOriginBypassPaths {
@@ -69,7 +71,7 @@ func (m *CSRFMiddleware) Add() echo.MiddlewareFunc {
"path", req.URL.Path,
"method", req.Method,
"origin", req.Header.Get("Origin"),
- "sec_fetch_site", req.Header.Get("Sec-Fetch-Site"),
+ "secFetchSite", req.Header.Get("Sec-Fetch-Site"),
)
return c.JSON(http.StatusForbidden, common.APIError{
Code: common.APIErrorCodeForbidden,
diff --git a/backend/internal/middleware/environment.go b/backend/internal/middleware/environment.go
index cc349aa73..b7b200a94 100644
--- a/backend/internal/middleware/environment.go
+++ b/backend/internal/middleware/environment.go
@@ -186,7 +186,7 @@ func (m *EnvironmentMiddleware) Handle(c *echo.Context, next echo.HandlerFunc) e
return proxyRecoveredEdgeTunnelErr
}
- slog.WarnContext(c.Request().Context(), "No active edge tunnel for environment", "environment_id", envID)
+ slog.WarnContext(c.Request().Context(), "No active edge tunnel for environment", "environmentId", envID)
return m.abortEdgeTunnelUnavailable(c)
}
@@ -258,7 +258,7 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c *echo.Context, ps *authz
perm, known := authz.UploadKindPermission(kind)
if !known || !ps.Allows(perm, envID) {
slog.DebugContext(c.Request().Context(), "Denying proxied upload session request: permission denied",
- "method", method, "path", suffix, "kind", kind, "environment_id", envID)
+ "method", method, "path", suffix, "kind", kind, "environmentId", envID)
return true
}
return false
@@ -266,7 +266,7 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c *echo.Context, ps *authz
perm, ok := m.matcher.Lookup(method, suffix).Get()
if !ok {
slog.WarnContext(c.Request().Context(), "Denying proxied request with no known permission mapping",
- "method", method, "path", suffix, "environment_id", envID)
+ "method", method, "path", suffix, "environmentId", envID)
return true
}
if perm == "" {
@@ -278,7 +278,7 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c *echo.Context, ps *authz
scopeEnvID := kit.Ternary(authz.IsEnvScoped(perm), envID, "")
if !ps.Allows(perm, scopeEnvID) {
slog.DebugContext(c.Request().Context(), "Denying proxied request: permission denied",
- "method", method, "path", suffix, "permission", perm, "environment_id", envID)
+ "method", method, "path", suffix, "permission", perm, "environmentId", envID)
return true
}
var required []string
@@ -290,14 +290,14 @@ func (m *EnvironmentMiddleware) proxyPermissionDenied(c *echo.Context, ps *authz
}
if err != nil {
slog.DebugContext(c.Request().Context(), "Denying proxied request with invalid body",
- "path", suffix, "environment_id", envID, "error", err)
+ "path", suffix, "environmentId", envID, "error", err)
return true
}
required = withContainerResourceSortPermissionsInternal(required, c.Request(), method, suffix)
for _, operationPermission := range required {
if !ps.Allows(operationPermission, envID) {
slog.DebugContext(c.Request().Context(), "Denying proxied request: body-derived permission denied",
- "path", suffix, "permission", operationPermission, "environment_id", envID)
+ "path", suffix, "permission", operationPermission, "environmentId", envID)
return true
}
}
@@ -479,7 +479,7 @@ func (m *EnvironmentMiddleware) proxyActiveEdgeTunnelInternal(c *echo.Context, e
return false, nil
}
- slog.DebugContext(c.Request().Context(), "Routing request through edge tunnel", "environment_id", envID, "path", c.Request().URL.Path)
+ slog.DebugContext(c.Request().Context(), "Routing request through edge tunnel", "environmentId", envID, "path", c.Request().URL.Path)
m.setProxyContextHeadersInternal(c, accessToken)
return true, m.proxyThroughTunnelInternal(c, tunnel, envID)
}
@@ -492,7 +492,7 @@ func (m *EnvironmentMiddleware) proxyRecoveredEdgeTunnelInternal(c *echo.Context
return false, nil
}
- slog.InfoContext(c.Request().Context(), "Recovered edge tunnel during request", "environment_id", envID)
+ slog.InfoContext(c.Request().Context(), "Recovered edge tunnel during request", "environmentId", envID)
m.setProxyContextHeadersInternal(c, accessToken)
return true, m.proxyThroughTunnelInternal(c, tunnel, envID)
}
@@ -687,7 +687,7 @@ func (m *EnvironmentMiddleware) abortEdgeTunnelUnavailable(c *echo.Context) erro
// proxyWebSocket handles WebSocket proxy requests.
func (m *EnvironmentMiddleware) proxyWebSocket(c *echo.Context, target string, accessToken *string, envID string) error {
if isEdgeEnvironmentURLInternal(target) {
- slog.WarnContext(c.Request().Context(), "Refusing direct websocket proxy to edge environment without active tunnel", "environment_id", envID, "target", target)
+ slog.WarnContext(c.Request().Context(), "Refusing direct websocket proxy to edge environment without active tunnel", "environmentId", envID, "target", target)
return m.abortEdgeTunnelUnavailable(c)
}
@@ -695,7 +695,7 @@ func (m *EnvironmentMiddleware) proxyWebSocket(c *echo.Context, target string, a
headers := edge.BuildWebSocketHeaders(c, accessToken)
if err := ws.ProxyHTTP(c.Response(), c.Request(), wsTarget, headers, m.checkOrigin); err != nil {
- slog.Error("websocket proxy failed", "err", err)
+ slog.ErrorContext(c.Request().Context(), "websocket proxy failed", "err", err)
}
return nil
}
diff --git a/backend/internal/notification/service.go b/backend/internal/notification/service.go
index 70435ea2b..4f137db25 100644
--- a/backend/internal/notification/service.go
+++ b/backend/internal/notification/service.go
@@ -94,8 +94,8 @@ type NotificationTarget struct {
func logManagerDispatchNotificationInternal(ctx context.Context, target NotificationTarget, kind notification.DispatchKind) {
slog.InfoContext(ctx,
"Manager dispatching notification on behalf of agent",
- "environment_id", target.EnvironmentID,
- "environment_name", target.EnvironmentName,
+ "environmentId", target.EnvironmentID,
+ "environmentName", target.EnvironmentName,
"kind", string(kind),
)
}
diff --git a/backend/internal/notification/service_test.go b/backend/internal/notification/service_test.go
index 374a9da21..a6326c369 100644
--- a/backend/internal/notification/service_test.go
+++ b/backend/internal/notification/service_test.go
@@ -206,8 +206,8 @@ func TestNotificationService_DispatchNotification_LogsManagerDispatchForAgent(t
require.Equal(t, 0, dispatchResponse.Delivered)
logs := logBuffer.String()
require.Contains(t, logs, "Manager dispatching notification on behalf of agent")
- require.Contains(t, logs, "environment_id=env-remote")
- require.Contains(t, logs, "environment_name=\"Remote Edge\"")
+ require.Contains(t, logs, "environmentId=env-remote")
+ require.Contains(t, logs, "environmentName=\"Remote Edge\"")
require.Contains(t, logs, "kind=image_update")
}
diff --git a/backend/internal/oidc/handler.go b/backend/internal/oidc/handler.go
index af6876992..cc408a5c7 100644
--- a/backend/internal/oidc/handler.go
+++ b/backend/internal/oidc/handler.go
@@ -222,7 +222,7 @@ func (h *OidcHandler) HandleOidcCallback(ctx context.Context, input *HandleOidcC
// Process OIDC callback
userInfo, tokenResp, err := h.oidcService.HandleCallback(ctx, input.Body.Code, input.Body.State, input.OidcStateCookie, origin, mobileRedirectURI)
if err != nil {
- slog.WarnContext(ctx, "OIDC callback failed", "error", err, "origin", origin, "state_present", input.Body.State != "", "code_present", input.Body.Code != "")
+ slog.WarnContext(ctx, "OIDC callback failed", "error", err, "origin", origin, "statePresent", input.Body.State != "", "codePresent", input.Body.Code != "")
return nil, huma.Error400BadRequest("OIDC callback failed: " + err.Error())
}
diff --git a/backend/internal/oidc/service.go b/backend/internal/oidc/service.go
index 8a9df0b5c..bd147d5ab 100644
--- a/backend/internal/oidc/service.go
+++ b/backend/internal/oidc/service.go
@@ -223,7 +223,7 @@ func (s *OidcService) ValidateMobileRedirectURI(ctx context.Context, uri string)
func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo, origin, mobileRedirectURI string) (string, string, error) {
oidcConfig, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
- slog.Error("GenerateAuthURL: failed to get OIDC config", "error", err)
+ slog.ErrorContext(ctx, "GenerateAuthURL: failed to get OIDC config", "error", err)
return "", "", err
}
@@ -232,7 +232,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo, origin, m
var discoverProviderErr error
provider, discoverProviderErr = s.getOrDiscoverProviderInternal(ctx, oidcConfig)
if discoverProviderErr != nil {
- slog.Error("GenerateAuthURL: provider discovery failed", "issuer", oidcConfig.IssuerURL, "error", discoverProviderErr)
+ slog.ErrorContext(ctx, "GenerateAuthURL: provider discovery failed", "issuer", oidcConfig.IssuerURL, "error", discoverProviderErr)
return "", "", fmt.Errorf("failed to discover provider: %w", discoverProviderErr)
}
}
@@ -243,7 +243,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo, origin, m
oauth2Config, err := s.getOauth2ConfigInternal(oidcConfig, provider, origin, mobileRedirectURI)
if err != nil {
- slog.Error("GenerateAuthURL: invalid OIDC endpoints", "error", err)
+ slog.ErrorContext(ctx, "GenerateAuthURL: invalid OIDC endpoints", "error", err)
return "", "", err
}
@@ -262,12 +262,12 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo, origin, m
stateJSON, err := json.Marshal(stateData)
if err != nil {
- slog.Error("GenerateAuthURL: failed to marshal state", "error", err)
+ slog.ErrorContext(ctx, "GenerateAuthURL: failed to marshal state", "error", err)
return "", "", fmt.Errorf("failed to encode state: %w", err)
}
encodedState := base64.URLEncoding.EncodeToString(stateJSON)
- slog.Debug("GenerateAuthURL: generated authorization URL", "issuer", oidcConfig.IssuerURL, "scopes", oauth2Config.Scopes)
+ slog.DebugContext(ctx, "GenerateAuthURL: generated authorization URL", "issuer", oidcConfig.IssuerURL, "scopes", oauth2Config.Scopes)
return authURL, encodedState, nil
}
@@ -339,11 +339,11 @@ func (s *OidcService) exchangeTokenInternal(ctx context.Context, cfg *settings.O
providerCtx := oidc.ClientContext(ctx, s.getHttpClientInternal(cfg.SkipTlsVerify))
token, err := oauth2Config.Exchange(providerCtx, code, oauth2.VerifierOption(verifier))
if err != nil {
- slog.Error("exchangeTokenInternal: token exchange failed", "token_endpoint", oauth2Config.Endpoint.TokenURL, "error", err)
+ slog.ErrorContext(ctx, "exchangeTokenInternal: token exchange failed", "tokenEndpoint", oauth2Config.Endpoint.TokenURL, "error", err)
return nil, fmt.Errorf("failed to exchange authorization code: %w", err)
}
- slog.Debug("exchangeTokenInternal: token exchange successful", "has_access_token", token.AccessToken != "", "has_refresh_token", token.RefreshToken != "")
+ slog.DebugContext(ctx, "exchangeTokenInternal: token exchange successful", "hasAccessToken", token.AccessToken != "", "hasRefreshToken", token.RefreshToken != "")
return token, nil
}
@@ -353,9 +353,9 @@ func (s *OidcService) fetchClaimsInternal(ctx context.Context, cfg *settings.Oid
if idToken != nil {
if err := idToken.Claims(&claims); err != nil {
- slog.Warn("fetchClaimsInternal: failed to extract claims from ID token", "error", err)
+ slog.WarnContext(ctx, "fetchClaimsInternal: failed to extract claims from ID token", "error", err)
} else {
- slog.Debug("fetchClaimsInternal: extracted claims from ID token")
+ slog.DebugContext(ctx, "fetchClaimsInternal: extracted claims from ID token")
}
}
@@ -364,31 +364,31 @@ func (s *OidcService) fetchClaimsInternal(ctx context.Context, cfg *settings.Oid
case provider != nil:
userInfo, err := provider.UserInfo(providerCtx, oauth2.StaticTokenSource(token))
if err != nil {
- slog.Debug("fetchClaimsInternal: userinfo endpoint call failed", "error", err)
+ slog.DebugContext(ctx, "fetchClaimsInternal: userinfo endpoint call failed", "error", err)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to fetch userinfo: %w", err)
}
if claimsErr := userInfo.Claims(&userInfoClaims); claimsErr != nil {
- slog.Warn("fetchClaimsInternal: failed to decode userinfo claims", "error", claimsErr)
+ slog.WarnContext(ctx, "fetchClaimsInternal: failed to decode userinfo claims", "error", claimsErr)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to decode userinfo claims: %w", claimsErr)
}
- slog.Debug("fetchClaimsInternal: fetched userinfo claims successfully")
+ slog.DebugContext(ctx, "fetchClaimsInternal: fetched userinfo claims successfully")
case cfg.UserinfoEndpoint != "":
manualClaims, err := s.fetchUserInfoClaimsInternal(providerCtx, cfg, token)
if err != nil {
- slog.Debug("fetchClaimsInternal: userinfo endpoint call failed", "error", err)
+ slog.DebugContext(ctx, "fetchClaimsInternal: userinfo endpoint call failed", "error", err)
if claims != nil {
return claims, nil
}
return nil, fmt.Errorf("failed to fetch userinfo: %w", err)
}
userInfoClaims = manualClaims
- slog.Debug("fetchClaimsInternal: fetched userinfo claims successfully")
+ slog.DebugContext(ctx, "fetchClaimsInternal: fetched userinfo claims successfully")
case claims != nil:
return claims, nil
default:
@@ -444,16 +444,16 @@ func (s *OidcService) fetchUserInfoClaimsInternal(ctx context.Context, cfg *sett
}
func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedState, origin, mobileRedirectURI string) (*authtypes.OidcUserInfo, *authtypes.OidcTokenResponse, error) {
- slog.Debug("HandleCallback: processing callback", "code_present", code != "", "state_present", state != "")
+ slog.DebugContext(ctx, "HandleCallback: processing callback", "codePresent", code != "", "statePresent", state != "")
- stateData, err := s.validateStateInternal(state, storedState)
+ stateData, err := s.validateStateInternal(ctx, state, storedState)
if err != nil {
return nil, nil, err
}
cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
- slog.Error("HandleCallback: failed to get OIDC config", "error", err)
+ slog.ErrorContext(ctx, "HandleCallback: failed to get OIDC config", "error", err)
return nil, nil, err
}
@@ -478,20 +478,20 @@ func (s *OidcService) HandleCallback(ctx context.Context, code, state, storedSta
return s.buildUserInfoInternal(ctx, provider, cfg, token, idToken, rawIDToken)
}
-func (s *OidcService) validateStateInternal(state, storedState string) (*OidcState, error) {
- stateData, err := s.decodeStateInternal(storedState)
+func (s *OidcService) validateStateInternal(ctx context.Context, state, storedState string) (*OidcState, error) {
+ stateData, err := s.decodeStateInternal(ctx, storedState)
if err != nil {
- slog.Error("HandleCallback: failed to decode stored state", "error", err)
+ slog.ErrorContext(ctx, "HandleCallback: failed to decode stored state", "error", err)
return nil, fmt.Errorf("invalid state parameter: %w", err)
}
if state != stateData.State {
- slog.Error("HandleCallback: state mismatch", "received_len", len(state), "expected_len", len(stateData.State))
+ slog.ErrorContext(ctx, "HandleCallback: state mismatch", "receivedLen", len(state), "expectedLen", len(stateData.State))
return nil, errors.New("state parameter mismatch")
}
if time.Since(stateData.CreatedAt) > 10*time.Minute {
- slog.Error("HandleCallback: state expired", "age", time.Since(stateData.CreatedAt))
+ slog.ErrorContext(ctx, "HandleCallback: state expired", "age", time.Since(stateData.CreatedAt))
return nil, errors.New("authentication state has expired")
}
return stateData, nil
@@ -506,7 +506,7 @@ func (s *OidcService) verifyIDTokenInternal(ctx context.Context, provider *oidc.
}
if rawIDToken == "" {
- slog.Warn("HandleCallback: no ID token in response (non-compliant OIDC response)")
+ slog.WarnContext(ctx, "HandleCallback: no ID token in response (non-compliant OIDC response)")
return nil, "", nil
}
@@ -541,7 +541,7 @@ func (s *OidcService) verifyIDTokenInternal(ctx context.Context, provider *oidc.
idToken, err := verifier.Verify(providerCtx, rawIDToken)
if err != nil {
- slog.Error("HandleCallback: ID token verification failed", "error", err)
+ slog.ErrorContext(ctx, "HandleCallback: ID token verification failed", "error", err)
return nil, "", fmt.Errorf("failed to verify ID token: %w", err)
}
@@ -550,16 +550,16 @@ func (s *OidcService) verifyIDTokenInternal(ctx context.Context, provider *oidc.
Nonce string `json:"nonce"`
}
if claimsErr := idToken.Claims(&claims); claimsErr != nil {
- slog.Error("HandleCallback: failed to extract nonce from ID token", "error", claimsErr)
+ slog.ErrorContext(ctx, "HandleCallback: failed to extract nonce from ID token", "error", claimsErr)
return nil, "", fmt.Errorf("failed to verify nonce: %w", claimsErr)
}
if claims.Nonce != nonce {
- slog.Error("HandleCallback: nonce mismatch", "expected", nonce, "got", claims.Nonce)
+ slog.ErrorContext(ctx, "HandleCallback: nonce mismatch", "expected", nonce, "got", claims.Nonce)
return nil, "", errors.New("nonce verification failed")
}
}
- slog.Debug("HandleCallback: ID token verified successfully", "subject", idToken.Subject, "issuer", idToken.Issuer)
+ slog.DebugContext(ctx, "HandleCallback: ID token verified successfully", "subject", idToken.Subject, "issuer", idToken.Issuer)
return idToken, rawIDToken, nil
}
@@ -579,13 +579,13 @@ func (
) {
claims, err := s.fetchClaimsInternal(ctx, cfg, provider, token, idToken)
if err != nil {
- slog.Error("HandleCallback: failed to fetch claims", "error", err)
+ slog.ErrorContext(ctx, "HandleCallback: failed to fetch claims", "error", err)
return nil, nil, fmt.Errorf("failed to fetch user claims: %w", err)
}
subject := jwtclaims.GetStringClaim(claims, "sub")
if subject == "" {
- slog.Error("HandleCallback: missing required 'sub' claim")
+ slog.ErrorContext(ctx, "HandleCallback: missing required 'sub' claim")
return nil, nil, errors.New("missing required 'sub' claim in user info")
}
@@ -616,20 +616,20 @@ func (
tokenResp.ExpiresIn = expiresIn
}
- slog.Info("HandleCallback: authentication successful", "subject", userInfoDto.Subject, "email", userInfoDto.Email)
+ slog.InfoContext(ctx, "HandleCallback: authentication successful", "subject", userInfoDto.Subject, "email", userInfoDto.Email)
return &userInfoDto, tokenResp, nil
}
-func (s *OidcService) decodeStateInternal(encodedState string) (*OidcState, error) {
+func (s *OidcService) decodeStateInternal(ctx context.Context, encodedState string) (*OidcState, error) {
stateJSON, err := base64.URLEncoding.DecodeString(encodedState)
if err != nil {
- slog.Error("decodeStateInternal: failed to decode base64 state", "error", err)
+ slog.ErrorContext(ctx, "decodeStateInternal: failed to decode base64 state", "error", err)
return nil, err
}
var stateData OidcState
if unmarshalErr := json.Unmarshal(stateJSON, &stateData); unmarshalErr != nil {
- slog.Error("decodeStateInternal: failed to unmarshal state JSON", "error", unmarshalErr)
+ slog.ErrorContext(ctx, "decodeStateInternal: failed to unmarshal state JSON", "error", unmarshalErr)
return nil, unmarshalErr
}
@@ -640,13 +640,13 @@ func (s *OidcService) decodeStateInternal(encodedState string) (*OidcState, erro
func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*authtypes.OidcDeviceAuthResponse, error) {
cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
- slog.Error("InitiateDeviceAuth: failed to get OIDC config", "error", err)
+ slog.ErrorContext(ctx, "InitiateDeviceAuth: failed to get OIDC config", "error", err)
return nil, err
}
deviceEndpoint, err := s.getDeviceAuthorizationEndpointInternal(ctx, cfg)
if err != nil {
- slog.Error("InitiateDeviceAuth: failed to get device endpoint", "error", err)
+ slog.ErrorContext(ctx, "InitiateDeviceAuth: failed to get device endpoint", "error", err)
return nil, err
}
@@ -701,7 +701,7 @@ func (s *OidcService) InitiateDeviceAuth(ctx context.Context) (*authtypes.OidcDe
response.Interval = 5
}
- slog.Debug("InitiateDeviceAuth: device authorization initiated", "user_code", response.UserCode, "expires_in", response.ExpiresIn)
+ slog.DebugContext(ctx, "InitiateDeviceAuth: device authorization initiated", "userCode", response.UserCode, "expiresIn", response.ExpiresIn)
return response, nil
}
@@ -744,7 +744,7 @@ func (s *OidcService) makeDeviceAuthRequestInternal(ctx context.Context, endpoin
client := s.getHttpClientInternal(skipTls)
resp, err := client.Do(req)
if err != nil {
- slog.Error("makeDeviceAuthRequestInternal: request failed", "error", err)
+ slog.ErrorContext(ctx, "makeDeviceAuthRequestInternal: request failed", "error", err)
return nil, fmt.Errorf("device authorization request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
@@ -771,7 +771,7 @@ func (s *OidcService) makeDeviceAuthRequestInternal(ctx context.Context, endpoin
func (s *OidcService) ExchangeDeviceToken(ctx context.Context, deviceCode string) (*authtypes.OidcUserInfo, *authtypes.OidcTokenResponse, error) {
cfg, err := s.getEffectiveConfigInternal(ctx)
if err != nil {
- slog.Error("ExchangeDeviceToken: failed to get OIDC config", "error", err)
+ slog.ErrorContext(ctx, "ExchangeDeviceToken: failed to get OIDC config", "error", err)
return nil, nil, err
}
@@ -853,7 +853,7 @@ func (s *OidcService) makeTokenRequestInternal(ctx context.Context, endpoint str
client := s.getHttpClientInternal(skipTls)
resp, err := client.Do(req)
if err != nil {
- slog.Error("makeTokenRequestInternal: request failed", "error", err)
+ slog.ErrorContext(ctx, "makeTokenRequestInternal: request failed", "error", err)
return nil, fmt.Errorf("token request failed: %w", err)
}
defer func() { _ = resp.Body.Close() }()
diff --git a/backend/internal/playwright/service.go b/backend/internal/playwright/service.go
index f7c978f14..216eef706 100644
--- a/backend/internal/playwright/service.go
+++ b/backend/internal/playwright/service.go
@@ -48,7 +48,7 @@ func NewPlaywrightService(
}
func (ps *PlaywrightService) CreateTestApiKeys(ctx context.Context, count int) ([]*apikeytypes.ApiKeyCreatedDto, error) {
- slog.Info("Playwright: Creating test API keys", "count", count)
+ slog.InfoContext(ctx, "Playwright: Creating test API keys", "count", count)
// Get the arcane user to associate the API keys with
localUser, err := ps.userService.GetUserByUsername(ctx, "arcane")
@@ -82,12 +82,12 @@ func (ps *PlaywrightService) CreateTestApiKeys(ctx context.Context, count int) (
createdKeys = append(createdKeys, apiKey)
}
- slog.Info("Playwright: Test API keys created successfully", "count", len(createdKeys))
+ slog.InfoContext(ctx, "Playwright: Test API keys created successfully", "count", len(createdKeys))
return createdKeys, nil
}
func (ps *PlaywrightService) DeleteAllTestApiKeys(ctx context.Context) error {
- slog.Info("Playwright: Deleting all test API keys")
+ slog.InfoContext(ctx, "Playwright: Deleting all test API keys")
// Get all API keys with test prefix
params := pagination.QueryParams{
@@ -103,11 +103,11 @@ func (ps *PlaywrightService) DeleteAllTestApiKeys(ctx context.Context) error {
for _, apiKey := range apiKeys {
if deleteApiKeyErr := ps.apiKeyService.DeleteApiKey(ctx, apiKey.ID); deleteApiKeyErr != nil {
- slog.Warn("Failed to delete test API key", "id", apiKey.ID, "error", deleteApiKeyErr)
+ slog.WarnContext(ctx, "Failed to delete test API key", "id", apiKey.ID, "error", deleteApiKeyErr)
}
}
- slog.Info("Playwright: Test API keys deleted", "count", len(apiKeys))
+ slog.InfoContext(ctx, "Playwright: Test API keys deleted", "count", len(apiKeys))
return nil
}
diff --git a/backend/internal/project/children/details/service.go b/backend/internal/project/children/details/service.go
index 0f0dbbe03..b99cc6b4b 100644
--- a/backend/internal/project/children/details/service.go
+++ b/backend/internal/project/children/details/service.go
@@ -101,7 +101,7 @@ func (s *Service) ComposeServices(
containers, err := projects.ComposePs(ctx, s.dockerService.DockerHost(), composeProject, nil, true)
if err != nil {
- slog.Error("compose ps error", "projectName", composeProject.Name, "error", err)
+ slog.ErrorContext(ctx, "compose ps error", "projectName", composeProject.Name, "error", err)
return nil, fmt.Errorf("failed to get compose services status: %w", err)
}
imageIDs := s.runtimeImageIDsByContainerInternal(ctx, composeProject.Name)
diff --git a/backend/internal/project/children/lifecycle/service.go b/backend/internal/project/children/lifecycle/service.go
index c4e19047c..6226b8333 100644
--- a/backend/internal/project/children/lifecycle/service.go
+++ b/backend/internal/project/children/lifecycle/service.go
@@ -110,7 +110,7 @@ func RemoveLifecycleContainer(ctx context.Context, dockerClient *client.Client,
cleanupCtx, cleanupCancel := context.WithTimeout(cleanupCtx, timeouts.GetDuration(apiTimeoutSec, timeouts.DefaultDockerAPI))
defer cleanupCancel()
if _, err := dockerClient.ContainerRemove(cleanupCtx, containerID, client.ContainerRemoveOptions{Force: true}); err != nil && !errdefs.IsNotFound(err) {
- slog.WarnContext(cleanupCtx, "failed to remove lifecycle container", "containerID", containerID, "error", err)
+ slog.WarnContext(cleanupCtx, "failed to remove lifecycle container", "containerId", containerID, "error", err)
}
}
diff --git a/backend/internal/project/children/sync/service.go b/backend/internal/project/children/sync/service.go
index 8cdcbbc45..0d951c1df 100644
--- a/backend/internal/project/children/sync/service.go
+++ b/backend/internal/project/children/sync/service.go
@@ -262,7 +262,7 @@ func PersistGitSyncEnvFiles(ctx context.Context, projectPath, projectsDirectory
return projects.WriteManagedEnvFile(ctx, projectsDirectory, projectPath, projects.EffectiveEnvFileName, update.state.EffectiveUnreadable, effectiveContent)
}
if update.state.EffectiveUnreadable {
- slog.Warn("skipping permission-locked .env file; leaving it untouched", "projectPath", projectPath)
+ slog.WarnContext(ctx, "skipping permission-locked .env file; leaving it untouched", "projectPath", projectPath)
return nil
}
return projects.EnsureEnvFile(ctx, projectsDirectory, projectPath)
diff --git a/backend/internal/project/children/update/service.go b/backend/internal/project/children/update/service.go
index 6da8ace79..6d8c35bb0 100644
--- a/backend/internal/project/children/update/service.go
+++ b/backend/internal/project/children/update/service.go
@@ -311,12 +311,12 @@ func (s *Service) recoverRollbackCleanupInternal(ctx context.Context, cleanup *p
return fmt.Errorf("load project for rename rollback cleanup: %w", stateErr)
}
if !found {
- slog.WarnContext(ctx, "clearing project rename rollback cleanup because project no longer exists", "projectID", cleanup.ProjectID)
+ slog.WarnContext(ctx, "clearing project rename rollback cleanup because project no longer exists", "projectId", cleanup.ProjectID)
return s.clearRollbackCleanupInternal(ctx, cleanup.ProjectID)
}
if name != cleanup.OldName || filepath.Clean(path) != filepath.Clean(cleanup.OldPath) {
- slog.WarnContext(ctx, "clearing project rename rollback cleanup because project state changed", "projectID", cleanup.ProjectID, "projectName", name, "projectPath", path)
+ slog.WarnContext(ctx, "clearing project rename rollback cleanup because project state changed", "projectId", cleanup.ProjectID, "projectName", name, "projectPath", path)
return s.clearRollbackCleanupInternal(ctx, cleanup.ProjectID)
}
diff --git a/backend/internal/project/children/workspace/service.go b/backend/internal/project/children/workspace/service.go
index a4d2b47d2..7673f4685 100644
--- a/backend/internal/project/children/workspace/service.go
+++ b/backend/internal/project/children/workspace/service.go
@@ -36,8 +36,9 @@ func New(cfg *config.Config) *Service {
}
// Read lists the workspace files, marking GitOps-owned paths read-only.
-func (s *Service) Read(projectPath, composeFileName string, owned map[string]struct{}) (*workspacetypes.Workspace, error) {
+func (s *Service) Read(ctx context.Context, projectPath, composeFileName string, owned map[string]struct{}) (*workspacetypes.Workspace, error) {
files, revision, truncated, err := projects.ReadProjectWorkspace(
+ ctx,
projectPath,
s.config.ProjectWorkspaceMaxDepth,
s.config.ProjectScanSkipDirs,
@@ -152,7 +153,7 @@ func (s *Service) Apply(
SkipDirectories: s.config.ProjectScanSkipDirs,
ComposeFileName: composeFileName,
}
- if applyErr := projects.ApplyProjectWorkspaceChanges(projectPath, manifest.FileChanges, uploads, opts); applyErr != nil {
+ if applyErr := projects.ApplyProjectWorkspaceChanges(ctx, projectPath, manifest.FileChanges, uploads, opts); applyErr != nil {
if restoreErr := projects.RestoreProjectUpdateBackup(ctx, projectPath, backup); restoreErr != nil {
return errors.Join(WrapProjectWorkspaceError(applyErr), fmt.Errorf("rollback project workspace: %w", restoreErr))
}
diff --git a/backend/internal/project/handler.go b/backend/internal/project/handler.go
index c1a3591ec..01dd44a12 100644
--- a/backend/internal/project/handler.go
+++ b/backend/internal/project/handler.go
@@ -635,10 +635,10 @@ func (h *ProjectHandler) DestroyProject(ctx context.Context, input *DestroyProje
slog.DebugContext(ctx, "DestroyProject handler received body",
"removeFiles", removeFiles,
"removeVolumes", removeVolumes,
- "projectID", input.ProjectID)
+ "projectId", input.ProjectID)
} else {
slog.DebugContext(ctx, "DestroyProject handler received nil body",
- "projectID", input.ProjectID)
+ "projectId", input.ProjectID)
}
runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
diff --git a/backend/internal/project/service.go b/backend/internal/project/service.go
index dcc1f32f3..c66e0b82b 100644
--- a/backend/internal/project/service.go
+++ b/backend/internal/project/service.go
@@ -212,7 +212,7 @@ func (s *ProjectService) CreateGitOpsManagedProject(ctx context.Context, gitOpsS
project.GitOpsManagedBy = &gitOpsSync.ID
s.composeNames.putInternal(projects.NormalizeProjectName(project.Name), project.ID)
if err := s.reconcileComposeTagsForProjectInternal(ctx, project); err != nil {
- slog.WarnContext(ctx, "failed to reconcile Compose project tags during GitOps project creation", "projectID", project.ID, "error", err)
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags during GitOps project creation", "projectId", project.ID, "error", err)
}
logEvent := true
if len(logEventOptions) > 0 {
@@ -409,7 +409,7 @@ func (s *ProjectService) logProjectEventInternal(ctx context.Context, eventType
return
}
if logErr := s.eventService.LogProjectEvent(ctx, eventType, projectID, projectName, user.ID, user.Username, "0", metadata); logErr != nil {
- slog.ErrorContext(ctx, action, "error", logErr)
+ slog.ErrorContext(ctx, "could not log project event", "action", action, "error", logErr)
}
}
@@ -511,7 +511,7 @@ func (s *ProjectService) EnsureProjectPathUnderRoot(ctx context.Context, proj *P
}
candidate := filepath.Join(projectsDirectory, dirName)
- slog.WarnContext(ctx, "Normalizing project path to projects root", "projectID", proj.ID, "oldPath", proj.Path, "newPath", candidate, "root", projectsDirectory)
+ slog.WarnContext(ctx, "Normalizing project path to projects root", "projectId", proj.ID, "oldPath", proj.Path, "newPath", candidate, "root", projectsDirectory)
proj.Path = filepath.Clean(candidate)
if persist {
@@ -621,7 +621,7 @@ func (s *ProjectService) resolveProjectComposeFileUncachedInternal(ctx context.C
if dirErr != nil {
// The .env.global layer is skipped for an empty projects directory;
// keep resolution working but surface the misconfiguration.
- slog.WarnContext(ctx, "failed to resolve projects directory for compose selection", "projectID", proj.ID, "error", dirErr)
+ slog.WarnContext(ctx, "failed to resolve projects directory for compose selection", "projectId", proj.ID, "error", dirErr)
}
}
if files, selErr := projects.ComposeFileEnvSelection(ctx, projectsDirectory, proj.Path); selErr != nil {
@@ -777,10 +777,10 @@ func (s *ProjectService) refreshComposeProjectNameInternal(ctx context.Context,
meta, err := s.loadComposeMetadataForSyncInternal(ctx, proj.Path, dirName)
if err != nil {
if errors.Is(err, common.ErrProjectEnvUnreadable) {
- slog.DebugContext(ctx, "skipped compose project name refresh; project env is unreadable", "projectID", proj.ID, "path", proj.Path, "error", err)
+ slog.DebugContext(ctx, "skipped compose project name refresh; project env is unreadable", "projectId", proj.ID, "path", proj.Path, "error", err)
return
}
- slog.WarnContext(ctx, "failed to refresh compose project name", "projectID", proj.ID, "path", proj.Path, "error", err)
+ slog.WarnContext(ctx, "failed to refresh compose project name", "projectId", proj.ID, "path", proj.Path, "error", err)
return
}
@@ -801,7 +801,7 @@ func (s *ProjectService) refreshComposeProjectNameInternal(ctx context.Context,
Model(&Project{}).
Where("id = ?", proj.ID).
Updates(updates).Error; persistComposeNameErr != nil {
- slog.WarnContext(ctx, "failed to persist refreshed compose project name", "projectID", proj.ID, "error", persistComposeNameErr)
+ slog.WarnContext(ctx, "failed to persist refreshed compose project name", "projectId", proj.ID, "error", persistComposeNameErr)
return
}
@@ -901,8 +901,8 @@ func (s *LifecycleService) executePreDeployInternal(ctx context.Context, project
timeout := s.hooks.Timeout(ctx, syncRecord.PreDeployTimeoutSec)
slog.InfoContext(ctx, "running pre-deploy lifecycle hook",
- "projectID", project.ID,
- "syncID", syncRecord.ID,
+ "projectId", project.ID,
+ "syncId", syncRecord.ID,
"scriptPath", scriptPath,
"runnerImage", runnerImage,
"timeoutSec", int(timeout/time.Second),
@@ -951,7 +951,7 @@ func (s *LifecycleService) persistLastRunInternal(ctx context.Context, syncID, s
"pre_deploy_last_run_output": output,
}).Error
if err != nil {
- slog.WarnContext(ctx, "failed to persist lifecycle last-run state", "syncID", syncID, "error", err)
+ slog.WarnContext(ctx, "failed to persist lifecycle last-run state", "syncId", syncID, "error", err)
}
}
@@ -1000,7 +1000,7 @@ func (s *LifecycleService) emitLifecycleEventInternal(
Metadata: metadata,
})
if err != nil {
- slog.WarnContext(ctx, "failed to emit lifecycle.execute event", "syncID", syncRecord.ID, "error", err)
+ slog.WarnContext(ctx, "failed to emit lifecycle.execute event", "syncId", syncRecord.ID, "error", err)
}
}
@@ -1118,7 +1118,7 @@ func (s *ProjectService) updateProjectServicesInternal(ctx context.Context, proj
}
dependents, stoppedDependents := s.deployment.NamespaceDependents(ctx, compProj, servicesToUpdate)
if len(dependents)+len(stoppedDependents) > 0 {
- slog.InfoContext(ctx, "recreating namespace dependents with updated services", "projectID", projectID, "services", servicesToUpdate, "dependents", dependents, "stoppedDependents", stoppedDependents)
+ slog.InfoContext(ctx, "recreating namespace dependents with updated services", "projectId", projectID, "services", servicesToUpdate, "dependents", dependents, "stoppedDependents", stoppedDependents)
if compProj, _, err = s.loadComposeProjectForProjectInternal(ctx, projectFromDb, prepare, slices.Concat(servicesToUpdate, dependents, stoppedDependents)...); err != nil {
return fmt.Errorf("failed to load compose project with dependents: %w", err)
}
@@ -1134,7 +1134,7 @@ func (s *ProjectService) updateProjectServicesInternal(ctx context.Context, proj
credentials, err := s.ResolveRegistryCredentials(ctx)
if err != nil {
if statusErr := s.updateProjectStatusInternal(ctx, projectID, previousStatus); statusErr != nil {
- slog.ErrorContext(ctx, "UpdateProjectServices: failed to restore project status after credential lookup failure", "projectID", projectID, "error", statusErr)
+ slog.ErrorContext(ctx, "UpdateProjectServices: failed to restore project status after credential lookup failure", "projectId", projectID, "error", statusErr)
}
return fmt.Errorf("resolve registry credentials: %w", err)
}
@@ -1146,7 +1146,7 @@ func (s *ProjectService) updateProjectServicesInternal(ctx context.Context, proj
AuthConfigs: s.composeRegistryAuthConfigsInternal(ctx), WaitTimeout: timeouts.GetDuration(s.settingsService.GetSettingsConfig().DeployWaitTimeout.AsInt(), timeouts.DefaultDeployWait),
RestoreBeforeMutation: func(ctx context.Context) {
if statusErr := s.updateProjectStatusInternal(ctx, projectID, previousStatus); statusErr != nil {
- slog.ErrorContext(ctx, "failed to restore project status before service update", "projectID", projectID, "error", statusErr)
+ slog.ErrorContext(ctx, "failed to restore project status before service update", "projectId", projectID, "error", statusErr)
}
},
Recover: func(ctx context.Context) { s.restoreProjectStatusAfterFailedDeployInternal(ctx, projectID) },
@@ -1299,7 +1299,7 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
err = s.updateProjectStatusandCountsInternal(ctx, projectID, ProjectStatusRunning)
if err != nil {
- slog.Error("failed to update project status and counts after deploy", "projectID", projectID, "error", err)
+ slog.ErrorContext(ctx, "failed to update project status and counts after deploy", "projectId", projectID, "error", err)
}
return err
}
@@ -1406,7 +1406,7 @@ func (
RunningCount: 0,
}
- if applyProjectWorkspaceChangesErr := projects.ApplyProjectWorkspaceChanges(projectPath, manifest.FileChanges, uploads, projects.ProjectWorkspaceApplyOptions{
+ if applyProjectWorkspaceChangesErr := projects.ApplyProjectWorkspaceChanges(ctx, projectPath, manifest.FileChanges, uploads, projects.ProjectWorkspaceApplyOptions{
MaxDepth: s.config.ProjectWorkspaceMaxDepth,
MaxEntries: s.config.ProjectWorkspaceMaxEntries,
MaxFileSizeBytes: workspacepkg.MaxFileSizeBytes(s.config.ProjectWorkspaceMaxFileSizeMB),
@@ -1486,10 +1486,10 @@ func (
func (s *ProjectService) DestroyProject(ctx context.Context, projectID string, removeFiles, removeVolumes bool, user usertypes.Actor) error {
slog.DebugContext(ctx, "DestroyProject service called",
- "projectID", projectID,
+ "projectId", projectID,
"removeFiles", removeFiles,
"removeVolumes", removeVolumes,
- "userID", user.ID,
+ "userId", user.ID,
"username", user.Username)
proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)
@@ -1671,13 +1671,13 @@ func (s *ProjectService) restoreProjectStatusAfterFailedDeployInternal(ctx conte
if updateErr == nil {
return
}
- slog.WarnContext(ctx, "failed to restore project status after deploy failure", "projectID", projectID, "error", updateErr)
+ slog.WarnContext(ctx, "failed to restore project status after deploy failure", "projectId", projectID, "error", updateErr)
} else {
- slog.WarnContext(ctx, "failed to inspect project services after deploy failure", "projectID", projectID, "error", err)
+ slog.WarnContext(ctx, "failed to inspect project services after deploy failure", "projectId", projectID, "error", err)
}
if updateErr := s.updateProjectStatusInternal(ctx, projectID, ProjectStatusStopped); updateErr != nil {
- slog.WarnContext(ctx, "failed to set stopped status after deploy failure", "projectID", projectID, "error", updateErr)
+ slog.WarnContext(ctx, "failed to set stopped status after deploy failure", "projectId", projectID, "error", updateErr)
}
}
@@ -1723,7 +1723,7 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, s
func (s *ProjectService) updateProjectStatusandCountsInternal(ctx context.Context, projectID string, status ProjectStatus) error {
services, err := s.projectServicesInternal(ctx, projectID)
if err != nil {
- slog.Error("loading project services failed during status update", "projectID", projectID, "error", err)
+ slog.ErrorContext(ctx, "loading project services failed during status update", "projectId", projectID, "error", err)
return s.updateProjectStatusInternal(ctx, projectID, status)
}
@@ -1765,7 +1765,7 @@ func (s *ProjectService) GetProjectContent(ctx context.Context, projectID string
case errors.Is(composeErr, common.ErrProjectEnvUnreadable):
projectsDirectory, dirErr := s.GetProjectsDirectory(ctx)
if dirErr != nil {
- slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectID", proj.ID, "error", dirErr)
+ slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectId", proj.ID, "error", dirErr)
}
composePath, composeErr = projects.DetectComposeFile(ctx, projectsDirectory, proj.Path)
if composeErr != nil && (!errors.Is(composeErr, common.ErrProjectEnvUnreadable) || composePath == "") {
@@ -1805,7 +1805,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string
if projectsDirErr != nil {
// Relative paths and the .env.global selection layer degrade without a
// projects directory; keep the details response intact but log it.
- slog.WarnContext(ctx, "failed to resolve projects directory for project details", "projectID", projectID, "error", projectsDirErr)
+ slog.WarnContext(ctx, "failed to resolve projects directory for project details", "projectId", projectID, "error", projectsDirErr)
}
var resp projecttypes.Details
@@ -1843,7 +1843,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID string
composeSelection, selErr := projects.ComposeFileEnvSelection(ctx, projectsDir, proj.Path)
if selErr != nil {
selLogLevel := kit.Ternary(errors.Is(selErr, common.ErrProjectEnvUnreadable), slog.LevelDebug, slog.LevelWarn)
- slog.Log(ctx, selLogLevel, "failed to resolve COMPOSE_FILE selection for project details", "projectID", proj.ID, "path", proj.Path, "error", selErr)
+ slog.Log(ctx, selLogLevel, "failed to resolve COMPOSE_FILE selection for project details", "projectId", proj.ID, "path", proj.Path, "error", selErr)
composeSelection = nil
}
resp.ComposeFiles = projectdetails.ComposeSelectionRelativePaths(proj.Path, composeSelection)
@@ -1915,7 +1915,7 @@ func (s *ProjectService) enrichProjectUpdateInfoInternal(ctx context.Context, re
if len(imageRefs) > 0 && s.imageService != nil {
lookupResult, err := s.imageService.GetUpdateInfoByImageRefs(ctx, imageRefs)
if err != nil {
- slog.WarnContext(ctx, "failed to fetch project update info", "projectID", resp.ID, "projectName", resp.Name, "error", err)
+ slog.WarnContext(ctx, "failed to fetch project update info", "projectId", resp.ID, "projectName", resp.Name, "error", err)
} else {
updateInfoByRef = lookupResult
}
@@ -2041,7 +2041,7 @@ func (
) {
composeProject, err := s.getCachedComposeProjectInternal(ctx, &proj, env)
if err != nil {
- slog.WarnContext(ctx, "failed to resolve project services for update summary", "projectID", proj.ID, "projectName", proj.Name, "error", err)
+ slog.WarnContext(ctx, "failed to resolve project services for update summary", "projectId", proj.ID, "projectName", proj.Name, "error", err)
refs := projects.ParseImageRefsJSON(proj.ImageRefsJSON)
return slices.DeleteFunc(refs, func(ref string) bool { return hiddenRuntimeRefs[ref] }), nil
}
@@ -2224,11 +2224,11 @@ func (s *ProjectService) enrichComposeDetailsInternal(ctx context.Context, proj
// name it for the UI and skip every enrichment that needs interpolation.
projectsDirectory, dirErr := s.GetProjectsDirectory(ctx)
if dirErr != nil {
- slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectID", proj.ID, "error", dirErr)
+ slog.DebugContext(ctx, "failed to resolve projects directory for compose identification", "projectId", proj.ID, "error", dirErr)
}
identified, detectErr := projects.DetectComposeFile(ctx, projectsDirectory, proj.Path)
if detectErr != nil && (!errors.Is(detectErr, common.ErrProjectEnvUnreadable) || identified == "") {
- slog.WarnContext(ctx, "failed to identify project compose file", "projectID", proj.ID, "error", detectErr)
+ slog.WarnContext(ctx, "failed to identify project compose file", "projectId", proj.ID, "error", detectErr)
return
}
if identified != "" {
@@ -2374,7 +2374,7 @@ func (s *ProjectService) ListProjects(ctx context.Context, params pagination.Que
s.enrichProjectsWithUpdateInfoInternal(ctx, projectsArray, result, true, env)
slog.DebugContext(ctx, "Completed ListProjects request",
- "result_count", len(result))
+ "resultCount", len(result))
return result, paginationResp, nil
}
@@ -2628,7 +2628,7 @@ func (s *ProjectService) ProjectMetadata(ctx context.Context, p Project, env *pr
return meta
}
if setErr := s.metaCache.Set(p.ID, fingerprint, p.Path, env.projectsDirectory, composeFile, meta.ComposeFiles, meta.EnvFiles, meta); setErr != nil {
- slog.DebugContext(ctx, "failed to cache Compose metadata", "projectID", p.ID, "error", setErr)
+ slog.DebugContext(ctx, "failed to cache Compose metadata", "projectId", p.ID, "error", setErr)
}
return meta
@@ -2660,11 +2660,11 @@ func (s *ProjectService) refreshProjectImageRefsInternal(ctx context.Context, pr
"image_refs_json": "",
"build_image_refs_json": nil,
}).Error; dbErr != nil {
- slog.WarnContext(ctx, "failed to clear stale project image refs", "projectID", proj.ID, "error", dbErr)
+ slog.WarnContext(ctx, "failed to clear stale project image refs", "projectId", proj.ID, "error", dbErr)
}
proj.ImageRefsJSON = ""
proj.BuildImageRefsJSON = nil
- slog.WarnContext(ctx, "failed to refresh project image refs", "projectID", proj.ID, "projectName", proj.Name, "error", err)
+ slog.WarnContext(ctx, "failed to refresh project image refs", "projectId", proj.ID, "projectName", proj.Name, "error", err)
return
}
imageRefsJSON := projects.MarshalImageRefsJSON(refs)
@@ -2676,7 +2676,7 @@ func (s *ProjectService) refreshProjectImageRefsInternal(ctx context.Context, pr
"image_refs_json": imageRefsJSON,
"build_image_refs_json": buildImageRefsJSON,
}).Error; persistImageRefsErr != nil {
- slog.WarnContext(ctx, "failed to persist project image refs", "projectID", proj.ID, "error", persistImageRefsErr)
+ slog.WarnContext(ctx, "failed to persist project image refs", "projectId", proj.ID, "error", persistImageRefsErr)
return
}
proj.ImageRefsJSON = imageRefsJSON
@@ -2697,7 +2697,7 @@ func (s *ProjectService) HandleProjectFilesChanged(ctx context.Context, paths []
s.invalidateProjectCachesInternal(affected[i].ID)
s.refreshProjectImageRefsInternal(ctx, &affected[i])
if reconcileComposeTagsForProjectErr := s.reconcileComposeTagsForProjectInternal(ctx, &affected[i]); reconcileComposeTagsForProjectErr != nil {
- slog.WarnContext(ctx, "failed to reconcile Compose project tags after file change", "projectID", affected[i].ID, "error", reconcileComposeTagsForProjectErr)
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags after file change", "projectId", affected[i].ID, "error", reconcileComposeTagsForProjectErr)
}
}
}
@@ -2840,7 +2840,7 @@ func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPa
if serviceCountErr == nil && existing.ServiceCount != composeMetadata.ServiceCount {
updates["service_count"] = composeMetadata.ServiceCount
} else if serviceCountErr != nil {
- slog.Log(ctx, serviceCountLogLevel, "failed to refresh compose service count during project sync", "projectID", existing.ID, "path", dirPath, "error", serviceCountErr)
+ slog.Log(ctx, serviceCountLogLevel, "failed to refresh compose service count during project sync", "projectId", existing.ID, "path", dirPath, "error", serviceCountErr)
}
if serviceCountErr == nil && mo.PointerToOption(existing.ComposeProjectName) != mo.PointerToOption(composeMetadata.ComposeProjectName) {
updates["compose_project_name"] = composeMetadata.ComposeProjectName
@@ -2986,7 +2986,7 @@ func (s *ProjectService) evaluateProjectComposeFileInternal(ctx context.Context,
// keep the record and warn instead.
if !errors.Is(err, common.ErrComposeFileNotFound) {
slog.WarnContext(ctx, "project directory present but compose file unresolved during cleanup; keeping DB record",
- "projectID", p.ID, "path", p.Path, "error", err)
+ "projectId", p.ID, "path", p.Path, "error", err)
return mo.None[projectCleanupDecision]()
}
@@ -3010,7 +3010,7 @@ func (s *ProjectService) deleteProjectDuringCleanupInternal(ctx context.Context,
return
}
- slog.WarnContext(ctx, reason, logAttrs...)
+ slog.WarnContext(ctx, "deleted project during filesystem cleanup", append(logAttrs, "reason", reason)...)
}
// ApplyGitSyncEnvToDirectory applies the same managed three-file environment
@@ -3054,7 +3054,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
if renameRequested {
return nil, recoverProjectRenameJournalForProjectErr
}
- slog.WarnContext(ctx, "project rename journal recovery failed before non-rename update; continuing", "projectID", projectID, "error", recoverProjectRenameJournalForProjectErr)
+ slog.WarnContext(ctx, "project rename journal recovery failed before non-rename update; continuing", "projectId", projectID, "error", recoverProjectRenameJournalForProjectErr)
} else {
proj, projectsDirectory, recoverProjectRenameJournalForProjectErr = s.getProjectForUpdate(ctx, projectID)
if recoverProjectRenameJournalForProjectErr != nil {
@@ -3119,7 +3119,7 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
s.FilesChanged.Publish(proj.ID)
}
- slog.InfoContext(ctx, "project updated", "projectID", proj.ID, "name", proj.Name)
+ slog.InfoContext(ctx, "project updated", "projectId", proj.ID, "name", proj.Name)
return &proj, nil
}
@@ -3268,10 +3268,10 @@ func (s *ProjectService) refreshProjectAfterContentUpdateInternal(ctx context.Co
s.refreshComposeProjectNameInternal(ctx, proj)
s.refreshProjectImageRefsInternal(ctx, proj)
if err := s.reconcileComposeTagsForProjectInternal(ctx, proj); err != nil {
- slog.WarnContext(ctx, "failed to reconcile Compose project tags after project update", "projectID", proj.ID, "error", err)
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags after project update", "projectId", proj.ID, "error", err)
}
if err := s.updateProjectStatusandCountsInternal(ctx, proj.ID, proj.Status); err != nil {
- slog.WarnContext(ctx, "failed to update service counts after compose edit", "projectID", proj.ID, "error", err)
+ slog.WarnContext(ctx, "failed to update service counts after compose edit", "projectId", proj.ID, "error", err)
}
}
@@ -3343,12 +3343,12 @@ func (
s.refreshComposeProjectNameInternal(ctx, &proj)
s.refreshProjectImageRefsInternal(ctx, &proj)
if reconcileComposeTagsForProjectErr := s.reconcileComposeTagsForProjectInternal(ctx, &proj); reconcileComposeTagsForProjectErr != nil {
- slog.WarnContext(ctx, "failed to reconcile Compose project tags after git sync", "projectID", proj.ID, "error", reconcileComposeTagsForProjectErr)
+ slog.WarnContext(ctx, "failed to reconcile Compose project tags after git sync", "projectId", proj.ID, "error", reconcileComposeTagsForProjectErr)
}
// Recalculate service counts and status after compose file sync
if updateProjectStatusandCountsErr := s.updateProjectStatusandCountsInternal(ctx, proj.ID, proj.Status); updateProjectStatusandCountsErr != nil {
- slog.WarnContext(ctx, "failed to update service counts after git sync", "projectID", proj.ID, "error", updateProjectStatusandCountsErr)
+ slog.WarnContext(ctx, "failed to update service counts after git sync", "projectId", proj.ID, "error", updateProjectStatusandCountsErr)
}
after := s.readGitSyncProjectContentInternal(ctx, proj.ID)
@@ -3361,7 +3361,7 @@ func (
func (s *ProjectService) readGitSyncProjectContentInternal(ctx context.Context, projectID string) gitSyncProjectContentInternal {
compose, env, override, err := s.GetProjectContent(ctx, projectID)
if err != nil {
- slog.WarnContext(ctx, "failed to read project content for git sync change detection; treating as changed", "projectID", projectID, "error", err)
+ slog.WarnContext(ctx, "failed to read project content for git sync change detection; treating as changed", "projectId", projectID, "error", err)
return gitSyncProjectContentInternal{unreadable: true}
}
return gitSyncProjectContentInternal{compose: compose, env: env, override: override}
@@ -3624,7 +3624,7 @@ func (s *ProjectService) ensureProjectStoppedForRenameInternal(ctx context.Conte
services, err := s.projectServicesInternal(ctx, proj.ID)
if err != nil {
- slog.WarnContext(ctx, "failed to resolve project status before rename", "projectID", proj.ID, "error", err)
+ slog.WarnContext(ctx, "failed to resolve project status before rename", "projectId", proj.ID, "error", err)
return fmt.Errorf("project must be stopped before renaming (current status: %s): failed to verify live status: %w", proj.Status, err)
}
@@ -3746,7 +3746,7 @@ func (s *ProjectService) GetProjectWorkspace(ctx context.Context, projectID stri
if ownedErr != nil {
ownedPaths = nil
}
- return s.workspace.Read(proj.Path, s.workspaceComposeFileNameInternal(ctx, proj), ownedPaths)
+ return s.workspace.Read(ctx, proj.Path, s.workspaceComposeFileNameInternal(ctx, proj), ownedPaths)
}
func (s *ProjectService) GetProjectWorkspaceFile(ctx context.Context, projectID, relativePath string) (*workspacetypes.FileContent, error) {
diff --git a/backend/internal/registry/service.go b/backend/internal/registry/service.go
index f94b678f0..86dc199e8 100644
--- a/backend/internal/registry/service.go
+++ b/backend/internal/registry/service.go
@@ -122,13 +122,11 @@ func NewContainerRegistryService(
// Per-ref timeout: a single deadline shared across the whole
// sequential batch left later refs with whatever the earlier ones
// had not already spent, so one slow registry starved the tail.
- result, err := func() (*containerregistry.DigestResult, error) {
- ctx, cancel := context.WithTimeout(context.Background(), timeouts.DefaultRegistry) //nolint:forbidigo // Cache revalidation runs independently of request cancellation.
- defer cancel()
- return service.InspectImageDigest(ctx, imageRef, nil)
- }()
+ ctx, cancel := context.WithTimeout(context.Background(), timeouts.DefaultRegistry) //nolint:forbidigo // Cache revalidation runs independently of request cancellation.
+ result, err := service.InspectImageDigest(ctx, imageRef, nil)
+ cancel()
if err != nil {
- slog.Debug("registry revalidation failed for image", "imageRef", imageRef, "error", err)
+ slog.DebugContext(ctx, "registry revalidation failed for image", "imageRef", imageRef, "error", err)
if firstErr == nil {
firstErr = err
}
@@ -714,7 +712,7 @@ func (s *ContainerRegistryService) getCachedRateLimitInternal(ctx context.Contex
raw, ok, err := s.kvService.Get(ctx, registryRateLimitKeyInternal(registryID))
if err != nil {
- slog.WarnContext(ctx, "failed to read registry rate limit cache", "registryID", registryID, "error", err)
+ slog.WarnContext(ctx, "failed to read registry rate limit cache", "registryId", registryID, "error", err)
return nil, time.Time{}, false
}
if !ok {
@@ -723,7 +721,7 @@ func (s *ContainerRegistryService) getCachedRateLimitInternal(ctx context.Contex
var entry registryRateLimitCacheEntryInternal
if unmarshalErr := json.Unmarshal([]byte(raw), &entry); unmarshalErr != nil {
- slog.WarnContext(ctx, "failed to parse registry rate limit cache", "registryID", registryID, "error", unmarshalErr)
+ slog.WarnContext(ctx, "failed to parse registry rate limit cache", "registryId", registryID, "error", unmarshalErr)
return nil, time.Time{}, false
}
if time.Since(entry.CheckedAt) > registryCacheTTL {
@@ -743,12 +741,12 @@ func (s *ContainerRegistryService) setCachedRateLimitInternal(ctx context.Contex
CheckedAt: checkedAt,
})
if err != nil {
- slog.WarnContext(ctx, "failed to encode registry rate limit cache", "registryID", registryID, "error", err)
+ slog.WarnContext(ctx, "failed to encode registry rate limit cache", "registryId", registryID, "error", err)
return
}
if setErr := s.kvService.Set(ctx, registryRateLimitKeyInternal(registryID), string(payload)); setErr != nil {
- slog.WarnContext(ctx, "failed to save registry rate limit cache", "registryID", registryID, "error", setErr)
+ slog.WarnContext(ctx, "failed to save registry rate limit cache", "registryId", registryID, "error", setErr)
}
}
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index bd5992870..8d2f4eae9 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -321,11 +321,11 @@ func (s *SettingsService) loadDatabaseSettingsInternal(ctx context.Context, db *
slog.DebugContext(
ctx,
"loadDatabaseSettingsInternal: using env path",
- "UIConfigurationDisabled",
+ "uiConfigurationDisabled",
config.Load().UIConfigurationDisabled,
- "AgentMode",
+ "agentMode",
config.Load().AgentMode,
- "Environment",
+ "environment",
config.Load().Environment,
)
return s.loadDatabaseConfigFromEnv(ctx, db)
diff --git a/backend/internal/swarm/children/nodes/service.go b/backend/internal/swarm/children/nodes/service.go
index 08a684e69..eb2dc3f51 100644
--- a/backend/internal/swarm/children/nodes/service.go
+++ b/backend/internal/swarm/children/nodes/service.go
@@ -196,7 +196,7 @@ func (s *Service) ReconcileNodeAgents(ctx context.Context, environmentID string)
candidate := node.Agent.Candidates[0]
bound, bindErr := s.environmentService.BindSwarmNodeEnvironment(ctx, environmentID, node.ID, candidate.EnvironmentID, false)
if bindErr != nil {
- slog.WarnContext(ctx, "failed to persist reconciled swarm node binding", "environmentID", candidate.EnvironmentID, "nodeID", node.ID, "error", bindErr.Error())
+ slog.WarnContext(ctx, "failed to persist reconciled swarm node binding", "environmentId", candidate.EnvironmentID, "nodeId", node.ID, "error", bindErr.Error())
results = append(results, result)
continue
}
@@ -269,7 +269,7 @@ func (s *Service) enrichNodeAgentStatusesInternal(ctx context.Context, environme
}
coverage, err := s.resolveNodeAgentCoverageInternal(ctx, environmentID)
if err != nil {
- slog.WarnContext(ctx, "failed to resolve swarm node agent coverage", "environmentID", environmentID, "error", err.Error())
+ slog.WarnContext(ctx, "failed to resolve swarm node agent coverage", "environmentId", environmentID, "error", err.Error())
return
}
@@ -287,7 +287,7 @@ func (s *Service) resolveNodeAgentCoverageInternal(ctx context.Context, environm
candidateEnvs, err := s.environmentService.ListSwarmNodeCandidateEnvironments(ctx)
if err != nil {
- slog.WarnContext(ctx, "failed to load swarm node agent candidates", "environmentID", environmentID, "error", err.Error())
+ slog.WarnContext(ctx, "failed to load swarm node agent candidates", "environmentId", environmentID, "error", err.Error())
candidateEnvs = nil
}
@@ -417,7 +417,7 @@ func (s *Service) resolveSwarmNodeAgentRuntimeInternal(ctx context.Context, env
identity, err := s.fetchSwarmNodeIdentityViaEdgeInternal(ctx, env.ID)
if err != nil {
- slog.DebugContext(ctx, "failed to probe swarm node identity", "environmentID", env.ID, "error", err.Error())
+ slog.DebugContext(ctx, "failed to probe swarm node identity", "environmentId", env.ID, "error", err.Error())
return runtime
}
diff --git a/backend/internal/swarm/children/stacks/service.go b/backend/internal/swarm/children/stacks/service.go
index e081a6c62..b1b966deb 100644
--- a/backend/internal/swarm/children/stacks/service.go
+++ b/backend/internal/swarm/children/stacks/service.go
@@ -152,7 +152,7 @@ func (s *Service) DeployStack(ctx context.Context, environmentID string, req swa
}
if upsertStackSourceErr := s.upsertStackSourceInternal(ctx, environmentID, stackName, req.ComposeContent, req.OverrideContent, req.EnvContent, req.Files); upsertStackSourceErr != nil {
- slog.WarnContext(ctx, "failed to persist swarm stack source", "environmentID", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", upsertStackSourceErr)
+ slog.WarnContext(ctx, "failed to persist swarm stack source", "environmentId", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", upsertStackSourceErr)
}
workingDir := req.WorkingDir
@@ -352,7 +352,7 @@ func (s *Service) UpdateStackSource(ctx context.Context, environmentID, stackNam
restoreErr = s.deleteStackSourceInternal(ctx, environmentID, stackName)
}
if restoreErr != nil {
- slog.WarnContext(ctx, "failed to restore swarm stack source after deploy failure", "environmentID", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", restoreErr)
+ slog.WarnContext(ctx, "failed to restore swarm stack source after deploy failure", "environmentId", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", restoreErr)
}
return nil, fmt.Errorf("failed to redeploy swarm stack from updated source: %w", deployStackAfterSourceUpdateErr)
}
@@ -477,7 +477,7 @@ func (s *Service) RemoveStack(ctx context.Context, environmentID, stackName stri
}
if deleteStackSourceErr := s.deleteStackSourceInternal(ctx, environmentID, stackName); deleteStackSourceErr != nil {
- slog.WarnContext(ctx, "failed to remove persisted swarm stack source", "environmentID", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", deleteStackSourceErr)
+ slog.WarnContext(ctx, "failed to remove persisted swarm stack source", "environmentId", normalizeSwarmEnvironmentIDInternal(environmentID), "stackName", stackName, "error", deleteStackSourceErr)
}
return nil
diff --git a/backend/internal/system/children/backup/service.go b/backend/internal/system/children/backup/service.go
index 0e1cea189..113c8e1ed 100644
--- a/backend/internal/system/children/backup/service.go
+++ b/backend/internal/system/children/backup/service.go
@@ -522,7 +522,7 @@ func (s *Service) executeBackupInternal(ctx context.Context, prepared *preparedS
}
cleanupCtx := context.WithoutCancel(ctx)
if forgetErr := s.engine.ForgetSnapshots(cleanupCtx, dockerClient, localRepository, recoveryKey, []string{stagedSnapshot.ID}); forgetErr != nil {
- slog.WarnContext(cleanupCtx, "failed to remove staged system recovery snapshot", "snapshot_id", stagedSnapshot.ID, "error", forgetErr)
+ slog.WarnContext(cleanupCtx, "failed to remove staged system recovery snapshot", "snapshotId", stagedSnapshot.ID, "error", forgetErr)
}
}()
if localEnabled {
diff --git a/backend/internal/system/children/prune/handler.go b/backend/internal/system/children/prune/handler.go
index 6e7a0661a..81a97bbe9 100644
--- a/backend/internal/system/children/prune/handler.go
+++ b/backend/internal/system/children/prune/handler.go
@@ -33,7 +33,7 @@ func (h *Handler) PruneAll(ctx context.Context, input *PruneAllInput) (*handleru
"images", input.Body.Images,
"volumes", input.Body.Volumes,
"networks", input.Body.Networks,
- "build_cache", input.Body.BuildCache)
+ "buildCache", input.Body.BuildCache)
runtimeCtx := utils.ActivityRuntimeContext(ctx, h.appCtx)
result := h.service.StartPruneAll(runtimeCtx, input.EnvironmentID, input.Body)
diff --git a/backend/internal/system/children/prune/service.go b/backend/internal/system/children/prune/service.go
index 3d8d9f032..554ed7a4c 100644
--- a/backend/internal/system/children/prune/service.go
+++ b/backend/internal/system/children/prune/service.go
@@ -71,7 +71,7 @@ func (s *Service) PruneAll(ctx context.Context, environmentID string, req system
"images", req.Images,
"volumes", req.Volumes,
"networks", req.Networks,
- "build_cache", req.BuildCache,
+ "buildCache", req.BuildCache,
)
prune := s.beginSystemPruneInternal(ctx, environmentID, req)
@@ -259,25 +259,25 @@ func (s *Service) runSystemPruneInternal(ctx context.Context, req system.PruneAl
"Selective prune operation completed",
"success",
result.Success,
- "containers_pruned",
+ "containersPruned",
len(
result.ContainersPruned,
),
- "images_deleted",
+ "imagesDeleted",
len(
result.ImagesDeleted,
),
- "volumes_deleted",
+ "volumesDeleted",
len(
result.VolumesDeleted,
),
- "networks_deleted",
+ "networksDeleted",
len(
result.NetworksDeleted,
),
- "space_reclaimed",
+ "spaceReclaimed",
result.SpaceReclaimed,
- "error_count",
+ "errorCount",
len(
result.Errors,
),
@@ -402,7 +402,7 @@ func (s *Service) pruneImagesInternal(ctx context.Context, options system.PruneI
return fmt.Errorf("failed to prune images: %w", err)
}
- slog.InfoContext(ctx, "Image pruning completed", "images_deleted", len(report.Report.ImagesDeleted), "bytes_reclaimed", report.Report.SpaceReclaimed)
+ slog.InfoContext(ctx, "Image pruning completed", "imagesDeleted", len(report.Report.ImagesDeleted), "bytesReclaimed", report.Report.SpaceReclaimed)
// Collect IDs to delete from DB
var idsToDelete []string
@@ -451,7 +451,7 @@ func (s *Service) pruneBuildCacheInternal(ctx context.Context, options system.Pr
return fmt.Errorf("failed to prune build cache: %w", err)
}
- slog.InfoContext(ctx, "build cache pruning completed", "cache_entries_deleted", len(report.Report.CachesDeleted), "bytes_reclaimed", report.Report.SpaceReclaimed)
+ slog.InfoContext(ctx, "build cache pruning completed", "cacheEntriesDeleted", len(report.Report.CachesDeleted), "bytesReclaimed", report.Report.SpaceReclaimed)
result.SpaceReclaimed += report.Report.SpaceReclaimed
result.BuildCacheSpaceReclaimed += report.Report.SpaceReclaimed
@@ -465,7 +465,7 @@ func (s *Service) pruneVolumesInternal(ctx context.Context, options system.Prune
return err
}
- slog.InfoContext(ctx, "Volume prune completed", "volumes_deleted", len(report.VolumesDeleted), "space_reclaimed", report.SpaceReclaimed)
+ slog.InfoContext(ctx, "Volume prune completed", "volumesDeleted", len(report.VolumesDeleted), "spaceReclaimed", report.SpaceReclaimed)
result.VolumesDeleted = report.VolumesDeleted
result.SpaceReclaimed += report.SpaceReclaimed
@@ -492,7 +492,7 @@ func (s *Service) pruneNetworksInternal(ctx context.Context, options system.Prun
return fmt.Errorf("failed to prune networks: %w", err)
}
- slog.InfoContext(ctx, "Network prune completed", "networks_deleted", len(report.Report.NetworksDeleted))
+ slog.InfoContext(ctx, "Network prune completed", "networksDeleted", len(report.Report.NetworksDeleted))
result.NetworksDeleted = report.Report.NetworksDeleted
return nil
diff --git a/backend/internal/system/children/upgrade/handler.go b/backend/internal/system/children/upgrade/handler.go
index 2335bb878..328cdbf94 100644
--- a/backend/internal/system/children/upgrade/handler.go
+++ b/backend/internal/system/children/upgrade/handler.go
@@ -80,7 +80,7 @@ func (h *Handler) rejectIfAgentModeInternal() error {
func (h *Handler) CheckUpgradeAvailable(ctx context.Context, input *CheckUpgradeInput) (*CheckUpgradeOutput, error) {
canUpgrade, err := h.service.CanUpgrade(ctx)
if err != nil {
- slog.Debug("System upgrade check failed", "error", err)
+ slog.DebugContext(ctx, "System upgrade check failed", "error", err)
return &CheckUpgradeOutput{
Body: UpgradeCheckResultData{
CanUpgrade: false,
@@ -106,7 +106,7 @@ func (h *Handler) TriggerUpgrade(ctx context.Context, input *TriggerUpgradeInput
return nil, err
}
- slog.Info("System upgrade triggered", "user", user.Username, "userId", user.ID)
+ slog.InfoContext(ctx, "System upgrade triggered", "user", user.Username, "userId", user.ID)
// Resolved before triggering, while the version check still describes the running
// container: the upgrade itself may replace it.
@@ -119,7 +119,7 @@ func (h *Handler) TriggerUpgrade(ctx context.Context, input *TriggerUpgradeInput
err = h.service.TriggerUpgradeAsync(utils.ActivityRuntimeContext(ctx, h.appCtx), *user, targetVersion)
if err != nil {
- slog.Error("System upgrade failed", "error", err, "user", user.Username)
+ slog.ErrorContext(ctx, "System upgrade failed", "error", err, "user", user.Username)
if errors.Is(err, common.ErrUpgradeInProgress) {
return nil, huma.Error409Conflict("Failed to initiate upgrade: " + err.Error())
@@ -157,7 +157,7 @@ func (h *Handler) TriggerUpdateAll(ctx context.Context, input *TriggerUpdateAllI
return nil, err
}
- slog.Info("Update-all environments triggered", "user", user.Username, "userId", user.ID)
+ slog.InfoContext(ctx, "Update-all environments triggered", "user", user.Username, "userId", user.ID)
// Use a runtime context so the agents phase can outlive the request when the
// manager is already up to date.
diff --git a/backend/internal/system/children/upgrade/service.go b/backend/internal/system/children/upgrade/service.go
index 87f982e24..c252fe2fd 100644
--- a/backend/internal/system/children/upgrade/service.go
+++ b/backend/internal/system/children/upgrade/service.go
@@ -151,7 +151,7 @@ func (s *Service) TriggerUpgradeAsync(ctx context.Context, user usertypes.Actor,
go func() {
defer cancel()
if _, runPreparedUpgradeErr := s.runPreparedUpgradeInternal(runCtx, prepared); runPreparedUpgradeErr != nil {
- slog.Error("Background self-upgrade failed", "error", runPreparedUpgradeErr, "targetImage", prepared.targetImage)
+ slog.ErrorContext(ctx, "Background self-upgrade failed", "error", runPreparedUpgradeErr, "targetImage", prepared.targetImage)
}
}()
return nil
@@ -211,7 +211,7 @@ func (s *Service) prepareUpgradeInternal(ctx context.Context, user usertypes.Act
"targetImage": targetImage,
}
if logUserEventErr := s.eventService.LogUserEvent(ctx, event.EventTypeSystemUpgrade, user.ID, user.Username, metadata); logUserEventErr != nil {
- slog.Warn("Failed to log upgrade event", "error", logUserEventErr)
+ slog.WarnContext(ctx, "Failed to log upgrade event", "error", logUserEventErr)
}
return &preparedUpgradeInternal{
@@ -228,9 +228,9 @@ func (s *Service) runPreparedUpgradeInternal(ctx context.Context, prepared *prep
// Run the upgrader from the image we are upgrading to, so the upgrade CLI
// is the new version.
upgraderImage := prepared.targetImage
- slog.Debug("Using upgrader image", "image", upgraderImage)
+ slog.DebugContext(ctx, "Using upgrader image", "image", upgraderImage)
- slog.Info("Spawning upgrade CLI command", "containerName", prepared.containerName, "upgraderImage", upgraderImage)
+ slog.InfoContext(ctx, "Spawning upgrade CLI command", "containerName", prepared.containerName, "upgraderImage", upgraderImage)
// Spawn the upgrade command in a detached container
// This will run independently of the current container
@@ -240,7 +240,7 @@ func (s *Service) runPreparedUpgradeInternal(ctx context.Context, prepared *prep
}
// Pull the upgrader image first to ensure it exists
- slog.Info("Pulling upgrader image", "image", upgraderImage)
+ slog.InfoContext(ctx, "Pulling upgrader image", "image", upgraderImage)
localSettings := s.settingsService.GetSettingsConfig()
pullCtx, pullCancel := context.WithTimeout(ctx, timeouts.GetDuration(localSettings.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull))
@@ -259,16 +259,16 @@ func (s *Service) runPreparedUpgradeInternal(ctx context.Context, prepared *prep
return "", fmt.Errorf("failed to complete upgrader image pull: %w", renderJSONMessageStreamErr)
}
if closeErr := pullReader.Close(); closeErr != nil {
- slog.Warn("Failed to close upgrader image pull reader", "error", closeErr)
+ slog.WarnContext(ctx, "Failed to close upgrader image pull reader", "error", closeErr)
}
- slog.Info("Upgrader image pulled successfully", "image", upgraderImage)
+ slog.InfoContext(ctx, "Upgrader image pulled successfully", "image", upgraderImage)
// Try to get the /app/data mount from current container so upgrade logs persist.
appDataMount := dockerutils.MountForDestination(prepared.current.Mounts, libarcane.UpgradeLogDirectory, libarcane.UpgradeLogDirectory)
if appDataMount == nil {
- slog.Warn("Could not detect /app/data mount; upgrader logs may not persist")
+ slog.WarnContext(ctx, "Could not detect /app/data mount; upgrader logs may not persist")
} else {
- slog.Debug("Mounting /app/data into upgrader container", "type", appDataMount.Type, "source", appDataMount.Source)
+ slog.DebugContext(ctx, "Mounting /app/data into upgrader container", "type", appDataMount.Type, "source", appDataMount.Source)
}
// Create the upgrader container config
@@ -317,7 +317,7 @@ func (s *Service) runPreparedUpgradeInternal(ctx context.Context, prepared *prep
keepUpgraderContainer := strings.EqualFold(strings.TrimSpace(os.Getenv("ARCANE_UPGRADE_KEEP_CONTAINER")), "true")
if keepUpgraderContainer {
- slog.Info("Keeping upgrader container after exit (ARCANE_UPGRADE_KEEP_CONTAINER=true)")
+ slog.InfoContext(ctx, "Keeping upgrader container after exit (ARCANE_UPGRADE_KEEP_CONTAINER=true)")
}
hostConfig := &container.HostConfig{
@@ -356,7 +356,7 @@ func (s *Service) runPreparedUpgradeInternal(ctx context.Context, prepared *prep
return "", fmt.Errorf("start upgrader container: %w", containerStartErr)
}
- slog.Info("Upgrade container started", "upgraderId", resp.ID[:12], "upgraderName", upgraderName)
+ slog.InfoContext(ctx, "Upgrade container started", "upgraderId", resp.ID[:12], "upgraderName", upgraderName)
return resp.ID, nil
}
@@ -375,7 +375,7 @@ func hasSELinuxLabelOptInternal(securityOpts []string) bool {
func daemonHasSELinuxEnabledInternal(ctx context.Context, dockerClient *client.Client) bool {
infoResult, err := dockerClient.Info(ctx, client.InfoOptions{})
if err != nil {
- slog.Debug("Failed to query daemon info for SELinux detection", "error", err)
+ slog.DebugContext(ctx, "Failed to query daemon info for SELinux detection", "error", err)
return false
}
return slices.Contains(infoResult.Info.SecurityOptions, "name=selinux")
diff --git a/backend/internal/template/service.go b/backend/internal/template/service.go
index ba6c175e0..14e402470 100644
--- a/backend/internal/template/service.go
+++ b/backend/internal/template/service.go
@@ -83,7 +83,7 @@ func NewTemplateService(ctx context.Context, db *database.DB, httpClient *http.C
registryFetchMeta: make(map[string]*registryFetchMeta),
registryErrors: make(map[string]string),
}
- service.safeHTTPClient = service.newSafeHTTPClientInternal()
+ service.safeHTTPClient = service.newSafeHTTPClientInternal(ctx)
revalidationCtx := context.WithoutCancel(ctx)
loader := func(generations []uint64) (map[uint64][]ComposeTemplate, error) {
loadCtx, cancel := context.WithTimeout(revalidationCtx, 2*time.Minute)
@@ -178,7 +178,7 @@ func (s *TemplateService) GetAllTemplatesPaginated(ctx context.Context, params p
for _, t := range templates {
var dtoItem tmpl.Template
if mapStructErr := mapping.MapStruct(&t, &dtoItem); mapStructErr != nil {
- slog.WarnContext(ctx, "failed to map template to DTO", "error", mapStructErr, "templateID", t.ID)
+ slog.WarnContext(ctx, "failed to map template to DTO", "error", mapStructErr, "templateId", t.ID)
continue
}
items = append(items, dtoItem)
@@ -260,7 +260,7 @@ func (s *TemplateService) GetTemplate(ctx context.Context, id string) (*ComposeT
// before we return "not found" — the cache may be stale or the previous refresh
// silently returned empty.
if strings.HasPrefix(id, remoteIDPrefix+":") {
- slog.InfoContext(ctx, "remote template not in cache, forcing registry refresh", "templateID", id, "cacheSize", len(templates))
+ slog.InfoContext(ctx, "remote template not in cache, forcing registry refresh", "templateId", id, "cacheSize", len(templates))
localTemplates, refreshErr := s.remoteTemplatesInternal(ctx, true)
if refreshErr != nil {
return nil, fmt.Errorf("template %q not found and registry refresh failed: %w", id, refreshErr)
@@ -836,7 +836,7 @@ func (s *TemplateService) enrichRemoteTemplateIcons(ctx context.Context, templat
composeContent, envContent, err := s.fetchRemoteTemplateFiles(groupCtx, &templates[idx])
if err != nil {
- slog.WarnContext(groupCtx, "failed to fetch remote template content for icon extraction", "templateID", templates[idx].ID, "error", err)
+ slog.WarnContext(groupCtx, "failed to fetch remote template content for icon extraction", "templateId", templates[idx].ID, "error", err)
setTemplateIconURL(&templates[idx], nil)
return nil
}
@@ -857,10 +857,10 @@ func (s *TemplateService) fetchURL(ctx context.Context, url string) (string, err
return string(body), nil
}
-func (s *TemplateService) newSafeHTTPClientInternal() *http.Client {
+func (s *TemplateService) newSafeHTTPClientInternal(ctx context.Context) *http.Client {
client, err := httpx.NewSafeOutboundHTTPClient(s.httpClient, s.lookupIP)
if err != nil {
- slog.Warn("failed to configure safe HTTP client", "error", err)
+ slog.WarnContext(ctx, "failed to configure safe HTTP client", "error", err)
return nil
}
return client
@@ -882,7 +882,7 @@ func (s *TemplateService) newSafeRequestInternal(ctx context.Context, method, ra
if client == nil {
s.registryMu.Lock()
if s.safeHTTPClient == nil {
- s.safeHTTPClient = s.newSafeHTTPClientInternal()
+ s.safeHTTPClient = s.newSafeHTTPClientInternal(ctx)
}
client = s.safeHTTPClient
s.registryMu.Unlock()
diff --git a/backend/internal/template/service_test.go b/backend/internal/template/service_test.go
index d38fe5f67..70a3f74aa 100644
--- a/backend/internal/template/service_test.go
+++ b/backend/internal/template/service_test.go
@@ -396,7 +396,7 @@ func TestGetTemplate_ForceRefreshesRemoteCacheOnMiss(t *testing.T) {
service := NewTemplateService(t.Context(), db, client, settingsSvc)
service.lookupIP = lookupIP
- service.safeHTTPClient = service.newSafeHTTPClientInternal()
+ service.safeHTTPClient = service.newSafeHTTPClientInternal(t.Context())
// Cache starts empty; GetTemplate for a remote ID should force a refresh and find the template.
got, err := service.GetTemplate(t.Context(), "remote:reg-1:affine")
diff --git a/backend/internal/updater/children/execution/service.go b/backend/internal/updater/children/execution/service.go
index 0639f97cb..b803368bb 100644
--- a/backend/internal/updater/children/execution/service.go
+++ b/backend/internal/updater/children/execution/service.go
@@ -473,7 +473,7 @@ func (s *Service) ActiveUpdateActivityIDs(ctx context.Context) ([]string, error)
for _, entry := range page.States {
// States are keyed by activity ID, so an undecodable entry is still protected.
if _, decodeErr := decodeSingleStateInternal(entry); decodeErr != nil {
- s.logger().WarnContext(ctx, "decode container update state", "activityID", entry.ActorID, "error", decodeErr)
+ s.logger().WarnContext(ctx, "decode container update state", "activityId", entry.ActorID, "error", decodeErr)
}
ids = append(ids, entry.ActorID)
}
diff --git a/backend/internal/updater/service.go b/backend/internal/updater/service.go
index 640fa5129..e850dd032 100644
--- a/backend/internal/updater/service.go
+++ b/backend/internal/updater/service.go
@@ -1397,7 +1397,7 @@ func (s *UpdaterService) collectUsedImagesFromContainersInternal(ctx context.Con
imageRef := strings.TrimSpace(summary.Image)
if imageRef != "" && !refs.IsImageIDLikeReference(imageRef) {
- addNormalizedImageUpdateRefInternal(ctx, out, imageRef, "collectUsedImagesFromContainers: skipping invalid image reference", "containerId", summary.ID)
+ addNormalizedImageUpdateRefInternal(ctx, out, imageRef, "collectUsedImagesFromContainers", "containerId", summary.ID)
continue
}
@@ -1435,7 +1435,7 @@ func (s *UpdaterService) collectUsedImagesFromComposeContainersInternal(ctx cont
if imageRef == "" || refs.IsImageIDLikeReference(imageRef) {
continue
}
- addNormalizedImageUpdateRefInternal(ctx, out, imageRef, "collectUsedImagesFromComposeContainers: skipping invalid image reference", "containerId", summary.ID)
+ addNormalizedImageUpdateRefInternal(ctx, out, imageRef, "collectUsedImagesFromComposeContainers", "containerId", summary.ID)
}
}
@@ -1448,13 +1448,13 @@ func (s *UpdaterService) normalizedTagsForContainerInternal(ctx context.Context,
if strings.TrimSpace(tag) == "" || tag == "<none>:<none>" {
continue
}
- addNormalizedImageUpdateRefInternal(ctx, seen, tag, "normalizedTagsForContainer: skipping invalid repo tag", "imageId", inspect.Image)
+ addNormalizedImageUpdateRefInternal(ctx, seen, tag, "normalizedTagsForContainer repo tag", "imageId", inspect.Image)
}
}
}
if inspect.Config != nil && inspect.Config.Image != "" {
- addNormalizedImageUpdateRefInternal(ctx, seen, inspect.Config.Image, "normalizedTagsForContainer: skipping invalid config image reference", "imageId", inspect.Image)
+ addNormalizedImageUpdateRefInternal(ctx, seen, inspect.Config.Image, "normalizedTagsForContainer config image", "imageId", inspect.Image)
}
out := slices.Collect(maps.Keys(seen))
@@ -1522,7 +1522,7 @@ func activeComposeProjectNameSetInternal(items []projectpkg.Project) map[string]
return active
}
-func addNormalizedImageUpdateRefInternal(ctx context.Context, out map[string]struct{}, imageRef, logMessage string, attrs ...any) {
+func addNormalizedImageUpdateRefInternal(ctx context.Context, out map[string]struct{}, imageRef, source string, attrs ...any) {
normalizedRef := refs.NormalizeImageUpdateRef(imageRef)
if normalizedRef != "" {
out[normalizedRef] = struct{}{}
@@ -1530,12 +1530,8 @@ func addNormalizedImageUpdateRefInternal(ctx context.Context, out map[string]str
}
args := slices.Clone(attrs)
- args = append(args, "imageRef", imageRef)
- if ctx != nil {
- slog.DebugContext(ctx, logMessage, args...)
- return
- }
- slog.Debug(logMessage, args...)
+ args = append(args, "source", source, "imageRef", imageRef)
+ slog.DebugContext(ctx, "skipping invalid image reference", args...)
}
func (s *UpdaterService) tagFrozenPullInternal(ctx context.Context, pulledRef, imageRef string) error {
diff --git a/backend/internal/user/service.go b/backend/internal/user/service.go
index 122249c18..7d25716e9 100644
--- a/backend/internal/user/service.go
+++ b/backend/internal/user/service.go
@@ -528,7 +528,7 @@ func (s *UserService) grantDefaultAdminRoleInternal(ctx context.Context, adminUs
if setUserAssignmentsErr := s.roleService.SetUserAssignments(ctx, adminUserID, manual); setUserAssignmentsErr != nil {
return fmt.Errorf("failed to grant default admin global role: %w", setUserAssignmentsErr)
}
- slog.InfoContext(ctx, "Default admin granted global Admin role assignment", "user_id", adminUserID)
+ slog.InfoContext(ctx, "Default admin granted global Admin role assignment", "userId", adminUserID)
return nil
}
@@ -696,7 +696,7 @@ func permissionSetToMap(ps *authz.PermissionSet) map[string][]string {
}
func (s *UserService) GetUser(ctx context.Context, userID string) (*User, error) {
- slog.Debug("GetUser called", "user_id", userID)
+ slog.DebugContext(ctx, "GetUser called", "userId", userID)
return s.getUserInternal(ctx, userID, s.db.DB)
}
diff --git a/backend/internal/variable/service.go b/backend/internal/variable/service.go
index 310a9f14b..c78d06364 100644
--- a/backend/internal/variable/service.go
+++ b/backend/internal/variable/service.go
@@ -289,7 +289,7 @@ func (s *VariableService) resolveEffectiveVariablesInternal(ctx context.Context,
decrypted, decryptErr := crypto.Decrypt(value)
if decryptErr != nil {
slog.WarnContext(ctx, "Failed to decrypt global variable for sync; skipping",
- "variable_id", variable.ID, "key", variable.Key, "error", decryptErr)
+ "variableId", variable.ID, "key", variable.Key, "error", decryptErr)
continue
}
value = decrypted
@@ -412,7 +412,7 @@ func (s *VariableService) syncEnvironmentsInternal(ctx context.Context, envIDs [
syncCtx, cancel := context.WithTimeout(ctx, variableSyncTimeout)
defer cancel()
if err := s.SyncEnvironment(syncCtx, envID); err != nil {
- slog.WarnContext(syncCtx, "Failed to sync global variables to environment", "environment_id", envID, "error", err)
+ slog.WarnContext(syncCtx, "Failed to sync global variables to environment", "environmentId", envID, "error", err)
}
})
}
@@ -679,7 +679,7 @@ func (s *VariableService) importVariablesInternal(ctx context.Context, vars []en
return fmt.Errorf("failed to import legacy variable %q: %w", key, transactionErr)
}
covered[key] = true
- slog.InfoContext(ctx, "Imported legacy global variable", "key", key, "environment_id", scopeEnvID)
+ slog.InfoContext(ctx, "Imported legacy global variable", "key", key, "environmentId", scopeEnvID)
}
return nil
diff --git a/backend/internal/version/service.go b/backend/internal/version/service.go
index bb0f299ed..c97f90b04 100644
--- a/backend/internal/version/service.go
+++ b/backend/internal/version/service.go
@@ -384,7 +384,7 @@ func (s *VersionService) storedOrDigestBasedUpdateInternal(ctx context.Context,
if s.imageUpdateService != nil && strings.TrimSpace(currentImageID) != "" && checkImageRef == currentImageRef {
record, found, err := s.imageUpdateService.StoredUpdateByImageID(ctx, currentImageID)
if err != nil {
- slog.WarnContext(ctx, "Failed to read stored Arcane image update state", "imageID", currentImageID, "error", err)
+ slog.WarnContext(ctx, "Failed to read stored Arcane image update state", "imageId", currentImageID, "error", err)
} else if found {
return record.HasUpdate, mo.PointerToOption(record.LatestDigest).OrEmpty()
}
@@ -400,26 +400,26 @@ func (s *VersionService) storedOrDigestBasedUpdateInternal(ctx context.Context,
// detectCurrentImageInfo attempts to detect the current container's image tag and digest
func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, digest, imageRef, imageID string) {
if s.dockerService == nil {
- slog.Debug("detectCurrentImageInfo: dockerService is nil")
+ slog.DebugContext(ctx, "detectCurrentImageInfo: dockerService is nil")
return "", "", "", ""
}
dockerClient, err := s.dockerService.GetClient(ctx)
if err != nil {
- slog.Debug("detectCurrentImageInfo: failed to get docker client", "error", err)
+ slog.DebugContext(ctx, "detectCurrentImageInfo: failed to get docker client", "error", err)
return "", "", "", ""
}
containerId := s.detectContainerID(ctx, dockerClient)
if containerId == "" {
- slog.Debug("detectCurrentImageInfo: could not detect container ID")
+ slog.DebugContext(ctx, "detectCurrentImageInfo: could not detect container ID")
return "", "", "", ""
}
- slog.Debug("detectCurrentImageInfo: detected container", "containerId", containerId)
+ slog.DebugContext(ctx, "detectCurrentImageInfo: detected container", "containerId", containerId)
inspectResult, err := compat.ContainerInspectWithCompatibility(ctx, dockerClient, containerId, client.ContainerInspectOptions{})
if err != nil {
- slog.Debug("detectCurrentImageInfo: failed to inspect container", "containerId", containerId, "error", err)
+ slog.DebugContext(ctx, "detectCurrentImageInfo: failed to inspect container", "containerId", containerId, "error", err)
return "", "", "", ""
}
container := inspectResult.Container
@@ -448,10 +448,10 @@ func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag, diges
func (s *VersionService) detectContainerID(ctx context.Context, dockerClient *client.Client) string {
containerId, err := s.getCurrentContainerID()
if err == nil {
- slog.Debug("detectContainerID: found via getCurrentContainerID", "containerId", containerId)
+ slog.DebugContext(ctx, "detectContainerID: found via getCurrentContainerID", "containerId", containerId)
return containerId
}
- slog.Debug("detectContainerID: getCurrentContainerID failed, trying label fallback", "error", err)
+ slog.DebugContext(ctx, "detectContainerID: getCurrentContainerID failed, trying label fallback", "error", err)
// Fallback: locate the Arcane container by label (works even when cgroup/hostname detection fails)
return libarcane.FindArcaneContainerIDByLabel(ctx, dockerClient)
diff --git a/backend/internal/volume/children/backup/children/policies/handler.go b/backend/internal/volume/children/backup/children/policies/handler.go
index dcbcd1703..aed3da381 100644
--- a/backend/internal/volume/children/backup/children/policies/handler.go
+++ b/backend/internal/volume/children/backup/children/policies/handler.go
@@ -114,7 +114,7 @@ func (h *Handler) UpdateBackupPolicy(ctx context.Context, input *UpdateVolumeBac
errorStatus = http.StatusBadGateway
return fmt.Errorf("failed to synchronize S3 destinations to environment: %w", syncErr)
}
- slog.WarnContext(activityCtx, "S3 destination sync failed before local-only volume backup policy write", "environment_id", input.EnvironmentID, "error", syncErr)
+ slog.WarnContext(activityCtx, "S3 destination sync failed before local-only volume backup policy write", "environmentId", input.EnvironmentID, "error", syncErr)
}
remotePath := fmt.Sprintf("/api/environments/0/volumes/%s/backup-policy", url.PathEscape(input.VolumeName))
var proxyErr error
diff --git a/backend/internal/volume/children/backup/children/policies/service.go b/backend/internal/volume/children/backup/children/policies/service.go
index 7eec702f4..46ff57cb5 100644
--- a/backend/internal/volume/children/backup/children/policies/service.go
+++ b/backend/internal/volume/children/backup/children/policies/service.go
@@ -214,7 +214,7 @@ func (s *Service) runScheduledBackupInternal(ctx context.Context, policyID strin
slog.ErrorContext(ctx, "Scheduled volume backup failed", "volume", policy.VolumeName, "error", err)
return scheduler.Outcome{}, err
}
- slog.InfoContext(ctx, "Scheduled volume backup completed", "volume", policy.VolumeName, "backup_id", entry.ID, "remote_snapshot_id", entry.RemoteSnapshotID)
+ slog.InfoContext(ctx, "Scheduled volume backup completed", "volume", policy.VolumeName, "backupId", entry.ID, "remoteSnapshotId", entry.RemoteSnapshotID)
if remoteDisabled {
return scheduler.Outcome{Status: scheduler.Partial, ActivityID: activityID, Message: backup.RemoteDisabledMessage}, nil
}
diff --git a/backend/internal/volume/children/backup/children/restore/service.go b/backend/internal/volume/children/backup/children/restore/service.go
index 12690b7de..923cc863e 100644
--- a/backend/internal/volume/children/backup/children/restore/service.go
+++ b/backend/internal/volume/children/backup/children/restore/service.go
@@ -467,7 +467,7 @@ func (s *Service) restoreArchiveBackupFilesInternal(ctx context.Context, dockerC
return fmt.Errorf("failed to restore files: %w", err)
}
if strings.TrimSpace(stderr) != "" {
- slog.DebugContext(ctx, "volume service: restore files stderr", "backup_id", backupID, "stderr", strings.TrimSpace(stderr))
+ slog.DebugContext(ctx, "volume service: restore files stderr", "backupId", backupID, "stderr", strings.TrimSpace(stderr))
}
return nil
}
diff --git a/backend/internal/volume/children/backup/helpers.go b/backend/internal/volume/children/backup/helpers.go
index 121e28a5e..66ba1d9e9 100644
--- a/backend/internal/volume/children/backup/helpers.go
+++ b/backend/internal/volume/children/backup/helpers.go
@@ -54,7 +54,7 @@ type backupStorageMountInternal struct {
requiresEnsure bool
}
-func resolveBackupStorageMountFromMountsInternal(mounts []container.MountPoint, target string, readOnly bool) mo.Option[backupStorageMountInternal] {
+func resolveBackupStorageMountFromMountsInternal(ctx context.Context, mounts []container.MountPoint, target string, readOnly bool) mo.Option[backupStorageMountInternal] {
mirroredMount := docker.MountForDestination(mounts, "/backups", target)
if mirroredMount == nil {
return mo.None[backupStorageMountInternal]()
@@ -62,7 +62,7 @@ func resolveBackupStorageMountFromMountsInternal(mounts []container.MountPoint,
// MountForDestination only returns non-nil for bind and named volume mounts.
if !readOnly && mirroredMount.ReadOnly {
- slog.Warn("volume service: requested writable backup mount but source is read-only; writes may fail")
+ slog.WarnContext(ctx, "volume service: requested writable backup mount but source is read-only; writes may fail")
}
mirroredMount.ReadOnly = readOnly
@@ -77,7 +77,7 @@ func (s *Service) resolveBackupStorageMountInternal(ctx context.Context, dockerC
inspect, err := libarcane.InspectCurrentArcaneContainer(ctx, dockerClient)
if err != nil {
slog.WarnContext(ctx, "volume service: failed to inspect arcane container for backup mount resolution, falling back to named volume", "error", err.Error())
- } else if resolved, ok := resolveBackupStorageMountFromMountsInternal(inspect.Mounts, target, readOnly).Get(); ok {
+ } else if resolved, ok := resolveBackupStorageMountFromMountsInternal(ctx, inspect.Mounts, target, readOnly).Get(); ok {
return resolved
}
}
@@ -108,8 +108,8 @@ func backupMountWarningForStorageInternal(storage backupStorageMountInternal) st
return kit.Ternary(storage.mode == backupStorageModeArcaneMount, "", backupMountMissingWarning)
}
-func backupMountWarningFromArcaneMountsInternal(mounts []container.MountPoint) string {
- backupStorage, ok := resolveBackupStorageMountFromMountsInternal(mounts, "/backups", true).Get()
+func backupMountWarningFromArcaneMountsInternal(ctx context.Context, mounts []container.MountPoint) string {
+ backupStorage, ok := resolveBackupStorageMountFromMountsInternal(ctx, mounts, "/backups", true).Get()
if ok {
return backupMountWarningForStorageInternal(backupStorage)
}
@@ -137,7 +137,7 @@ func (s *Service) backupMountWarningInternal(ctx context.Context) string {
return ""
}
- return backupMountWarningFromArcaneMountsInternal(inspect.Mounts)
+ return backupMountWarningFromArcaneMountsInternal(ctx, inspect.Mounts)
}
// StorageMount resolves the backup repository mount shared with system-backup and workspace operations.
@@ -150,7 +150,7 @@ func (s *Service) StorageMount(ctx context.Context, dockerClient *client.Client,
}
func (s *Service) ensureBackupVolumeInternal(ctx context.Context) error {
- slog.DebugContext(ctx, "volume service: ensure backup volume", "backup_volume", s.deps.BackupVolumeName)
+ slog.DebugContext(ctx, "volume service: ensure backup volume", "backupVolume", s.deps.BackupVolumeName)
dockerClient, err := s.deps.Docker.GetClient(ctx)
if err != nil {
return err
@@ -263,7 +263,7 @@ func (s *Service) startContainersAfterBackupInternal(ctx context.Context, docker
}
if current.State == container.StateRunning || current.State == container.StateRestarting {
if current.ID != stopped.ID {
- slog.InfoContext(ctx, "volume service: container was replaced during backup and is already running", "previous_container", stopped.ID, "current_container", current.ID)
+ slog.InfoContext(ctx, "volume service: container was replaced during backup and is already running", "previousContainer", stopped.ID, "currentContainer", current.ID)
}
continue
}
@@ -273,7 +273,7 @@ func (s *Service) startContainersAfterBackupInternal(ctx context.Context, docker
continue
}
if current.ID != stopped.ID {
- slog.InfoContext(ctx, "volume service: restarted replacement container after backup", "previous_container", stopped.ID, "current_container", current.ID)
+ slog.InfoContext(ctx, "volume service: restarted replacement container after backup", "previousContainer", stopped.ID, "currentContainer", current.ID)
}
}
remaining = nextRemaining
@@ -483,7 +483,7 @@ func (s *Service) createBackupTempContainerWithMountInternal(ctx context.Context
}
func (s *Service) createBackupTempContainerInternal(ctx context.Context, dockerClient *client.Client, target string, readOnly bool) (string, func(), error) {
- slog.DebugContext(ctx, "volume service: create backup temp container", "target", target, "read_only", readOnly)
+ slog.DebugContext(ctx, "volume service: create backup temp container", "target", target, "readOnly", readOnly)
var err error
if dockerClient == nil {
dockerClient, err = s.deps.Docker.GetClient(ctx)
diff --git a/backend/internal/volume/children/backup/helpers_test.go b/backend/internal/volume/children/backup/helpers_test.go
index 6ecd50e09..2ab24dbd5 100644
--- a/backend/internal/volume/children/backup/helpers_test.go
+++ b/backend/internal/volume/children/backup/helpers_test.go
@@ -99,7 +99,7 @@ func TestResolveBackupStorageMountFromMountsInternal(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, ok := resolveBackupStorageMountFromMountsInternal(tt.mounts, tt.target, tt.readOnly).Get()
+ got, ok := resolveBackupStorageMountFromMountsInternal(t.Context(), tt.mounts, tt.target, tt.readOnly).Get()
require.Equal(t, tt.wantResolved, ok)
if !tt.wantResolved {
return
@@ -184,7 +184,7 @@ func TestBackupMountWarningFromArcaneMountsInternal(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- require.Equal(t, tt.want, backupMountWarningFromArcaneMountsInternal(tt.mounts))
+ require.Equal(t, tt.want, backupMountWarningFromArcaneMountsInternal(t.Context(), tt.mounts))
})
}
}
diff --git a/backend/internal/volume/children/backup/service.go b/backend/internal/volume/children/backup/service.go
index a20a1e181..e72511b83 100644
--- a/backend/internal/volume/children/backup/service.go
+++ b/backend/internal/volume/children/backup/service.go
@@ -956,14 +956,14 @@ func (s *Service) deleteArchiveBackupInternal(ctx context.Context, entry *volume
}
containerID, cleanup, err := s.createBackupTempContainerInternal(ctx, nil, "/volume", false)
if err != nil {
- slog.WarnContext(ctx, "failed to create container for backup file cleanup", "backup_id", backupID, "error", err.Error())
+ slog.WarnContext(ctx, "failed to create container for backup file cleanup", "backupId", backupID, "error", err.Error())
} else {
defer cleanup()
filename, filenameErr := backupArchiveFilenameInternal(backupID)
if filenameErr != nil {
- slog.WarnContext(ctx, "failed to sanitize backup id for file cleanup", "backup_id", backupID, "error", filenameErr.Error())
+ slog.WarnContext(ctx, "failed to sanitize backup id for file cleanup", "backupId", backupID, "error", filenameErr.Error())
} else if _, _, err = s.deps.Exec(ctx, containerID, "", []string{"rm", "-f", path.Join("/volume", filename)}); err != nil {
- slog.WarnContext(ctx, "failed to delete backup file (orphan file may remain)", "backup_id", backupID, "error", err.Error())
+ slog.WarnContext(ctx, "failed to delete backup file (orphan file may remain)", "backupId", backupID, "error", err.Error())
}
}
s.logBackupDeleteEventInternal(ctx, volumeName, backupID, user)
diff --git a/backend/internal/volume/children/workspace/service.go b/backend/internal/volume/children/workspace/service.go
index 7d362de39..f3971a5e7 100644
--- a/backend/internal/volume/children/workspace/service.go
+++ b/backend/internal/volume/children/workspace/service.go
@@ -80,7 +80,7 @@ func (s *Service) GetVolumeWorkspace(ctx context.Context, volumeName string) (*w
totalStartedAt := time.Now()
defer func() {
- slog.DebugContext(ctx, "volume workspace load completed", "volume", volumeName, "total_duration", time.Since(totalStartedAt))
+ slog.DebugContext(ctx, "volume workspace load completed", "volume", volumeName, "totalDuration", time.Since(totalStartedAt))
}()
inspectionStartedAt := time.Now()
@@ -98,7 +98,7 @@ func (s *Service) GetVolumeWorkspace(ctx context.Context, volumeName string) (*w
if requireVolumeHelperACFSErr := s.deps.RequireACFS(ctx, volumeName, containerID); requireVolumeHelperACFSErr != nil {
return nil, requireVolumeHelperACFSErr
}
- slog.DebugContext(ctx, "volume workspace helper acquired", "volume", volumeName, "container_id", containerID, "duration", time.Since(helperStartedAt))
+ slog.DebugContext(ctx, "volume workspace helper acquired", "volume", volumeName, "containerId", containerID, "duration", time.Since(helperStartedAt))
scanStartedAt := time.Now()
tree, err := s.readVolumeWorkspaceFromContainerInternal(ctx, containerID)
@@ -110,7 +110,7 @@ func (s *Service) GetVolumeWorkspace(ctx context.Context, volumeName string) (*w
"volume workspace tree scan completed",
"volume",
volumeName,
- "file_count",
+ "fileCount",
len(
tree.Files,
),
@@ -493,7 +493,7 @@ func (
) {
totalStartedAt := time.Now()
defer func() {
- slog.DebugContext(ctx, "volume workspace update completed", "volume", volumeName, "file_change_count", len(manifest.FileChanges), "total_duration", time.Since(totalStartedAt))
+ slog.DebugContext(ctx, "volume workspace update completed", "volume", volumeName, "fileChangeCount", len(manifest.FileChanges), "totalDuration", time.Since(totalStartedAt))
}()
if err := workspacepkg.ValidateUpdateManifest(manifest.FileTreeRevision, len(manifest.FileChanges), 500); err != nil {
@@ -528,7 +528,7 @@ func (
if requireVolumeHelperACFSErr := s.deps.RequireACFS(ctx, volumeName, containerID); requireVolumeHelperACFSErr != nil {
return nil, requireVolumeHelperACFSErr
}
- slog.DebugContext(ctx, "volume workspace mutation helper acquired", "volume", volumeName, "container_id", containerID, "dedicated", needsBackups, "duration", time.Since(helperStartedAt))
+ slog.DebugContext(ctx, "volume workspace mutation helper acquired", "volume", volumeName, "containerId", containerID, "dedicated", needsBackups, "duration", time.Since(helperStartedAt))
revisionScanStartedAt := time.Now()
current, err := s.readVolumeWorkspaceFromContainerInternal(ctx, containerID)
@@ -540,7 +540,7 @@ func (
"volume workspace revision tree scan completed",
"volume",
volumeName,
- "file_count",
+ "fileCount",
len(
current.Files,
),
@@ -565,7 +565,7 @@ func (
if err != nil {
return nil, err
}
- slog.DebugContext(ctx, "volume workspace staging completed", "volume", volumeName, "staged_file_count", len(stagedFiles), "duration", time.Since(stagingStartedAt))
+ slog.DebugContext(ctx, "volume workspace staging completed", "volume", volumeName, "stagedFileCount", len(stagedFiles), "duration", time.Since(stagingStartedAt))
backupStartedAt := time.Now()
scope, err := volumeWorkspaceBackupScopeInternal(manifest.FileChanges)
@@ -581,7 +581,7 @@ func (
if err != nil {
return nil, err
}
- slog.DebugContext(ctx, "volume workspace backup completed", "volume", volumeName, "scope_count", len(scope), "duration", time.Since(backupStartedAt))
+ slog.DebugContext(ctx, "volume workspace backup completed", "volume", volumeName, "scopeCount", len(scope), "duration", time.Since(backupStartedAt))
applyStartedAt := time.Now()
if applyVolumeWorkspaceChangesErr := s.applyVolumeWorkspaceChangesInternal(
@@ -596,7 +596,7 @@ func (
); applyVolumeWorkspaceChangesErr != nil {
return nil, applyVolumeWorkspaceChangesErr
}
- slog.DebugContext(ctx, "volume workspace changes applied", "volume", volumeName, "file_change_count", len(manifest.FileChanges), "duration", time.Since(applyStartedAt))
+ slog.DebugContext(ctx, "volume workspace changes applied", "volume", volumeName, "fileChangeCount", len(manifest.FileChanges), "duration", time.Since(applyStartedAt))
finalScanStartedAt := time.Now()
tree, err := s.readVolumeWorkspaceFromContainerInternal(ctx, containerID)
@@ -608,7 +608,7 @@ func (
"volume workspace final tree scan completed",
"volume",
volumeName,
- "file_count",
+ "fileCount",
len(
tree.Files,
),
@@ -670,7 +670,7 @@ func (s *Service) resolveVolumeWorkspaceWriteIdentityInternal(ctx context.Contex
if inspectErr != nil || inspect.Container.Config == nil {
// An uninspectable consumer could declare a conflicting user, so the identity is
// indeterminate; defer to the volume root's owner.
- slog.WarnContext(ctx, "could not inspect volume consumer; using volume root owner for workspace writes", "volume", volumeName, "container_id", consumerID)
+ slog.WarnContext(ctx, "could not inspect volume consumer; using volume root owner for workspace writes", "volume", volumeName, "containerId", consumerID)
identity = volumeWorkspaceWriteIdentityInternal{}
break
}
@@ -692,7 +692,7 @@ func (s *Service) resolveVolumeWorkspaceWriteIdentityInternal(ctx context.Contex
volumeName,
"identity",
identity.execUser,
- "conflicting_identity",
+ "conflictingIdentity",
parsed.execUser,
)
identity = volumeWorkspaceWriteIdentityInternal{}
@@ -700,7 +700,7 @@ func (s *Service) resolveVolumeWorkspaceWriteIdentityInternal(ctx context.Contex
}
}
if identity.execUser != "" {
- slog.InfoContext(ctx, "volume workspace writes run as container user", "volume", volumeName, "identity", identity.execUser, "source_container_id", identitySource)
+ slog.InfoContext(ctx, "volume workspace writes run as container user", "volume", volumeName, "identity", identity.execUser, "sourceContainerId", identitySource)
return identity
}
// PUID-style images drop privileges after start, so Config.User stays empty; the owner of the
diff --git a/backend/internal/volume/helpers.go b/backend/internal/volume/helpers.go
index f6f292ba3..4d45586f9 100644
--- a/backend/internal/volume/helpers.go
+++ b/backend/internal/volume/helpers.go
@@ -359,7 +359,7 @@ func (s *VolumeService) CleanupHelperContainers(ctx context.Context) {
for _, containerID := range helperIDs {
if _, containerRemoveErr := dockerClient.ContainerRemove(ctx, containerID, volumehelper.RemoveOptions()); containerRemoveErr != nil {
- slog.WarnContext(ctx, "failed to remove helper container", "container_id", containerID, "error", containerRemoveErr.Error())
+ slog.WarnContext(ctx, "failed to remove helper container", "containerId", containerID, "error", containerRemoveErr.Error())
}
}
}
@@ -384,7 +384,7 @@ func (s *VolumeService) ReapIdleHelpers(ctx context.Context, idleTimeout time.Du
removed := 0
for _, containerID := range staleIDs {
if _, containerRemoveErr := dockerClient.ContainerRemove(ctx, containerID, volumehelper.RemoveOptions()); containerRemoveErr != nil {
- slog.WarnContext(ctx, "failed to remove idle helper container", "container_id", containerID, "error", containerRemoveErr.Error())
+ slog.WarnContext(ctx, "failed to remove idle helper container", "containerId", containerID, "error", containerRemoveErr.Error())
continue
}
removed++
@@ -482,8 +482,8 @@ func (s *VolumeService) CleanupOrphanedVolumeHelpers(ctx context.Context) (int,
slog.WarnContext(
ctx,
"volume service: failed to remove orphaned volume helper container",
- "container_id", c.ID,
- "container_names", c.Names,
+ "containerId", c.ID,
+ "containerNames", c.Names,
"error", containerRemoveErr.Error(),
)
continue
@@ -505,7 +505,7 @@ func (s *VolumeService) removeHelperEntry(volumeName string) {
}
func (s *VolumeService) execInContainerInternal(ctx context.Context, containerID, execUser string, cmd []string) (string, string, error) {
- slog.DebugContext(ctx, "volume service: exec in container", "container_id", containerID, "user", execUser, "cmd", cmd)
+ slog.DebugContext(ctx, "volume service: exec in container", "containerId", containerID, "user", execUser, "cmd", cmd)
dockerClient, err := s.dockerService.GetClient(ctx)
if err != nil {
return "", "", err
diff --git a/backend/internal/volume/service.go b/backend/internal/volume/service.go
index be2116aaa..800674b8e 100644
--- a/backend/internal/volume/service.go
+++ b/backend/internal/volume/service.go
@@ -84,7 +84,6 @@ func NewVolumeService(
cfg *config.Config,
recoveryKeys *backup.RecoveryKeyStore,
) *VolumeService {
- slog.Debug("volume service: new")
backupVolumeName := ""
encryptionKey := ""
workspaceMaxDepth := 50
@@ -375,7 +374,7 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*volu
for _, uv := range usageVolumes {
if uv.Name == vol.Name && uv.UsageData != nil {
vol.UsageData = uv.UsageData
- slog.DebugContext(ctx, "attached volume usage data", "volume", vol.Name, "size_bytes", uv.UsageData.Size, "ref_count", uv.UsageData.RefCount)
+ slog.DebugContext(ctx, "attached volume usage data", "volume", vol.Name, "sizeBytes", uv.UsageData.Size, "refCount", uv.UsageData.RefCount)
break
}
}
@@ -874,7 +873,7 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat
params.Start,
"limit",
params.Limit,
- "include_internal",
+ "includeInternal",
includeInternal,
)
dockerClient, err := s.dockerService.GetClient(ctx)
@@ -962,21 +961,21 @@ func (s *VolumeService) ListVolumesPaginated(ctx context.Context, params paginat
paginationResp := pagination.BuildResponse(result.TotalCount, result.TotalAvailable, effectiveParams)
slog.DebugContext(
ctx, "volume service: listed volumes",
- "docker_host", dockerClient.DaemonHost(),
- "requested_sort", params.Sort,
- "requested_order", params.Order,
- "effective_sort", effectiveParams.Sort,
- "effective_order", effectiveParams.Order,
- "usage_cache_snapshot", usageCacheSnapshot,
- "docker_volumes", len(volResult.volumes),
- "usage_volumes", len(usageVolumes),
- "included_volumes", len(items),
- "matched_volumes", result.TotalCount,
- "returned_volumes", len(result.Items),
- "container_volume_count", len(volumeContainerMap),
- "filter_count", len(params.Filters),
- "current_page", paginationResp.CurrentPage,
- "total_pages", paginationResp.TotalPages,
+ "dockerHost", dockerClient.DaemonHost(),
+ "requestedSort", params.Sort,
+ "requestedOrder", params.Order,
+ "effectiveSort", effectiveParams.Sort,
+ "effectiveOrder", effectiveParams.Order,
+ "usageCacheSnapshot", usageCacheSnapshot,
+ "dockerVolumes", len(volResult.volumes),
+ "usageVolumes", len(usageVolumes),
+ "includedVolumes", len(items),
+ "matchedVolumes", result.TotalCount,
+ "returnedVolumes", len(result.Items),
+ "containerVolumeCount", len(volumeContainerMap),
+ "filterCount", len(params.Filters),
+ "currentPage", paginationResp.CurrentPage,
+ "totalPages", paginationResp.TotalPages,
"duration", time.Since(startedAt),
)
diff --git a/backend/internal/vulnerability/children/ignores/service.go b/backend/internal/vulnerability/children/ignores/service.go
index e75c73969..1dd31d7cd 100644
--- a/backend/internal/vulnerability/children/ignores/service.go
+++ b/backend/internal/vulnerability/children/ignores/service.go
@@ -121,9 +121,9 @@ func (s *Service) IgnoreVulnerability(ctx context.Context, envID string, payload
}
slog.InfoContext(ctx, "vulnerability ignored",
- "vulnerability_id", payload.VulnerabilityID,
- "image_id", payload.ImageID,
- "pkg_name", payload.PkgName,
+ "vulnerabilityId", payload.VulnerabilityID,
+ "imageId", payload.ImageID,
+ "pkgName", payload.PkgName,
)
return &created[0], nil
@@ -147,7 +147,7 @@ func (s *Service) UnignoreVulnerability(ctx context.Context, envID, ignoreID str
return fmt.Errorf("failed to delete ignore record: %w", deleteErr)
}
- slog.InfoContext(ctx, "vulnerability unignored", "ignore_id", ignoreID)
+ slog.InfoContext(ctx, "vulnerability unignored", "ignoreId", ignoreID)
return nil
}
@@ -198,7 +198,7 @@ func (s *Service) BulkIgnoreVulnerabilities(ctx context.Context, envID string, f
return 0, err
}
- slog.InfoContext(ctx, "vulnerabilities ignored in bulk", "environment_id", envID, "affected", len(ignores))
+ slog.InfoContext(ctx, "vulnerabilities ignored in bulk", "environmentId", envID, "affected", len(ignores))
return len(ignores), nil
}
@@ -229,7 +229,7 @@ func (s *Service) BulkUnignoreVulnerabilities(ctx context.Context, envID string,
return 0, err
}
- slog.InfoContext(ctx, "vulnerabilities unignored in bulk", "environment_id", envID, "affected", affected)
+ slog.InfoContext(ctx, "vulnerabilities unignored in bulk", "environmentId", envID, "affected", affected)
return int(affected), nil
}
diff --git a/backend/internal/vulnerability/children/scan/children/trivy/service.go b/backend/internal/vulnerability/children/scan/children/trivy/service.go
index c95650d49..1bf4edfcd 100644
--- a/backend/internal/vulnerability/children/scan/children/trivy/service.go
+++ b/backend/internal/vulnerability/children/scan/children/trivy/service.go
@@ -235,7 +235,7 @@ func (s *Service) SetupBatchContainers(ctx context.Context, count int) ([]string
containerIDs := make([]string, 0, max(count, 1))
cleanup := func() {
for _, containerID := range containerIDs {
- vuln.RemoveContainer(ctx, dockerClient, containerID, "failed to remove batch trivy container")
+ vuln.RemoveContainer(ctx, dockerClient, containerID, "batch trivy container")
}
}
@@ -852,7 +852,7 @@ func (s *Service) createAndStartTrivyContainerInternal(
if copyFilesToContainerErr := vuln.CopyFilesToContainer(ctx, dockerClient, resp.ID, vuln.ContainerFilesDir, files); copyFilesToContainerErr != nil {
if files[vuln.TrivyConfigFile] != nil || files[vuln.TrivyIgnoreFile] != nil {
- vuln.RemoveContainer(ctx, dockerClient, resp.ID, "failed to cleanup trivy container after file copy failure")
+ vuln.RemoveContainer(ctx, dockerClient, resp.ID, "trivy container after file copy failure")
return "", fmt.Errorf("failed to copy scan files into container: %w", copyFilesToContainerErr)
}
// DOCKER_CONFIG may still point at the target directory. When the
@@ -879,7 +879,7 @@ func (s *Service) createAndStartTrivyContainerInternal(
"stderr", stderrLog,
)
- vuln.RemoveContainer(ctx, dockerClient, resp.ID, "failed to cleanup trivy container after start failure")
+ vuln.RemoveContainer(ctx, dockerClient, resp.ID, "trivy container after start failure")
return "", fmt.Errorf("failed to start container: %w", containerStartErr)
}
@@ -1000,7 +1000,7 @@ func (s *Service) runTrivyContainerInternal(
containerID := ""
defer func() {
if !success {
- vuln.RemoveContainer(ctx, dockerClient, containerID, "failed to cleanup trivy scan container")
+ vuln.RemoveContainer(ctx, dockerClient, containerID, "trivy scan container")
vuln.CleanupLogTempFiles(ctx, stdoutFile, stderrFile)
}
}()
@@ -1183,7 +1183,7 @@ func (s *Service) Scan(ctx context.Context, scannerImage, imageName, imageID str
return nil, err
}
defer vuln.CleanupLogTempFiles(ctx, containerResult.stdoutFile, containerResult.stderrFile)
- defer vuln.RemoveContainer(ctx, dockerClient, containerResult.containerID, "failed to cleanup trivy scan container")
+ defer vuln.RemoveContainer(ctx, dockerClient, containerResult.containerID, "trivy scan container")
if containerResult.statusCode != 0 {
errMsg := vuln.ReadTempFileExcerpt(containerResult.stderrFile)
diff --git a/backend/internal/vulnerability/children/scan/service.go b/backend/internal/vulnerability/children/scan/service.go
index 46f81e112..11bbe7194 100644
--- a/backend/internal/vulnerability/children/scan/service.go
+++ b/backend/internal/vulnerability/children/scan/service.go
@@ -269,7 +269,7 @@ func (s *Service) markStaleInternal(ctx context.Context, imageID string, status
}
if err := s.records.MarkFailed(ctx, imageID, errMsg, duration); err != nil {
- slog.WarnContext(ctx, "failed to mark stale scan as failed", "error", err, "scan_id", imageID)
+ slog.WarnContext(ctx, "failed to mark stale scan as failed", "error", err, "scanId", imageID)
}
return errMsg, duration, true
}
diff --git a/backend/internal/vulnerability/children/store/service.go b/backend/internal/vulnerability/children/store/service.go
index 5d68f31ce..ebc2d7793 100644
--- a/backend/internal/vulnerability/children/store/service.go
+++ b/backend/internal/vulnerability/children/store/service.go
@@ -122,7 +122,7 @@ func (s *Service) BackfillScanItems(ctx context.Context) {
err := s.records.EachMissingItems(ctx, listAllVulnerabilityRecordBatchSizeInternal, func(imageID, vulnerabilitiesJSON string) {
var vulns []vulnerability.Vulnerability
if err := json.Unmarshal([]byte(vulnerabilitiesJSON), &vulns); err != nil {
- slog.WarnContext(ctx, "failed to unmarshal vulnerabilities for backfill", "error", err, "image_id", imageID)
+ slog.WarnContext(ctx, "failed to unmarshal vulnerabilities for backfill", "error", err, "imageId", imageID)
return
}
if len(vulns) == 0 {
@@ -131,7 +131,7 @@ func (s *Service) BackfillScanItems(ctx context.Context) {
if withTxErr := dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {
return s.records.SaveItems(tx, imageID, vulns)
}); withTxErr != nil {
- slog.WarnContext(ctx, "failed to backfill vulnerability scan items", "error", withTxErr, "image_id", imageID)
+ slog.WarnContext(ctx, "failed to backfill vulnerability scan items", "error", withTxErr, "imageId", imageID)
}
})
if err != nil {
diff --git a/backend/internal/vulnerability/service.go b/backend/internal/vulnerability/service.go
index 73840d241..488bf67a2 100644
--- a/backend/internal/vulnerability/service.go
+++ b/backend/internal/vulnerability/service.go
@@ -190,7 +190,7 @@ func (s *VulnerabilityService) loadResultInternal(ctx context.Context, imageID s
return nil, fmt.Errorf("failed to get scan result: %w", err)
}
- result := convertRecordToResultInternal(&record)
+ result := convertRecordToResultInternal(ctx, &record)
s.scan.RefreshResult(ctx, result)
var reportCount int64
if countReportsErr := s.db.WithContext(ctx).Model(&VulnerabilityReportRecord{}).Where("image_id = ?", record.ID).Count(&reportCount).Error; countReportsErr == nil {
@@ -200,7 +200,7 @@ func (s *VulnerabilityService) loadResultInternal(ctx context.Context, imageID s
}
// convertRecordToResultInternal converts a database record to a ScanResult.
-func convertRecordToResultInternal(record *VulnerabilityScanRecord) *vulnerability.ScanResult {
+func convertRecordToResultInternal(ctx context.Context, record *VulnerabilityScanRecord) *vulnerability.ScanResult {
result := &vulnerability.ScanResult{
ImageID: record.ID,
ImageName: record.ImageName,
@@ -225,7 +225,7 @@ func convertRecordToResultInternal(record *VulnerabilityScanRecord) *vulnerabili
if len(record.Vulnerabilities) > 0 && record.Vulnerabilities[0] != "" {
var vulns []vulnerability.Vulnerability
if err := json.Unmarshal([]byte(record.Vulnerabilities[0]), &vulns); err != nil {
- slog.Warn("failed to unmarshal vulnerabilities", "error", err)
+ slog.WarnContext(ctx, "failed to unmarshal vulnerabilities", "error", err)
} else {
result.Vulnerabilities = vulns
}
diff --git a/backend/internal/webhook/service.go b/backend/internal/webhook/service.go
index 5aacd7c50..0925b36b9 100644
--- a/backend/internal/webhook/service.go
+++ b/backend/internal/webhook/service.go
@@ -523,12 +523,12 @@ func (s *WebhookService) TriggerByToken(ctx context.Context, rawToken string) er
s.actions.Go(func() {
defer func() {
if panicErr := utils.PanicToError(recover()); panicErr != nil {
- slog.ErrorContext(execCtx, "webhook action panicked", "webhookID", wh.ID, "webhookName", wh.Name, "actionType", actionType, "error", panicErr)
+ slog.ErrorContext(execCtx, "webhook action panicked", "webhookId", wh.ID, "webhookName", wh.Name, "actionType", actionType, "error", panicErr)
}
}()
if _, executeWebhookActionErr := s.executeWebhookActionInternal(execCtx, wh, actionType); executeWebhookActionErr != nil {
// Action failures are recorded as error events by wrapWebhookActionErrorInternal.
- slog.ErrorContext(execCtx, "webhook action failed", "webhookID", wh.ID, "webhookName", wh.Name, "actionType", actionType, "error", executeWebhookActionErr)
+ slog.ErrorContext(execCtx, "webhook action failed", "webhookId", wh.ID, "webhookName", wh.Name, "actionType", actionType, "error", executeWebhookActionErr)
return
}
s.logWebhookEventInternal(execCtx, wh, actionType, event.EventSeveritySuccess, "")
diff --git a/backend/pkg/dockerutil/log_stream.go b/backend/pkg/dockerutil/log_stream.go
index a6c83bc30..a8c4c2fee 100644
--- a/backend/pkg/dockerutil/log_stream.go
+++ b/backend/pkg/dockerutil/log_stream.go
@@ -54,7 +54,7 @@ func StreamMultiplexedLogs(ctx context.Context, logs io.Reader, logsChan chan<-
defer func() { _ = stderrWriter.Close() }()
_, err := stdcopy.StdCopy(stdoutWriter, stderrWriter, logs)
if err != nil && !errors.Is(err, io.EOF) && ctx.Err() == nil {
- slog.Error("error demultiplexing logs", "error", err)
+ slog.ErrorContext(ctx, "error demultiplexing logs", "error", err)
}
}()
diff --git a/backend/pkg/dockerutil/mount_utils.go b/backend/pkg/dockerutil/mount_utils.go
index bdf16bdeb..33a3f2495 100644
--- a/backend/pkg/dockerutil/mount_utils.go
+++ b/backend/pkg/dockerutil/mount_utils.go
@@ -218,7 +218,7 @@ func MountForDestination(mounts []container.MountPoint, destination, target stri
// PreserveVolumeMounts returns cloned binds and mounts with every inspected
// volume pinned to its name, so a recreate reuses it instead of a new anonymous one.
-func PreserveVolumeMounts(binds []string, mounts []mount.Mount, mountPoints []container.MountPoint) ([]string, []mount.Mount, error) {
+func PreserveVolumeMounts(ctx context.Context, binds []string, mounts []mount.Mount, mountPoints []container.MountPoint) ([]string, []mount.Mount, error) {
binds = slices.Clone(binds)
mounts = slices.Clone(mounts)
@@ -239,7 +239,7 @@ func PreserveVolumeMounts(binds []string, mounts []mount.Mount, mountPoints []co
if mounts[mountIndex].Type == mount.TypeVolume {
mounts[mountIndex].Source = volumeName
}
- slog.Info("Preserving volume via mount", "destination", destination, "volume", volumeName)
+ slog.InfoContext(ctx, "Preserving volume via mount", "destination", destination, "volume", volumeName)
continue
}
@@ -255,7 +255,7 @@ func PreserveVolumeMounts(binds []string, mounts []mount.Mount, mountPoints []co
if !strings.Contains(binds[bindIndex], ":") {
binds[bindIndex] = volumeName + ":" + binds[bindIndex]
}
- slog.Info("Preserving volume via bind", "destination", destination, "volume", volumeName)
+ slog.InfoContext(ctx, "Preserving volume via bind", "destination", destination, "volume", volumeName)
continue
}
@@ -264,7 +264,7 @@ func PreserveVolumeMounts(binds []string, mounts []mount.Mount, mountPoints []co
return nil, nil, fmt.Errorf("cannot build explicit mount for volume %s at %s", volumeName, destination)
}
mounts = append(mounts, *explicit)
- slog.Info("Preserving image-declared volume", "destination", destination, "volume", volumeName)
+ slog.InfoContext(ctx, "Preserving image-declared volume", "destination", destination, "volume", volumeName)
}
return binds, mounts, nil
}
diff --git a/backend/pkg/dockerutil/mount_utils_test.go b/backend/pkg/dockerutil/mount_utils_test.go
index 849c880c6..c699fd0e8 100644
--- a/backend/pkg/dockerutil/mount_utils_test.go
+++ b/backend/pkg/dockerutil/mount_utils_test.go
@@ -222,7 +222,7 @@ func TestPreserveVolumeMounts(t *testing.T) {
origBinds := append([]string(nil), tt.binds...)
origMounts := append([]mounttypes.Mount(nil), tt.mounts...)
- binds, mounts, err := PreserveVolumeMounts(tt.binds, tt.mounts, tt.points)
+ binds, mounts, err := PreserveVolumeMounts(t.Context(), tt.binds, tt.mounts, tt.points)
if tt.wantErr {
require.Error(t, err)
return
diff --git a/backend/pkg/dockerutil/volume_utils.go b/backend/pkg/dockerutil/volume_utils.go
index 8d0b1177a..d3d8cbce1 100644
--- a/backend/pkg/dockerutil/volume_utils.go
+++ b/backend/pkg/dockerutil/volume_utils.go
@@ -38,7 +38,7 @@ func GetVolumeUsageData(ctx context.Context, dockerClient *client.Client) ([]vol
key := volumeUsageCacheKeyInternal(dockerClient)
stale, staleFound := volumeUsageCache.Peek(key)
if cached, found, _ := volumeUsageCache.Get(key); found {
- slog.DebugContext(ctx, "returning cached volume usage data", "volume_count", len(cached), "docker_host", key)
+ slog.DebugContext(ctx, "returning cached volume usage data", "volumeCount", len(cached), "dockerHost", key)
return cached, nil
}
@@ -64,14 +64,14 @@ func GetVolumeUsageData(ctx context.Context, dockerClient *client.Client) ([]vol
select {
case <-ctx.Done():
if staleFound {
- slog.WarnContext(ctx, "volume usage refresh timed out; returning stale cache", "error", ctx.Err(), "volume_count", len(stale), "docker_host", key)
+ slog.WarnContext(ctx, "volume usage refresh timed out; returning stale cache", "error", ctx.Err(), "volumeCount", len(stale), "dockerHost", key)
return stale, nil
}
return nil, ctx.Err()
case refreshed := <-result:
if refreshed.err != nil {
if staleFound {
- slog.WarnContext(ctx, "volume usage refresh failed; returning stale cache", "error", refreshed.err, "volume_count", len(stale), "docker_host", key)
+ slog.WarnContext(ctx, "volume usage refresh failed; returning stale cache", "error", refreshed.err, "volumeCount", len(stale), "dockerHost", key)
return stale, nil
}
return nil, refreshed.err
@@ -94,19 +94,19 @@ func GetVolumeUsageDataStaleWhileRevalidate(ctx context.Context, dockerClient *c
cached, found := volumeUsageCache.Peek(key)
if fresh, freshFound, _ := volumeUsageCache.Get(key); freshFound {
slog.DebugContext(ctx, "volume usage cache lookup",
- "docker_host", key,
- "cache_state", "fresh",
- "volume_count", len(fresh),
- "refresh_requested", false,
+ "dockerHost", key,
+ "cacheState", "fresh",
+ "volumeCount", len(fresh),
+ "refreshRequested", false,
)
return mo.Some(fresh)
}
cacheState := kit.Ternary(found, "stale", "miss")
slog.DebugContext(ctx, "volume usage cache lookup",
- "docker_host", key,
- "cache_state", cacheState,
- "volume_count", len(cached),
- "refresh_requested", true,
+ "dockerHost", key,
+ "cacheState", cacheState,
+ "volumeCount", len(cached),
+ "refreshRequested", true,
)
refreshCtx, cancel := volumeUsageRefreshContextInternal(ctx)
go func() {
@@ -119,7 +119,7 @@ func GetVolumeUsageDataStaleWhileRevalidate(ctx context.Context, dockerClient *c
return map[string][]volume.Volume{key: loaded}, nil
})
if err != nil {
- slog.WarnContext(refreshCtx, "failed to refresh volume usage cache", "error", err, "docker_host", key)
+ slog.WarnContext(refreshCtx, "failed to refresh volume usage cache", "error", err, "dockerHost", key)
}
}()
if !found {
@@ -167,7 +167,7 @@ func fetchVolumeUsageDataInternal(ctx context.Context, dockerClient *client.Clie
return nil, fmt.Errorf("failed to get disk usage: %w", err)
}
- slog.DebugContext(ctx, "disk usage returned volumes", "volume_count", len(diskUsage.Volumes.Items))
+ slog.DebugContext(ctx, "disk usage returned volumes", "volumeCount", len(diskUsage.Volumes.Items))
return append([]volume.Volume{}, diskUsage.Volumes.Items...), nil
}
@@ -196,7 +196,7 @@ func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client,
}
containerIDs := FilterContainersUsingVolume(containerList.Items, volumeName)
- slog.DebugContext(ctx, "found containers using volume", "volume", volumeName, "container_count", len(containerIDs))
+ slog.DebugContext(ctx, "found containers using volume", "volume", volumeName, "containerCount", len(containerIDs))
return containerIDs, nil
}
diff --git a/backend/pkg/fswatch/watcher.go b/backend/pkg/fswatch/watcher.go
index 97d17dc5b..286d7f31b 100644
--- a/backend/pkg/fswatch/watcher.go
+++ b/backend/pkg/fswatch/watcher.go
@@ -101,7 +101,7 @@ func (fw *Watcher) Start(ctx context.Context) error {
return err
}
- if err := fw.addExistingDirectories(fw.watchedPath); err != nil {
+ if err := fw.addExistingDirectories(ctx, fw.watchedPath); err != nil {
slog.WarnContext(ctx, "Failed to add some existing directories to watcher",
"path", fw.watchedPath,
"error", err)
@@ -283,7 +283,7 @@ func (fw *Watcher) handleEventInternal(ctx context.Context, event fsnotify.Event
logicalName := fw.logicalPathForWatchEventInternal(event.Name)
if fw.isWatchableDirectory(event.Name) {
if fw.shouldWatchDir(logicalName) {
- if err := fw.addExistingDirectoriesRecursiveInternal(event.Name, logicalName, map[string]struct{}{}); err != nil {
+ if err := fw.addExistingDirectoriesRecursiveInternal(ctx, event.Name, logicalName, map[string]struct{}{}); err != nil {
slog.WarnContext(ctx, "Failed to add new directory to watcher",
"path", event.Name,
"error", err)
@@ -318,15 +318,15 @@ func (fw *Watcher) shouldHandleEventInternal(event fsnotify.Event) bool {
return projects.IsProjectFile(filepath.Base(event.Name))
}
-func (fw *Watcher) addExistingDirectories(root string) error {
- return fw.addExistingDirectoriesRecursiveInternal(root, root, map[string]struct{}{})
+func (fw *Watcher) addExistingDirectories(ctx context.Context, root string) error {
+ return fw.addExistingDirectoriesRecursiveInternal(ctx, root, root, map[string]struct{}{})
}
-func (fw *Watcher) addExistingDirectoriesRecursiveInternal(path, logicalPath string, ancestors map[string]struct{}) error {
+func (fw *Watcher) addExistingDirectoriesRecursiveInternal(ctx context.Context, path, logicalPath string, ancestors map[string]struct{}) error {
identity, err := projects.ResolveDirectoryIdentityInternal(path)
if err != nil {
if path != fw.watchedPath && errors.Is(err, os.ErrPermission) {
- slog.Warn("Skipping unreadable directory for watcher", "path", path, "error", err)
+ slog.WarnContext(ctx, "Skipping unreadable directory for watcher", "path", path, "error", err)
return nil
}
return err
@@ -347,7 +347,7 @@ func (fw *Watcher) addExistingDirectoriesRecursiveInternal(path, logicalPath str
return nil
}
- fw.addWatchPathInternal(path, logicalPath)
+ fw.addWatchPathInternal(ctx, path, logicalPath)
if fw.maxDepth > 0 && depth == fw.maxDepth {
return nil
@@ -357,7 +357,7 @@ func (fw *Watcher) addExistingDirectoriesRecursiveInternal(path, logicalPath str
entries, err := os.ReadDir(path)
if err != nil {
if path != fw.watchedPath && errors.Is(err, os.ErrPermission) {
- slog.Warn("Skipping unreadable directory for watcher", "path", path, "error", err)
+ slog.WarnContext(ctx, "Skipping unreadable directory for watcher", "path", path, "error", err)
return nil
}
return err
@@ -372,7 +372,7 @@ func (fw *Watcher) addExistingDirectoriesRecursiveInternal(path, logicalPath str
continue
}
childLogicalPath := filepath.Join(logicalPath, entry.Name())
- if addExistingDirectoriesRecursiveErr := fw.addExistingDirectoriesRecursiveInternal(childPath, childLogicalPath, ancestors); addExistingDirectoriesRecursiveErr != nil {
+ if addExistingDirectoriesRecursiveErr := fw.addExistingDirectoriesRecursiveInternal(ctx, childPath, childLogicalPath, ancestors); addExistingDirectoriesRecursiveErr != nil {
return addExistingDirectoriesRecursiveErr
}
}
@@ -409,7 +409,7 @@ func (fw *Watcher) logicalPathForWatchEventInternal(path string) string {
return filepath.Join(bestLogicalPath, rel)
}
-func (fw *Watcher) addWatchPathInternal(path, logicalPath string) {
+func (fw *Watcher) addWatchPathInternal(ctx context.Context, path, logicalPath string) {
watchPaths := []string{path}
if fw.followSymlinks {
if info, err := os.Lstat(path); err == nil && info.Mode()&os.ModeSymlink != 0 {
@@ -422,7 +422,7 @@ func (fw *Watcher) addWatchPathInternal(path, logicalPath string) {
for _, watchPath := range watchPaths {
fw.watchAliases[filepath.Clean(watchPath)] = filepath.Clean(logicalPath)
if err := fw.watcher.Add(watchPath); err != nil {
- slog.Warn("Failed to add directory to watcher",
+ slog.WarnContext(ctx, "Failed to add directory to watcher",
"path", watchPath,
"error", err)
}
@@ -501,7 +501,7 @@ func (fw *Watcher) reconnectInternal(ctx context.Context) bool {
if err == nil {
fw.watcher = watcher
fw.watchAliases = make(map[string]string)
- if addExistingDirectoriesErr := fw.addExistingDirectories(fw.watchedPath); addExistingDirectoriesErr != nil {
+ if addExistingDirectoriesErr := fw.addExistingDirectories(ctx, fw.watchedPath); addExistingDirectoriesErr != nil {
slog.WarnContext(ctx, "Some filesystem subscriptions could not be restored", "error", addExistingDirectoriesErr)
}
// Changes while disconnected need a full reconciliation.
diff --git a/backend/pkg/gitutil/git.go b/backend/pkg/gitutil/git.go
index 6effd6b3f..0aa345205 100644
--- a/backend/pkg/gitutil/git.go
+++ b/backend/pkg/gitutil/git.go
@@ -122,7 +122,7 @@ type AuthConfig struct {
}
// getAuthInternal returns the appropriate transport.AuthMethod.
-func (c *Client) getAuthInternal(url string, localConfig AuthConfig) (transport.AuthMethod, error) {
+func (c *Client) getAuthInternal(ctx context.Context, url string, localConfig AuthConfig) (transport.AuthMethod, error) {
switch localConfig.AuthType {
case "http":
if localConfig.Token != "" {
@@ -145,7 +145,7 @@ func (c *Client) getAuthInternal(url string, localConfig AuthConfig) (transport.
}
// Configure host key verification based on mode
- hostKeyCallback, err := c.getSSHHostKeyCallback(localConfig.SSHHostKeyVerification)
+ hostKeyCallback, err := c.getSSHHostKeyCallback(ctx, localConfig.SSHHostKeyVerification)
if err != nil {
return nil, fmt.Errorf("failed to configure SSH host key verification: %w", err)
}
@@ -164,7 +164,7 @@ func (c *Client) getAuthInternal(url string, localConfig AuthConfig) (transport.
}
// getSSHHostKeyCallback returns the appropriate SSH host key callback based on verification mode
-func (c *Client) getSSHHostKeyCallback(mode string) (gossh.HostKeyCallback, error) {
+func (c *Client) getSSHHostKeyCallback(ctx context.Context, mode string) (gossh.HostKeyCallback, error) {
switch mode {
case SSHHostKeyVerificationStrict:
// Use known_hosts verification respecting SSH_KNOWN_HOSTS env var
@@ -174,15 +174,15 @@ func (c *Client) getSSHHostKeyCallback(mode string) (gossh.HostKeyCallback, erro
return gossh.InsecureIgnoreHostKey(), nil //nolint:gosec // User explicitly chose to skip verification
case SSHHostKeyVerificationAcceptNew, "":
// Default: accept and remember new host keys
- return c.createAcceptNewHostKeyCallback()
+ return c.createAcceptNewHostKeyCallback(ctx)
default:
// Fall back to accept_new for unknown modes
- return c.createAcceptNewHostKeyCallback()
+ return c.createAcceptNewHostKeyCallback(ctx)
}
}
// createAcceptNewHostKeyCallback creates a callback that accepts new host keys and saves them
-func (c *Client) createAcceptNewHostKeyCallback() (gossh.HostKeyCallback, error) {
+func (c *Client) createAcceptNewHostKeyCallback(ctx context.Context) (gossh.HostKeyCallback, error) {
knownHostsPath := getKnownHostsPath()
// Ensure the directory exists
@@ -200,7 +200,7 @@ func (c *Client) createAcceptNewHostKeyCallback() (gossh.HostKeyCallback, error)
return nil, fmt.Errorf("failed to create known_hosts file: %w", openFileErr)
}
if closeErr := file.Close(); closeErr != nil {
- slog.Warn("Failed to close known_hosts file", "path", knownHostsPath, "error", closeErr)
+ slog.WarnContext(ctx, "Failed to close known_hosts file", "path", knownHostsPath, "error", closeErr)
}
}
@@ -229,7 +229,7 @@ func (c *Client) createAcceptNewHostKeyCallback() (gossh.HostKeyCallback, error)
if addHostKeyErr := addHostKey(knownHostsPath, hostname, key); addHostKeyErr != nil {
// Log the error but don't fail - still allow the connection
// The host key just won't be remembered for next time
- slog.Warn("Failed to save host key", "hostname", hostname, "error", addHostKeyErr)
+ slog.WarnContext(ctx, "Failed to save host key", "hostname", hostname, "error", addHostKeyErr)
}
return nil
@@ -333,7 +333,7 @@ func (c *Client) Clone(ctx context.Context, url, branch string, auth AuthConfig)
return "", err
}
- authMethod, err := c.getAuthInternal(url, auth)
+ authMethod, err := c.getAuthInternal(ctx, url, auth)
if err != nil {
_ = os.RemoveAll(tmpDir)
return "", err
@@ -457,7 +457,7 @@ func (c *Client) listRemoteReferences(ctx context.Context, url string, auth Auth
return nil, err
}
- authMethod, err := c.getAuthInternal(url, auth)
+ authMethod, err := c.getAuthInternal(ctx, url, auth)
if err != nil {
return nil, err
}
diff --git a/backend/pkg/gitutil/git_test.go b/backend/pkg/gitutil/git_test.go
index 7d5d5b3ce..0ba74546c 100644
--- a/backend/pkg/gitutil/git_test.go
+++ b/backend/pkg/gitutil/git_test.go
@@ -102,7 +102,7 @@ func TestGetSSHHostKeyCallback(t *testing.T) {
client := NewClient("")
t.Run("skip mode returns InsecureIgnoreHostKey", func(t *testing.T) {
- callback, err := client.getSSHHostKeyCallback(SSHHostKeyVerificationSkip)
+ callback, err := client.getSSHHostKeyCallback(t.Context(), SSHHostKeyVerificationSkip)
require.NoError(t, err,
"unexpected error: %v", err)
@@ -122,7 +122,7 @@ func TestGetSSHHostKeyCallback(t *testing.T) {
knownHostsPath := filepath.Join(tmpDir, "known_hosts")
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
- callback, err := client.getSSHHostKeyCallback("")
+ callback, err := client.getSSHHostKeyCallback(t.Context(), "")
require.NoError(t, err,
"unexpected error: %v", err)
@@ -136,7 +136,7 @@ func TestGetSSHHostKeyCallback(t *testing.T) {
knownHostsPath := filepath.Join(tmpDir, "known_hosts")
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
- callback, err := client.getSSHHostKeyCallback(SSHHostKeyVerificationAcceptNew)
+ callback, err := client.getSSHHostKeyCallback(t.Context(), SSHHostKeyVerificationAcceptNew)
require.NoError(t, err,
"unexpected error: %v", err)
@@ -215,7 +215,7 @@ func TestCreateAcceptNewHostKeyCallback(t *testing.T) {
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
client := NewClient("")
- callback, err := client.createAcceptNewHostKeyCallback()
+ callback, err := client.createAcceptNewHostKeyCallback(t.Context())
require.NoError(t, err,
"unexpected error: %v", err)
@@ -237,7 +237,7 @@ func TestCreateAcceptNewHostKeyCallback(t *testing.T) {
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
client := NewClient("")
- callback, err := client.createAcceptNewHostKeyCallback()
+ callback, err := client.createAcceptNewHostKeyCallback(t.Context())
require.NoError(t, err,
"unexpected error: %v", err)
@@ -266,7 +266,7 @@ func TestCreateAcceptNewHostKeyCallback(t *testing.T) {
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
client := NewClient("")
- callback, err := client.createAcceptNewHostKeyCallback()
+ callback, err := client.createAcceptNewHostKeyCallback(t.Context())
require.NoError(t, err,
"unexpected error: %v", err)
@@ -293,7 +293,7 @@ func TestCreateAcceptNewHostKeyCallback(t *testing.T) {
t.Setenv("SSH_KNOWN_HOSTS", knownHostsPath)
client := NewClient("")
- callback, err := client.createAcceptNewHostKeyCallback()
+ callback, err := client.createAcceptNewHostKeyCallback(t.Context())
require.NoError(t, err,
"unexpected error: %v", err)
diff --git a/backend/pkg/gitutil/git_write.go b/backend/pkg/gitutil/git_write.go
index 81f9d2349..ebff3939b 100644
--- a/backend/pkg/gitutil/git_write.go
+++ b/backend/pkg/gitutil/git_write.go
@@ -361,7 +361,7 @@ func stageCommitFilesInternal(ctx context.Context, checkout *WriteCheckout, work
// pushBranchInternal pushes the checkout branch without force and verifies the
// remote now points at commit.
func (c *Client) pushBranchInternal(ctx context.Context, checkout *WriteCheckout, commit string, auth AuthConfig) error {
- authMethod, err := c.getAuthInternal(checkout.url, auth)
+ authMethod, err := c.getAuthInternal(ctx, checkout.url, auth)
if err != nil {
return err
}
diff --git a/backend/pkg/libarcane/edge/client.go b/backend/pkg/libarcane/edge/client.go
index 2dbfbf132..a601fe99c 100644
--- a/backend/pkg/libarcane/edge/client.go
+++ b/backend/pkg/libarcane/edge/client.go
@@ -220,9 +220,9 @@ func (c *TunnelClient) connectAndServeManagedTunnelInternal(ctx context.Context)
if transports.grpc {
if preferredUntil, ok := c.preferredWebSocketUntilInternal(time.Now()).Get(); ok {
slog.InfoContext(ctx, "Temporarily preferring websocket edge tunnel transport after recent websocket success",
- "preferred_until", preferredUntil,
- "grpc_failure_streak", c.grpcFailureStreakInternal(),
- "manager_ws_url", c.managerWebSocketURLInternal(),
+ "preferredUntil", preferredUntil,
+ "grpcFailureStreak", c.grpcFailureStreakInternal(),
+ "managerWsUrl", c.managerWebSocketURLInternal(),
)
return c.connectAndServeWebSocketInternal(ctx)
}
@@ -243,8 +243,8 @@ func (c *TunnelClient) connectAndServeManagedTunnelInternal(ctx context.Context)
managerWSURL := c.managerWebSocketURLInternal()
slog.WarnContext(ctx, "gRPC edge tunnel connection failed, falling back to websocket transport",
"error", err,
- "manager_grpc_addr", c.managerGRPCAddr,
- "manager_ws_url", managerWSURL,
+ "managerGrpcAddr", c.managerGRPCAddr,
+ "managerWsUrl", managerWSURL,
)
if wsErr := c.connectAndServeWebSocketInternal(ctx); wsErr != nil {
// Keep both transport failures in the chain for errors.Is/errors.As traversal.
@@ -500,9 +500,9 @@ func (c *TunnelClient) serveTunnelSessionInternal(ctx context.Context, conn Tunn
slog.InfoContext(ctx, "Edge tunnel connected to manager",
"transport", conn.Transport(),
- "manager_addr", managerAddr,
- "environment_id", registerMsg.EnvironmentID,
- "session_id", registerMsg.SessionID,
+ "managerAddr", managerAddr,
+ "environmentId", registerMsg.EnvironmentID,
+ "sessionId", registerMsg.SessionID,
)
c.markTransportConnectedInternal(conn.Transport())
@@ -593,7 +593,7 @@ func (c *TunnelClient) messageLoop(ctx context.Context, conn TunnelConnection, w
}
slog.InfoContext(ctx, "Edge tunnel re-registered",
"transport", conn.Transport(),
- "environment_id", msg.EnvironmentID,
+ "environmentId", msg.EnvironmentID,
)
case MessageTypeRegister:
slog.DebugContext(ctx, "Ignoring register message on agent")
@@ -615,7 +615,7 @@ func (c *TunnelClient) beginCommandRequestTransferInternal(ctx context.Context,
previous, loaded := c.requestTransfers.Swap(transferID, transfer)
transfer.timer = time.AfterFunc(timeout, func() {
if c.requestTransfers.CompareAndDelete(transferID, transfer) {
- slog.WarnContext(ctx, "Command body transfer expired", "transfer_id", transferID, "command_id", msg.ID)
+ slog.WarnContext(ctx, "Command body transfer expired", "transferId", transferID, "commandId", msg.ID)
c.sendCommandCompleteInternal(conn, msg.ID, http.StatusRequestTimeout, "command body transfer timed out")
}
})
@@ -635,13 +635,13 @@ func (c *TunnelClient) handleCommandRequestChunkInternal(ctx context.Context, ms
value, ok := c.requestTransfers.Load(msg.ID)
if !ok {
- slog.WarnContext(ctx, "Received command body chunk for unknown transfer", "transfer_id", msg.ID)
+ slog.WarnContext(ctx, "Received command body chunk for unknown transfer", "transferId", msg.ID)
return
}
transfer, ok := value.(*commandRequestTransfer)
if !ok {
c.requestTransfers.Delete(msg.ID)
- slog.WarnContext(ctx, "Discarded invalid command body transfer state", "transfer_id", msg.ID)
+ slog.WarnContext(ctx, "Discarded invalid command body transfer state", "transferId", msg.ID)
return
}
if msg.Sequence != transfer.nextSequence {
@@ -849,7 +849,7 @@ func (c *TunnelClient) handleWebSocketStart(ctx context.Context, conn TunnelConn
}
}
streamID := msg.ID
- slog.DebugContext(ctx, "Starting WebSocket stream", "stream_id", streamID, "path", msg.Path)
+ slog.DebugContext(ctx, "Starting WebSocket stream", "streamId", streamID, "path", msg.Path)
localURL := c.buildLocalWebSocketURLInternal(msg)
headers := c.buildLocalWebSocketHeadersInternal(msg)
@@ -1122,7 +1122,7 @@ func (c *TunnelClient) handleWebSocketData(ctx context.Context, msg *TunnelMessa
func (c *TunnelClient) handleStreamData(ctx context.Context, msg *TunnelMessage) {
streamRaw, ok := c.activeStreams.Load(msg.ID)
if !ok {
- slog.DebugContext(ctx, "Received WebSocket data for unknown stream", "stream_id", msg.ID)
+ slog.DebugContext(ctx, "Received WebSocket data for unknown stream", "streamId", msg.ID)
return
}
stream, ok := streamRaw.(*activeWSStream)
@@ -1140,7 +1140,7 @@ func (c *TunnelClient) handleStreamData(ctx context.Context, msg *TunnelMessage)
default:
stream.mu.Unlock()
// Drop if channel is full (backpressure)
- slog.DebugContext(ctx, "Dropping WebSocket data due to backpressure", "stream_id", msg.ID)
+ slog.DebugContext(ctx, "Dropping WebSocket data due to backpressure", "streamId", msg.ID)
}
}
@@ -1159,7 +1159,7 @@ func (c *TunnelClient) handleStreamClose(ctx context.Context, msg *TunnelMessage
return
}
c.closeWebSocketStream(msg.ID, stream)
- slog.DebugContext(ctx, "Closed WebSocket stream", "stream_id", msg.ID)
+ slog.DebugContext(ctx, "Closed WebSocket stream", "streamId", msg.ID)
}
// sendErrorResponse sends an error response
diff --git a/backend/pkg/libarcane/edge/client_transport_poll.go b/backend/pkg/libarcane/edge/client_transport_poll.go
index 6a52bf1c6..76d5e71cf 100644
--- a/backend/pkg/libarcane/edge/client_transport_poll.go
+++ b/backend/pkg/libarcane/edge/client_transport_poll.go
@@ -136,8 +136,8 @@ func (c *TunnelClient) syncPollManagedSessionInternal(ctx context.Context, sessi
slog.InfoContext(ctx, "Poll control plane requested edge tunnel",
"status", status,
- "manager_grpc_addr", c.managerGRPCAddr,
- "manager_ws_url", c.managerWebSocketURLInternal(),
+ "managerGrpcAddr", c.managerGRPCAddr,
+ "managerWsUrl", c.managerWebSocketURLInternal(),
)
return c.startPollManagedSessionInternal(ctx), nil
case TunnelStatusIdle:
diff --git a/backend/pkg/libarcane/edge/poll_control.go b/backend/pkg/libarcane/edge/poll_control.go
index fedefccd5..89c55e331 100644
--- a/backend/pkg/libarcane/edge/poll_control.go
+++ b/backend/pkg/libarcane/edge/poll_control.go
@@ -244,8 +244,8 @@ func (s *TunnelServer) HandlePoll(c *echo.Context) error {
}
if source != HeaderAgentToken {
slog.DebugContext(ctx, "Edge poll request authenticated via fallback header",
- "source_header", source,
- "token_length", len(token),
+ "sourceHeader", source,
+ "tokenLength", len(token),
)
}
@@ -253,14 +253,14 @@ func (s *TunnelServer) HandlePoll(c *echo.Context) error {
if err != nil {
slog.WarnContext(ctx, "Failed to resolve agent token for edge poll",
"error", err,
- "source_header", source,
- "token_length", len(token),
- "token_fingerprint", remenv.RedactedTokenFingerprint(token),
+ "sourceHeader", source,
+ "tokenLength", len(token),
+ "tokenFingerprint", remenv.RedactedTokenFingerprint(token),
)
return c.JSON(http.StatusUnauthorized, map[string]any{"error": "invalid agent token"})
}
if requireRequestCertificateIdentityErr := s.requireRequestCertificateIdentityInternal(req, envID); requireRequestCertificateIdentityErr != nil {
- slog.WarnContext(ctx, "Rejected edge poll request with mismatched client certificate", "environment_id", envID, "error", requireRequestCertificateIdentityErr)
+ slog.WarnContext(ctx, "Rejected edge poll request with mismatched client certificate", "environmentId", envID, "error", requireRequestCertificateIdentityErr)
return c.JSON(http.StatusUnauthorized, map[string]any{"error": requireRequestCertificateIdentityErr.Error()})
}
diff --git a/backend/pkg/libarcane/edge/proxy.go b/backend/pkg/libarcane/edge/proxy.go
index 9698a4a70..0b88db0ef 100644
--- a/backend/pkg/libarcane/edge/proxy.go
+++ b/backend/pkg/libarcane/edge/proxy.go
@@ -221,7 +221,7 @@ func ProxyHTTPRequest(c *echo.Context, tunnel *AgentTunnel, targetPath string) e
}
slog.DebugContext(ctx, "Proxying request through edge tunnel",
- "environment_id", tunnel.EnvironmentID,
+ "environmentId", tunnel.EnvironmentID,
"method", req.Method,
"path", targetPath,
"bodyLength", len(body),
@@ -230,7 +230,7 @@ func ProxyHTTPRequest(c *echo.Context, tunnel *AgentTunnel, targetPath string) e
status, respHeaders, respBody, err := ProxyRequest(proxyCtx, tunnel, req.Method, targetPath, req.URL.RawQuery, headers, body)
if err != nil {
slog.ErrorContext(ctx, "Edge tunnel proxy failed",
- "environment_id", tunnel.EnvironmentID,
+ "environmentId", tunnel.EnvironmentID,
"error", err,
)
diff --git a/backend/pkg/libarcane/edge/registry.go b/backend/pkg/libarcane/edge/registry.go
index 776c633a3..7fd9e75b2 100644
--- a/backend/pkg/libarcane/edge/registry.go
+++ b/backend/pkg/libarcane/edge/registry.go
@@ -110,13 +110,13 @@ func (r *TunnelRegistry) Get(envID string) mo.Option[*AgentTunnel] {
// Register adds a tunnel to the registry, closing any existing tunnel for the same env
func (r *TunnelRegistry) Register(envID string, tunnel *AgentTunnel) {
+ ctx := context.Background() //nolint:forbidigo // Legacy registration path runs outside any request context.
if r == nil || tunnel == nil {
- slog.Error("Failed to register edge agent tunnel", "environment_id", envID, "error", "tunnel is required")
+ slog.ErrorContext(ctx, "Failed to register edge agent tunnel", "environmentId", envID, "error", "tunnel is required")
return
}
- //nolint:forbidigo // Legacy registry operation has no caller context and only mutates in-memory state.
previous,
- err := r.tunnels.ApplyTyped(context.Background(),
+ err := r.tunnels.ApplyTyped(ctx,
"register edge tunnel",
func(tunnels map[string]*AgentTunnel) (*AgentTunnel,
bool,
@@ -130,14 +130,14 @@ func (r *TunnelRegistry) Register(envID string, tunnel *AgentTunnel) {
return previous, true, nil
})
if err != nil {
- slog.Error("Failed to register edge agent tunnel", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "Failed to register edge agent tunnel", "environmentId", envID, "error", err)
return
}
if previous != nil && previous != tunnel {
- slog.Info("Replacing existing edge tunnel")
+ slog.InfoContext(ctx, "Replacing existing edge tunnel")
_ = previous.CloseWithReason("")
}
- slog.Info("Edge agent tunnel registered")
+ slog.InfoContext(ctx, "Edge agent tunnel registered")
}
type registerSessionResultInternal struct {
@@ -192,20 +192,21 @@ func (r *TunnelRegistry) RegisterSession(ctx context.Context, tunnel *AgentTunne
_ = result.previous.CloseWithReason("replaced by newer edge tunnel session")
}
metadata := tunnel.MetadataSnapshot()
- slog.Info("Edge agent tunnel registered", "environment_id", envID, "session_id", metadata.SessionID, "security_mode", metadata.SecurityMode)
+ slog.InfoContext(ctx, "Edge agent tunnel registered", "environmentId", envID, "sessionId", metadata.SessionID, "securityMode", metadata.SecurityMode)
return result.accepted, result.drainPrevious, result.reason, nil
}
// Unregister removes a tunnel from the registry
func (r *TunnelRegistry) Unregister(envID string) {
- tunnel, removed, err := r.tunnels.Remove(context.Background(), "unregister edge tunnel", envID) //nolint:forbidigo // Legacy registry operation has no caller context and only mutates in-memory state.
+ ctx := context.Background() //nolint:forbidigo // Legacy unregistration path runs outside any request context.
+ tunnel, removed, err := r.tunnels.Remove(ctx, "unregister edge tunnel", envID)
if err != nil {
- slog.Error("Failed to unregister edge agent tunnel", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "Failed to unregister edge agent tunnel", "environmentId", envID, "error", err)
return
}
if removed {
_ = tunnel.CloseWithReason("")
- slog.Info("Edge agent tunnel unregistered")
+ slog.InfoContext(ctx, "Edge agent tunnel unregistered")
}
}
@@ -233,7 +234,7 @@ func (r *TunnelRegistry) UnregisterCurrent(ctx context.Context, envID string, cu
return result, true, nil
})
if err != nil {
- slog.ErrorContext(ctx, "Failed to unregister current edge agent tunnel", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "Failed to unregister current edge agent tunnel", "environmentId", envID, "error", err)
return false, false
}
if !result.removed {
@@ -242,7 +243,7 @@ func (r *TunnelRegistry) UnregisterCurrent(ctx context.Context, envID string, cu
_ = current.CloseWithReason("")
metadata := current.MetadataSnapshot()
- slog.Info("Edge agent tunnel unregistered", "environment_id", envID, "session_id", metadata.SessionID)
+ slog.InfoContext(ctx, "Edge agent tunnel unregistered", "environmentId", envID, "sessionId", metadata.SessionID)
return true, false
}
@@ -260,7 +261,7 @@ func (r *TunnelRegistry) CleanupStale(ctx context.Context, maxAge time.Duration)
if tunnel == nil {
continue
}
- slog.Warn("Removing stale edge tunnel", "last_heartbeat", tunnel.GetLastHeartbeat())
+ slog.WarnContext(ctx, "Removing stale edge tunnel", "lastHeartbeat", tunnel.GetLastHeartbeat())
_ = tunnel.CloseWithReason("edge tunnel heartbeat expired")
}
diff --git a/backend/pkg/libarcane/edge/server.go b/backend/pkg/libarcane/edge/server.go
index 71fd72b34..6ae5b4e8f 100644
--- a/backend/pkg/libarcane/edge/server.go
+++ b/backend/pkg/libarcane/edge/server.go
@@ -169,7 +169,7 @@ func (s *TunnelServer) HandleConnect(c *echo.Context) error {
return nil
}
if requireRequestCertificateIdentityErr := s.requireRequestCertificateIdentityInternal(req, envID); requireRequestCertificateIdentityErr != nil {
- slog.WarnContext(ctx, "Rejected websocket edge tunnel with mismatched client certificate", "environment_id", envID, "error", requireRequestCertificateIdentityErr)
+ slog.WarnContext(ctx, "Rejected websocket edge tunnel with mismatched client certificate", "environmentId", envID, "error", requireRequestCertificateIdentityErr)
_ = tunnelConn.Send(&TunnelMessage{Type: MessageTypeRegisterResponse, Accepted: false, Error: "client certificate does not match environment"})
_ = tunnelConn.Close()
return nil
@@ -209,7 +209,7 @@ func (s *TunnelServer) HandleMTLSEnroll(c *echo.Context) error {
if s.nameResolver != nil {
resolvedName, resolveErr := s.nameResolver(ctx, envID)
if resolveErr != nil {
- slog.WarnContext(ctx, "Failed to resolve environment name for edge mTLS enrollment", "environment_id", envID, "error", resolveErr)
+ slog.WarnContext(ctx, "Failed to resolve environment name for edge mTLS enrollment", "environmentId", envID, "error", resolveErr)
} else {
envName = resolvedName
}
@@ -218,25 +218,25 @@ func (s *TunnelServer) HandleMTLSEnroll(c *echo.Context) error {
now := time.Now()
previouslyEnrolled, enrollmentLimited, err := managerMTLSEnrollmentStateInternal(s.cfg, envID, now)
if err != nil {
- slog.ErrorContext(ctx, "Failed to read edge mTLS enrollment state", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "Failed to read edge mTLS enrollment state", "environmentId", envID, "error", err)
return c.JSON(http.StatusInternalServerError, map[string]any{"error": "failed to read edge mTLS enrollment state"})
}
if enrollmentLimited {
cachedAssets, cacheErr := GenerateManagerClientMTLSAssetsWithContext(ctx, s.cfg, envID, envName)
if cacheErr == nil && cachedAssets != nil {
- slog.InfoContext(ctx, "Served cached edge mTLS enrollment during cooldown", "environment_id", envID, "remote_addr", c.RealIP())
+ slog.InfoContext(ctx, "Served cached edge mTLS enrollment during cooldown", "environmentId", envID, "remoteAddr", c.RealIP())
return c.JSON(http.StatusOK, enrollMTLSResponse{Files: cachedAssets.Files})
}
if cacheErr != nil {
- slog.WarnContext(ctx, "Failed to re-serve cached edge mTLS enrollment during cooldown", "environment_id", envID, "error", cacheErr)
+ slog.WarnContext(ctx, "Failed to re-serve cached edge mTLS enrollment during cooldown", "environmentId", envID, "error", cacheErr)
}
- slog.WarnContext(ctx, "Rejected repeated edge mTLS enrollment during cooldown", "environment_id", envID, "remote_addr", c.RealIP())
+ slog.WarnContext(ctx, "Rejected repeated edge mTLS enrollment during cooldown", "environmentId", envID, "remoteAddr", c.RealIP())
return c.JSON(http.StatusTooManyRequests, map[string]any{"error": "edge mTLS enrollment was recently completed; retry later"})
}
assets, err := GenerateManagerClientMTLSAssetsWithContext(ctx, s.cfg, envID, envName)
if err != nil {
- slog.ErrorContext(ctx, "Failed to generate edge mTLS enrollment assets", "environment_id", envID, "error", err)
+ slog.ErrorContext(ctx, "Failed to generate edge mTLS enrollment assets", "environmentId", envID, "error", err)
return c.JSON(http.StatusInternalServerError, map[string]any{"error": "failed to generate edge mTLS assets"})
}
if assets == nil {
@@ -244,13 +244,13 @@ func (s *TunnelServer) HandleMTLSEnroll(c *echo.Context) error {
}
assets.Reenrolled = previouslyEnrolled
if recordManagerMTLSEnrollmentErr := recordManagerMTLSEnrollmentInternal(s.cfg, envID, now); recordManagerMTLSEnrollmentErr != nil {
- slog.ErrorContext(ctx, "Failed to record edge mTLS enrollment state", "environment_id", envID, "error", recordManagerMTLSEnrollmentErr)
+ slog.ErrorContext(ctx, "Failed to record edge mTLS enrollment state", "environmentId", envID, "error", recordManagerMTLSEnrollmentErr)
return c.JSON(http.StatusInternalServerError, map[string]any{"error": "failed to record edge mTLS enrollment state"})
}
if assets.Reenrolled {
- slog.WarnContext(ctx, "Edge mTLS certificate assets re-enrolled", "environment_id", envID, "remote_addr", c.RealIP(), "cert_issued", assets.CertIssued)
+ slog.WarnContext(ctx, "Edge mTLS certificate assets re-enrolled", "environmentId", envID, "remoteAddr", c.RealIP(), "certIssued", assets.CertIssued)
} else {
- slog.InfoContext(ctx, "Edge mTLS certificate assets enrolled", "environment_id", envID, "remote_addr", c.RealIP(), "cert_issued", assets.CertIssued)
+ slog.InfoContext(ctx, "Edge mTLS certificate assets enrolled", "environmentId", envID, "remoteAddr", c.RealIP(), "certIssued", assets.CertIssued)
}
if s.enrollmentCallback != nil {
@@ -383,8 +383,8 @@ func (s *TunnelServer) manageConnectedTunnel(ctx, callbackCtx context.Context, t
accepted, drainPrevious, rejectReason, err := s.registry.RegisterSession(callbackCtx, tunnel, TunnelStaleTimeout)
if err != nil {
slog.ErrorContext(ctx, "Failed to register edge agent session",
- "environment_id", tunnel.EnvironmentID,
- "agent_instance_id", tunnel.AgentInstance,
+ "environmentId", tunnel.EnvironmentID,
+ "agentInstanceId", tunnel.AgentInstance,
"error", err,
)
_ = tunnel.CloseWithReason("edge agent session registration unavailable")
@@ -392,8 +392,8 @@ func (s *TunnelServer) manageConnectedTunnel(ctx, callbackCtx context.Context, t
}
if !accepted {
slog.WarnContext(ctx, "Rejected duplicate edge agent session",
- "environment_id", tunnel.EnvironmentID,
- "agent_instance_id", tunnel.AgentInstance,
+ "environmentId", tunnel.EnvironmentID,
+ "agentInstanceId", tunnel.AgentInstance,
"reason", rejectReason,
)
_ = tunnel.Conn.Send(&TunnelMessage{
@@ -407,9 +407,9 @@ func (s *TunnelServer) manageConnectedTunnel(ctx, callbackCtx context.Context, t
}
slog.InfoContext(ctx, "Edge agent connected",
- "environment_id", tunnel.EnvironmentID,
- "session_id", tunnel.SessionID,
- "security_mode", tunnel.SecurityMode,
+ "environmentId", tunnel.EnvironmentID,
+ "sessionId", tunnel.SessionID,
+ "securityMode", tunnel.SecurityMode,
)
// Echo the agent's capabilities and append the manager's own so the agent
@@ -425,7 +425,7 @@ func (s *TunnelServer) manageConnectedTunnel(ctx, callbackCtx context.Context, t
Capabilities: capabilities,
DrainPrevious: drainPrevious,
}); sendErr != nil {
- slog.WarnContext(ctx, "Failed to send register response", "environment_id", tunnel.EnvironmentID, "error", sendErr)
+ slog.WarnContext(ctx, "Failed to send register response", "environmentId", tunnel.EnvironmentID, "error", sendErr)
_ = tunnel.CloseWithReason("")
removed, active := s.registry.UnregisterCurrent(callbackCtx, tunnel.EnvironmentID, tunnel)
if removed && !active {
@@ -441,7 +441,7 @@ func (s *TunnelServer) manageConnectedTunnel(ctx, callbackCtx context.Context, t
if !removed {
return
}
- slog.InfoContext(ctx, "Edge agent disconnected", "environment_id", tunnel.EnvironmentID, "session_id", tunnel.SessionID)
+ slog.InfoContext(ctx, "Edge agent disconnected", "environmentId", tunnel.EnvironmentID, "sessionId", tunnel.SessionID)
if !active {
s.updateConnectionStatusInternal(callbackCtx, tunnel, false)
}
@@ -468,7 +468,7 @@ func (s *TunnelServer) messageLoop(ctx context.Context, tunnel *AgentTunnel) {
msg, err := tunnel.Conn.Receive()
if err != nil {
if !tunnel.Conn.IsExpectedReceiveError(err) {
- slog.WarnContext(ctx, "Error receiving from edge tunnel", "environment_id", tunnel.EnvironmentID, "error", err)
+ slog.WarnContext(ctx, "Error receiving from edge tunnel", "environmentId", tunnel.EnvironmentID, "error", err)
}
return
}
@@ -491,11 +491,11 @@ func (s *TunnelServer) handleTunnelMessage(ctx context.Context, tunnel *AgentTun
case MessageTypeStreamData, MessageTypeStreamEnd, MessageTypeWebSocketData, MessageTypeWebSocketClose, MessageTypeStreamClose:
s.deliverStream(ctx, tunnel, msg, deliveryTimer)
case MessageTypeRequest, MessageTypeHeartbeatAck, MessageTypeWebSocketStart, MessageTypeRegisterResponse, MessageTypeCommandRequest, MessageTypeStreamOpen, MessageTypeCancelRequest:
- slog.DebugContext(ctx, "Ignoring message type from agent", "type", msg.Type, "environment_id", tunnel.EnvironmentID)
+ slog.DebugContext(ctx, "Ignoring message type from agent", "type", msg.Type, "environmentId", tunnel.EnvironmentID)
case MessageTypeRegister:
- slog.DebugContext(ctx, "Ignoring duplicate register message from agent", "environment_id", tunnel.EnvironmentID)
+ slog.DebugContext(ctx, "Ignoring duplicate register message from agent", "environmentId", tunnel.EnvironmentID)
default:
- slog.WarnContext(ctx, "Unknown message type from agent", "type", msg.Type, "environment_id", tunnel.EnvironmentID)
+ slog.WarnContext(ctx, "Unknown message type from agent", "type", msg.Type, "environmentId", tunnel.EnvironmentID)
}
}
@@ -565,7 +565,7 @@ func (s *TunnelServer) deliverStream(ctx context.Context, tunnel *AgentTunnel, m
func (s *TunnelServer) handleEvent(ctx context.Context, tunnel *AgentTunnel, msg *TunnelMessage) {
if msg.Event == nil {
- slog.WarnContext(ctx, "Received event message without payload", "environment_id", tunnel.EnvironmentID)
+ slog.WarnContext(ctx, "Received event message without payload", "environmentId", tunnel.EnvironmentID)
return
}
if s.eventCallback == nil {
@@ -577,7 +577,7 @@ func (s *TunnelServer) handleEvent(ctx context.Context, tunnel *AgentTunnel, msg
eventCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 15*time.Second)
defer cancel()
if err := s.eventCallback(eventCtx, tunnel.EnvironmentID, eventCopy); err != nil {
- slog.WarnContext(eventCtx, "Failed to process edge event", "environment_id", tunnel.EnvironmentID, "type", eventCopy.Type, "error", err)
+ slog.WarnContext(eventCtx, "Failed to process edge event", "environmentId", tunnel.EnvironmentID, "type", eventCopy.Type, "error", err)
}
}()
}
diff --git a/backend/pkg/libarcane/edge/tls.go b/backend/pkg/libarcane/edge/tls.go
index 8612091e3..b7d8871ad 100644
--- a/backend/pkg/libarcane/edge/tls.go
+++ b/backend/pkg/libarcane/edge/tls.go
@@ -332,7 +332,7 @@ func EnsureAgentMTLSAssets(ctx context.Context, cfg *Config) error {
setAgentMTLSAssetPathsInternal(cfg, assetsDir)
return nil
}
- slog.WarnContext(ctx, "Existing edge mTLS assets need renewal; enrolling new assets", "reason", reason, "cert_path", certPath)
+ slog.WarnContext(ctx, "Existing edge mTLS assets need renewal; enrolling new assets", "reason", reason, "certPath", certPath)
}
if enrollAgentMTLSAssetsErr := enrollAgentMTLSAssetsInternal(ctx, cfg, assetsDir, certPath, keyPath); enrollAgentMTLSAssetsErr != nil {
@@ -413,6 +413,7 @@ func enrollAgentMTLSAssetsInternal(ctx context.Context, cfg *Config, assetsDir,
}
func buildManagerClientTLSConfigInternal(cfg *Config) (*tls.Config, error) {
+ ctx := context.Background() //nolint:forbidigo // TLS configuration is built at startup without a request context.
if cfg == nil || !managerUsesTLSInternal(cfg) {
return nil, nil
}
@@ -441,7 +442,7 @@ func buildManagerClientTLSConfigInternal(cfg *Config) (*tls.Config, error) {
if needsEnrollment {
err := fmt.Errorf("edge mTLS client certificate is unusable: %s", reason)
if mode == EdgeMTLSModeOptional {
- slog.Warn("Ignoring unusable optional edge mTLS client certificate; falling back to token auth", "cert_path", certPath, "error", err.Error())
+ slog.WarnContext(ctx, "Ignoring unusable optional edge mTLS client certificate; falling back to token auth", "certPath", certPath, "error", err.Error())
return tlsConfig, nil
}
return nil, err
@@ -449,7 +450,7 @@ func buildManagerClientTLSConfigInternal(cfg *Config) (*tls.Config, error) {
cert, err := tls.LoadX509KeyPair(certPath, keyPath)
if err != nil {
if mode == EdgeMTLSModeOptional {
- slog.Warn("Failed to load optional edge mTLS client certificate; falling back to token auth", "cert_path", certPath, "error", err.Error())
+ slog.WarnContext(ctx, "Failed to load optional edge mTLS client certificate; falling back to token auth", "certPath", certPath, "error", err.Error())
return tlsConfig, nil
}
return nil, fmt.Errorf("failed to load edge mTLS client certificate: %w", err)
@@ -532,7 +533,9 @@ func loadCertPoolInternal(caFile string) (*x509.CertPool, error) {
func loadSystemOrCustomCertPoolInternal(caFile string) (*x509.CertPool, error) {
pool, err := x509.SystemCertPool()
if err != nil || pool == nil {
- slog.Warn("Failed to load system certificate pool; falling back to configured edge mTLS CA only", "error", err)
+ ctx := context.Background() //nolint:forbidigo // TLS configuration is built at startup without a request context.
+ slog.WarnContext(ctx, "Failed to load system certificate pool; falling back to configured edge mTLS CA only",
+ "error", err)
pool = x509.NewCertPool()
}
@@ -775,7 +778,7 @@ func ensureManagerCAInternal(ctx context.Context, assetsDir string) (string, str
return "", "", false, writeCAKeyFileErr
}
- slog.Info("generated edge mTLS CA", "cert_path", caCertPath)
+ slog.InfoContext(ctx, "generated edge mTLS CA", "certPath", caCertPath)
return caCertPath, caKeyPath, true, nil
}
diff --git a/backend/pkg/libarcane/edge/transport_test.go b/backend/pkg/libarcane/edge/transport_test.go
index ad9cc221d..c03d32075 100644
--- a/backend/pkg/libarcane/edge/transport_test.go
+++ b/backend/pkg/libarcane/edge/transport_test.go
@@ -3,7 +3,6 @@ package edge
import (
"context"
"fmt"
- "io"
"log/slog"
"net"
"net/http"
@@ -192,7 +191,7 @@ func (u *unknownTunnelConn) Transport() string { return "" }
func BenchmarkEdgeTunnelProxyRequest(b *testing.B) {
previousLogger := slog.Default()
- slog.SetDefault(slog.New(slog.NewTextHandler(io.Discard, nil)))
+ slog.SetDefault(slog.New(slog.DiscardHandler))
b.Cleanup(func() {
slog.SetDefault(previousLogger)
})
diff --git a/backend/pkg/libarcane/edge/tunnel.go b/backend/pkg/libarcane/edge/tunnel.go
index bd7ba610c..2a61d89d1 100644
--- a/backend/pkg/libarcane/edge/tunnel.go
+++ b/backend/pkg/libarcane/edge/tunnel.go
@@ -260,7 +260,7 @@ func (t *GRPCManagerTunnelConn) Receive() (*TunnelMessage, error) {
if errors.Is(err, errUnknownTunnelPayload) {
// A newer peer sent a payload this build cannot decode yet;
// skip it like unknown websocket message types are skipped.
- slog.Debug("Ignoring unknown edge tunnel payload", "error", err)
+ slog.DebugContext(t.stream.Context(), "Ignoring unknown edge tunnel payload", "error", err)
continue
}
return nil, err
@@ -347,7 +347,7 @@ func (t *GRPCAgentTunnelConn) Receive() (*TunnelMessage, error) {
if errors.Is(err, errUnknownTunnelPayload) {
// A newer peer sent a payload this build cannot decode yet;
// skip it like unknown websocket message types are skipped.
- slog.Debug("Ignoring unknown edge tunnel payload", "error", err)
+ slog.DebugContext(t.stream.Context(), "Ignoring unknown edge tunnel payload", "error", err)
continue
}
return nil, err
diff --git a/backend/pkg/libarcane/edge/ws_proxy.go b/backend/pkg/libarcane/edge/ws_proxy.go
index a3a48f827..1f5284680 100644
--- a/backend/pkg/libarcane/edge/ws_proxy.go
+++ b/backend/pkg/libarcane/edge/ws_proxy.go
@@ -77,8 +77,8 @@ func ProxyWebSocketRequest(c *echo.Context, tunnel *AgentTunnel, targetPath stri
}
slog.DebugContext(ctx, "Started WebSocket stream through edge tunnel",
- "stream_id", streamID,
- "environment_id", tunnel.EnvironmentID,
+ "streamId", streamID,
+ "environmentId", tunnel.EnvironmentID,
"path", targetPath,
)
@@ -142,7 +142,7 @@ func forwardAgentToClient(ctx, streamCtx context.Context, clientWS *websocket.Co
err := clientWS.Ping(pctx)
pcancel()
if err != nil {
- slog.DebugContext(ctx, "Failed to ping client WebSocket", "stream_id", streamID, "error", err)
+ slog.DebugContext(ctx, "Failed to ping client WebSocket", "streamId", streamID, "error", err)
sendWebSocketClose(tunnel, streamID)
return
}
@@ -165,7 +165,7 @@ func handleAgentMessage(ctx, streamCtx context.Context, clientWS *websocket.Conn
case MessageTypeWebSocketData, MessageTypeStreamData:
return false, writeWebSocketData(streamCtx, clientWS, msg)
case MessageTypeWebSocketClose, MessageTypeStreamClose, MessageTypeStreamEnd:
- slog.DebugContext(ctx, "Agent closed WebSocket stream", "stream_id", streamID, "error", msg.Error)
+ slog.DebugContext(ctx, "Agent closed WebSocket stream", "streamId", streamID, "error", msg.Error)
status, reason := websocket.StatusNormalClosure, msg.Error
if reason != "" {
status = websocket.StatusInternalError
@@ -174,7 +174,7 @@ func handleAgentMessage(ctx, streamCtx context.Context, clientWS *websocket.Conn
}
}
if err := clientWS.Close(status, reason); err != nil {
- slog.DebugContext(ctx, "Failed to close client WebSocket", "stream_id", streamID, "status", int(status), "error", err)
+ slog.DebugContext(ctx, "Failed to close client WebSocket", "streamId", streamID, "status", int(status), "error", err)
}
return true, nil
case MessageTypeRequest,
@@ -192,10 +192,10 @@ func handleAgentMessage(ctx, streamCtx context.Context, clientWS *websocket.Conn
MessageTypeFileChunk,
MessageTypeStreamOpen,
MessageTypeCancelRequest:
- slog.DebugContext(ctx, "Ignoring tunnel message", "type", msg.Type, "stream_id", streamID)
+ slog.DebugContext(ctx, "Ignoring tunnel message", "type", msg.Type, "streamId", streamID)
return false, nil
default:
- slog.DebugContext(ctx, "Unknown tunnel message", "type", msg.Type, "stream_id", streamID)
+ slog.DebugContext(ctx, "Unknown tunnel message", "type", msg.Type, "streamId", streamID)
return false, nil
}
}
@@ -203,7 +203,7 @@ func handleAgentMessage(ctx, streamCtx context.Context, clientWS *websocket.Conn
func writeWebSocketData(streamCtx context.Context, clientWS *websocket.Conn, msg *TunnelMessage) error {
msgType := websocket.MessageType(msg.WSMessageType)
if msgType != websocket.MessageText && msgType != websocket.MessageBinary {
- slog.Warn("Dropping WebSocket message with unsupported type", "messageType", msg.WSMessageType)
+ slog.WarnContext(streamCtx, "Dropping WebSocket message with unsupported type", "messageType", msg.WSMessageType)
return nil
}
wctx, cancel := context.WithTimeout(streamCtx, tunnelWSDataWriteWait)
diff --git a/backend/pkg/libarcane/rustic/run.go b/backend/pkg/libarcane/rustic/run.go
index 5cce5b764..1491dfa2f 100644
--- a/backend/pkg/libarcane/rustic/run.go
+++ b/backend/pkg/libarcane/rustic/run.go
@@ -64,7 +64,7 @@ func Run(ctx context.Context, dockerClient *client.Client, password string, comm
if containerRemoveErr == nil || cerrdefs.IsNotFound(containerRemoveErr) {
return
}
- slog.WarnContext(cleanupCtx, "failed to remove Rustic container, retrying", "container_id", created.ID, "error", containerRemoveErr)
+ slog.WarnContext(cleanupCtx, "failed to remove Rustic container, retrying", "containerId", created.ID, "error", containerRemoveErr)
time.Sleep(5 * time.Second)
}
}()
diff --git a/backend/pkg/libarcane/startup/startup.go b/backend/pkg/libarcane/startup/startup.go
index c36b82987..566485b33 100644
--- a/backend/pkg/libarcane/startup/startup.go
+++ b/backend/pkg/libarcane/startup/startup.go
@@ -87,7 +87,7 @@ func CleanupOrphanedVolumeHelpers(ctx context.Context, cleanupFunc func(context.
return
}
- slog.InfoContext(ctx, "Orphaned volume helper cleanup completed", "removed_count", removedCount)
+ slog.InfoContext(ctx, "Orphaned volume helper cleanup completed", "removedCount", removedCount)
}
func InitializeNonAgentFeatures(
diff --git a/backend/pkg/libarcane/swarm/convert_service.go b/backend/pkg/libarcane/swarm/convert_service.go
index 24e9d88e4..6fee1d625 100644
--- a/backend/pkg/libarcane/swarm/convert_service.go
+++ b/backend/pkg/libarcane/swarm/convert_service.go
@@ -2,6 +2,7 @@ package swarm
import (
"cmp"
+ "context"
"errors"
"fmt"
"log/slog"
@@ -531,7 +532,8 @@ func applyServicePortsInternal(spec *swarm.ServiceSpec, ports []composegotypes.S
converted := make([]swarm.PortConfig, 0, len(ports))
for _, port := range ports {
if strings.TrimSpace(port.HostIP) != "" {
- slog.Warn("swarm ignores a compose port host IP", "hostIP", port.HostIP, "targetPort", port.Target)
+ slog.WarnContext(context.Background(), "swarm ignores a compose port host IP", //nolint:forbidigo // Compose-to-swarm conversion is a pure transformation without a request context.
+ "hostIp", port.HostIP, "targetPort", port.Target)
}
entry := swarm.PortConfig{
Name: port.Name,
diff --git a/backend/pkg/libarcane/system/gpu.go b/backend/pkg/libarcane/system/gpu.go
index 52593a97e..79caeb504 100644
--- a/backend/pkg/libarcane/system/gpu.go
+++ b/backend/pkg/libarcane/system/gpu.go
@@ -170,7 +170,7 @@ func (m *GPUMonitor) detectInternal(ctx context.Context) error {
}
return errors.New("intel_gpu_top not found but GPU_TYPE set to intel")
default:
- slog.WarnContext(ctx, "Invalid GPU_TYPE specified, falling back to auto-detection", "gpu_type", t)
+ slog.WarnContext(ctx, "Invalid GPU_TYPE specified, falling back to auto-detection", "gpuType", t)
}
}
@@ -277,7 +277,7 @@ func getNvidiaStatsInternal(ctx context.Context) ([]systemtypes.GPUStats, error)
return nil, errors.New("no GPU data parsed from nvidia-smi")
}
- slog.DebugContext(ctx, "Collected NVIDIA GPU stats", "gpu_count", len(stats))
+ slog.DebugContext(ctx, "Collected NVIDIA GPU stats", "gpuCount", len(stats))
return stats, nil
}
@@ -321,7 +321,7 @@ func getAMDStatsInternal(ctx context.Context) ([]systemtypes.GPUStats, error) {
return nil, errors.New("no AMD GPU data found in sysfs")
}
- slog.DebugContext(ctx, "Collected AMD GPU stats", "gpu_count", len(stats))
+ slog.DebugContext(ctx, "Collected AMD GPU stats", "gpuCount", len(stats))
return stats, nil
}
diff --git a/backend/pkg/libarcane/volumes/volume_rename.go b/backend/pkg/libarcane/volumes/volume_rename.go
index f0c8341be..6ffc90dca 100644
--- a/backend/pkg/libarcane/volumes/volume_rename.go
+++ b/backend/pkg/libarcane/volumes/volume_rename.go
@@ -422,7 +422,7 @@ func createProjectVolumeCopyHolderContainerInternal(ctx context.Context,
cleanupCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
defer cancel()
if _, containerRemoveErr := dockerClient.ContainerRemove(cleanupCtx, resp.ID, volumehelper.RemoveOptions()); containerRemoveErr != nil && !cerrdefs.IsNotFound(containerRemoveErr) {
- slog.WarnContext(cleanupCtx, "failed to remove volume copy holder", "containerID", resp.ID, "error", containerRemoveErr)
+ slog.WarnContext(cleanupCtx, "failed to remove volume copy holder", "containerId", resp.ID, "error", containerRemoveErr)
}
}
diff --git a/backend/pkg/libarcane/vuln/driver.go b/backend/pkg/libarcane/vuln/driver.go
index 10bbf67dd..452258eed 100644
--- a/backend/pkg/libarcane/vuln/driver.go
+++ b/backend/pkg/libarcane/vuln/driver.go
@@ -270,7 +270,7 @@ func LogContainerStartupRequest(ctx context.Context, scope string, config *conta
"privileged", privileged,
"autoRemove", autoRemove,
"mounts", mounts,
- "nanoCPUs", resources.NanoCPUs,
+ "nanoCpUs", resources.NanoCPUs,
"cpuset", resources.CpusetCpus,
"memory", resources.Memory,
"memorySwap", resources.MemorySwap,
@@ -325,7 +325,7 @@ func ReadStartupLogs(ctx context.Context, dockerClient *client.Client, container
return stdoutLog, stderrLog
}
-func RemoveContainer(ctx context.Context, dockerClient *client.Client, containerID, warningMessage string) {
+func RemoveContainer(ctx context.Context, dockerClient *client.Client, containerID, purpose string) {
if dockerClient == nil || containerID == "" {
return
}
@@ -335,7 +335,7 @@ func RemoveContainer(ctx context.Context, dockerClient *client.Client, container
defer cleanupCancel()
if _, err := dockerClient.ContainerRemove(cleanupCtx, containerID, client.ContainerRemoveOptions{Force: true}); err != nil && !cerrdefs.IsNotFound(err) {
- slog.WarnContext(cleanupCtx, warningMessage, "containerId", containerID, "error", err)
+ slog.WarnContext(cleanupCtx, "failed to remove container", "purpose", purpose, "containerId", containerID, "error", err)
}
}
diff --git a/backend/pkg/libarcane/ws/client.go b/backend/pkg/libarcane/ws/client.go
index a11d99ec4..cee41b645 100644
--- a/backend/pkg/libarcane/ws/client.go
+++ b/backend/pkg/libarcane/ws/client.go
@@ -84,7 +84,7 @@ func (c *Client) readPump(ctx context.Context, hub *Hub) {
// peer going away and to service control frames (close/pong).
if _, _, err := c.conn.Read(ctx); err != nil {
if !isExpectedCloseError(err) {
- slog.Debug("websocket readPump end", "err", err)
+ slog.DebugContext(ctx, "websocket readPump end", "err", err)
}
return
}
@@ -116,7 +116,7 @@ func (c *Client) writePump(ctx context.Context, hub *Hub) {
cancel()
if err != nil {
if !isExpectedCloseError(err) {
- slog.Debug("websocket write error", "err", err)
+ slog.DebugContext(ctx, "websocket write error", "err", err)
}
return
}
diff --git a/backend/pkg/libarcane/ws/hub.go b/backend/pkg/libarcane/ws/hub.go
index 35f02bfcc..bcc1c2e43 100644
--- a/backend/pkg/libarcane/ws/hub.go
+++ b/backend/pkg/libarcane/ws/hub.go
@@ -121,7 +121,8 @@ func (h *Hub) Broadcast(msg []byte) {
now := time.Now().UnixNano()
lastWarned := h.lastWarned.Load()
if now-lastWarned >= broadcastDropWarningInterval.Nanoseconds() && h.lastWarned.CompareAndSwap(lastWarned, now) {
- slog.Warn("websocket hub broadcast buffer full; dropping messages", "dropped_count", h.dropped.Swap(0))
+ slog.WarnContext(context.Background(), "websocket hub broadcast buffer full; dropping messages", //nolint:forbidigo // Hub broadcast runs outside any request context.
+ "droppedCount", h.dropped.Swap(0))
}
}
}
@@ -143,7 +144,7 @@ func (h *Hub) remove(c *Client) {
// Call outside the lock to avoid holding the mutex during cancel().
if onEmpty != nil {
- slog.Debug("websocket hub empty after client removal, triggering cleanup")
+ slog.DebugContext(context.Background(), "websocket hub empty after client removal, triggering cleanup") //nolint:forbidigo // Hub cleanup runs outside any request context.
onEmpty()
}
}
diff --git a/backend/pkg/libarcane/ws/hub_test.go b/backend/pkg/libarcane/ws/hub_test.go
index 3eca61bd1..3edbd612a 100644
--- a/backend/pkg/libarcane/ws/hub_test.go
+++ b/backend/pkg/libarcane/ws/hub_test.go
@@ -356,7 +356,7 @@ func TestHub_BroadcastOverloadAggregatesDropWarning(t *testing.T) {
logLines := strings.Split(strings.TrimSpace(logBuffer.String()), "\n")
require.Len(t, logLines, 1)
assert.Contains(t, logLines[0], "websocket hub broadcast buffer full; dropping messages")
- assert.Contains(t, logLines[0], "dropped_count=1001")
+ assert.Contains(t, logLines[0], "droppedCount=1001")
assert.Zero(t, h.dropped.Load())
h.Broadcast([]byte("still overloaded"))
diff --git a/backend/pkg/libarcane/ws/proxy.go b/backend/pkg/libarcane/ws/proxy.go
index 4b7c4df05..04a84260a 100644
--- a/backend/pkg/libarcane/ws/proxy.go
+++ b/backend/pkg/libarcane/ws/proxy.go
@@ -24,14 +24,14 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
clientConn, err := Accept(w, r, checkOrigin)
if err != nil {
- slog.Error("failed to upgrade client connection", "remoteWS", remoteWS, "err", err)
+ slog.ErrorContext(r.Context(), "failed to upgrade client connection", "remoteWs", remoteWS, "err", err)
return err
}
defer func() { _ = clientConn.CloseNow() }()
// This is a pure bridge; frame-size policing is the remote endpoint's job.
clientConn.SetReadLimit(-1)
- slog.Debug("attempting websocket dial", "remoteWS", remoteWS, "headers", header)
+ slog.DebugContext(r.Context(), "attempting websocket dial", "remoteWs", remoteWS, "headers", header)
dialCtx, dialCancel := context.WithTimeout(r.Context(), 45*time.Second)
remoteConn, resp, err := websocket.Dial(dialCtx, remoteWS, &websocket.DialOptions{
HTTPHeader: header,
@@ -44,7 +44,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
_ = resp.Body.Close()
}
if err != nil {
- slog.Error("failed to dial remote websocket", "remoteWS", remoteWS, "err", err, "resp_status", func() int {
+ slog.ErrorContext(dialCtx, "failed to dial remote websocket", "remoteWs", remoteWS, "err", err, "respStatus", func() int {
if resp != nil {
return resp.StatusCode
}
@@ -56,7 +56,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
defer func() { _ = remoteConn.CloseNow() }()
remoteConn.SetReadLimit(-1)
- slog.Debug("websocket proxy established", "remoteWS", remoteWS)
+ slog.DebugContext(dialCtx, "websocket proxy established", "remoteWs", remoteWS)
// When either pump ends, the handler returns and the deferred CloseNow
// calls unblock the other pump.
@@ -71,7 +71,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
for {
mt, msg, readErr := clientConn.Read(pumpCtx)
if readErr != nil {
- relayCloseInternal(remoteConn, readErr)
+ relayCloseInternal(r.Context(), remoteConn, readErr)
return
}
if writeErr := remoteConn.Write(pumpCtx, mt, msg); writeErr != nil {
@@ -86,7 +86,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
for {
mt, msg, readErr := remoteConn.Read(pumpCtx)
if readErr != nil {
- relayCloseInternal(clientConn, readErr)
+ relayCloseInternal(r.Context(), clientConn, readErr)
return
}
if writeErr := clientConn.Write(pumpCtx, mt, msg); writeErr != nil {
@@ -101,7 +101,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request, remoteWS string, header h
// relayCloseInternal forwards a peer's close status to the other side of the
// bridge so the terminating reason survives the proxy hop.
-func relayCloseInternal(conn *websocket.Conn, err error) {
+func relayCloseInternal(ctx context.Context, conn *websocket.Conn, err error) {
var ce websocket.CloseError
if !errors.As(err, &ce) {
return
@@ -111,6 +111,6 @@ func relayCloseInternal(conn *websocket.Conn, err error) {
code = websocket.StatusNormalClosure
}
if closeErr := conn.Close(code, ce.Reason); closeErr != nil {
- slog.Debug("failed to relay websocket close", "status", int(code), "err", closeErr)
+ slog.DebugContext(ctx, "failed to relay websocket close", "status", int(code), "err", closeErr)
}
}
diff --git a/backend/pkg/projects/compose.go b/backend/pkg/projects/compose.go
index 5ccc0bed3..725bbdec6 100644
--- a/backend/pkg/projects/compose.go
+++ b/backend/pkg/projects/compose.go
@@ -258,6 +258,6 @@ func (w *writerConsumer) write(container, msg string) {
defer w.mu.Unlock()
if _, err := io.WriteString(w.out, output); err != nil && !w.writeErrLogged {
w.writeErrLogged = true
- slog.Debug("project log output write failed; subsequent output may be truncated", "error", err)
+ slog.DebugContext(context.Background(), "project log output write failed; subsequent output may be truncated", "error", err) //nolint:forbidigo // Compose output writer has no request context.
}
}
diff --git a/backend/pkg/projects/coordinator.go b/backend/pkg/projects/coordinator.go
index 806583d07..0325ad40d 100644
--- a/backend/pkg/projects/coordinator.go
+++ b/backend/pkg/projects/coordinator.go
@@ -70,9 +70,9 @@ func (c *composeCoordinatorInternal) Deploy(ctx context.Context, request project
return nil, fmt.Errorf("failed to prepare project images for deploy: %w", prepareImagesForDeployErr)
}
removeOrphans := ResolveRemoveOrphans(request.GitOpsManaged, request.Options)
- slog.InfoContext(ctx, "starting compose up with health check support", "projectID", request.ProjectID, "projectName", model.Name, "services", len(model.Services), "removeOrphans", removeOrphans)
+ slog.InfoContext(ctx, "starting compose up with health check support", "projectId", request.ProjectID, "projectName", model.Name, "services", len(model.Services), "removeOrphans", removeOrphans)
if upErr := c.commands.Up(ctx, model, nil, removeOrphans, forceRecreate, recreateVolumes, request.AuthConfigs, request.WaitTimeout); upErr != nil {
- slog.ErrorContext(ctx, "compose up failed", "projectName", model.Name, "projectID", request.ProjectID, "error", upErr)
+ slog.ErrorContext(ctx, "compose up failed", "projectName", model.Name, "projectId", request.ProjectID, "error", upErr)
if strings.Contains(upErr.Error(), "timeout") || strings.Contains(upErr.Error(), "context deadline exceeded") {
return nil,
fmt.Errorf("deployment timed out waiting for services - long-running 'service_healthy'/'service_completed_successfully' dependencies "+
@@ -81,7 +81,7 @@ func (c *composeCoordinatorInternal) Deploy(ctx context.Context, request project
}
return nil, fmt.Errorf("failed to deploy project: %w", upErr)
}
- slog.InfoContext(ctx, "compose up completed successfully", "projectID", request.ProjectID, "projectName", model.Name)
+ slog.InfoContext(ctx, "compose up completed successfully", "projectId", request.ProjectID, "projectName", model.Name)
return model, nil
}
diff --git a/backend/pkg/projects/custom_labels.go b/backend/pkg/projects/custom_labels.go
index 8ca5499a4..dbd194646 100644
--- a/backend/pkg/projects/custom_labels.go
+++ b/backend/pkg/projects/custom_labels.go
@@ -136,7 +136,7 @@ func parseArcaneComposeMetadataFromFileInternal(ctx context.Context, composeFile
return meta, fmt.Errorf("load compose metadata: %w", err)
}
- meta = extractArcaneComposeMetadata(project)
+ meta = extractArcaneComposeMetadata(ctx, project)
if project != nil {
meta.ComposeFiles = slices.Clone(project.ComposeFiles)
}
@@ -161,20 +161,20 @@ func parseArcaneComposeMetadataFromFileInternal(ctx context.Context, composeFile
if parseArcaneComposeMetadataFromFileErr != nil {
return meta, fmt.Errorf("load included Compose metadata %s: %w", resolvedPath, parseArcaneComposeMetadataFromFileErr)
}
- mergeArcaneComposeMetadata(&meta, includedMeta)
+ mergeArcaneComposeMetadata(ctx, &meta, includedMeta)
}
return meta, nil
}
-func extractArcaneComposeMetadata(project *composetypes.Project) ArcaneComposeMetadata {
+func extractArcaneComposeMetadata(ctx context.Context, project *composetypes.Project) ArcaneComposeMetadata {
meta := emptyArcaneComposeMetadataInternal()
if project == nil {
return meta
}
if arcaneBlock, ok := project.Extensions[arcaneBlockKey]; ok {
- meta.ProjectIcon, meta.ProjectURLS, meta.ProjectTags, meta.ProjectTagsAuthoritative = parseArcaneBlockInternal(arcaneBlock)
+ meta.ProjectIcon, meta.ProjectURLS, meta.ProjectTags, meta.ProjectTagsAuthoritative = parseArcaneBlockInternal(ctx, arcaneBlock)
}
for name, svc := range project.Services {
@@ -184,7 +184,7 @@ func extractArcaneComposeMetadata(project *composetypes.Project) ArcaneComposeMe
}
if iconSet.IsEmpty() {
if arcaneBlock, ok := svc.Extensions[arcaneBlockKey]; ok {
- iconSet, _, _, _ = parseArcaneBlockInternal(arcaneBlock)
+ iconSet, _, _, _ = parseArcaneBlockInternal(ctx, arcaneBlock)
}
}
if !iconSet.IsEmpty() {
@@ -195,7 +195,7 @@ func extractArcaneComposeMetadata(project *composetypes.Project) ArcaneComposeMe
return meta
}
-func parseArcaneBlockInternal(block any) (IconSet, []string, []projecttypes.TagOption, bool) {
+func parseArcaneBlockInternal(ctx context.Context, block any) (IconSet, []string, []projecttypes.TagOption, bool) {
arcaneBlock, ok := kit.AsStringMap(block)
if !ok {
return IconSet{}, nil, nil, false
@@ -209,15 +209,15 @@ func parseArcaneBlockInternal(block any) (IconSet, []string, []projecttypes.TagO
Dark: cmp.Or(kit.Collect(arcaneBlock[arcaneIconDarkKey], kit.ToString)...),
}
urls := kit.Unique(kit.TrimNonEmpty(kit.Collect(arcaneBlock[arcaneURLsKey], kit.ToString)))
- tags, tagsAuthoritative := parseComposeTagsInternal(arcaneBlock[arcaneTagsKey])
+ tags, tagsAuthoritative := parseComposeTagsInternal(ctx, arcaneBlock[arcaneTagsKey])
return icon, urls, tags, tagsAuthoritative
}
-func parseComposeTagsInternal(value any) ([]projecttypes.TagOption, bool) {
+func parseComposeTagsInternal(ctx context.Context, value any) ([]projecttypes.TagOption, bool) {
values, ok := value.([]any)
if !ok {
if value != nil {
- slog.Warn("skipping invalid x-arcane tags; expected a list of name/color objects")
+ slog.WarnContext(ctx, "skipping invalid x-arcane tags; expected a list of name/color objects")
return nil, false
}
return nil, true
@@ -229,26 +229,26 @@ func parseComposeTagsInternal(value any) ([]projecttypes.TagOption, bool) {
for index, value := range values {
definition, localOk := kit.AsStringMap(value)
if !localOk {
- slog.Warn("skipping invalid x-arcane tag; expected a name/color object", "index", index)
+ slog.WarnContext(ctx, "skipping invalid x-arcane tag; expected a name/color object", "index", index)
authoritative = false
continue
}
nameValue := kit.ToString(definition["name"])
colorValue := kit.ToString(definition["color"])
if nameValue == "" || colorValue == "" {
- slog.Warn("skipping invalid x-arcane tag; name and color are required", "index", index)
+ slog.WarnContext(ctx, "skipping invalid x-arcane tag; name and color are required", "index", index)
authoritative = false
continue
}
name, err := NormalizeProjectTag(nameValue)
if err != nil {
- slog.Warn("skipping invalid x-arcane tag", "index", index, "error", err)
+ slog.WarnContext(ctx, "skipping invalid x-arcane tag", "index", index, "error", err)
authoritative = false
continue
}
color, err := NormalizeProjectTagColor(projecttypes.TagColor(colorValue))
if err != nil {
- slog.Warn("skipping invalid x-arcane tag color", "index", index, "tag", name, "error", err)
+ slog.WarnContext(ctx, "skipping invalid x-arcane tag color", "index", index, "tag", name, "error", err)
authoritative = false
continue
}
@@ -256,7 +256,7 @@ func parseComposeTagsInternal(value any) ([]projecttypes.TagOption, bool) {
continue
}
if len(tags) >= ProjectTagsPerSourceLimit {
- slog.Warn("skipping x-arcane tags over per-project limit", "limit", ProjectTagsPerSourceLimit)
+ slog.WarnContext(ctx, "skipping x-arcane tags over per-project limit", "limit", ProjectTagsPerSourceLimit)
authoritative = false
break
}
@@ -266,7 +266,7 @@ func parseComposeTagsInternal(value any) ([]projecttypes.TagOption, bool) {
return tags, authoritative
}
-func mergeComposeTagsInternal(target, source []projecttypes.TagOption) []projecttypes.TagOption {
+func mergeComposeTagsInternal(ctx context.Context, target, source []projecttypes.TagOption) []projecttypes.TagOption {
merged := make([]projecttypes.TagOption, 0, min(len(target)+len(source), ProjectTagsPerSourceLimit))
seen := make(map[string]struct{}, len(target)+len(source))
for _, tag := range append(target, source...) {
@@ -274,7 +274,7 @@ func mergeComposeTagsInternal(target, source []projecttypes.TagOption) []project
continue
}
if len(merged) >= ProjectTagsPerSourceLimit {
- slog.Warn("skipping included x-arcane tags over per-project limit", "limit", ProjectTagsPerSourceLimit)
+ slog.WarnContext(ctx, "skipping included x-arcane tags over per-project limit", "limit", ProjectTagsPerSourceLimit)
break
}
seen[tag.Name] = struct{}{}
@@ -283,7 +283,7 @@ func mergeComposeTagsInternal(target, source []projecttypes.TagOption) []project
return merged
}
-func mergeArcaneComposeMetadata(target *ArcaneComposeMetadata, source ArcaneComposeMetadata) {
+func mergeArcaneComposeMetadata(ctx context.Context, target *ArcaneComposeMetadata, source ArcaneComposeMetadata) {
if target == nil {
return
}
@@ -291,7 +291,7 @@ func mergeArcaneComposeMetadata(target *ArcaneComposeMetadata, source ArcaneComp
target.ProjectIcon = mergeIconSetFieldsInternal(target.ProjectIcon, source.ProjectIcon)
target.ProjectURLS = kit.Unique(kit.TrimNonEmpty(append(target.ProjectURLS, source.ProjectURLS...)))
- target.ProjectTags = mergeComposeTagsInternal(target.ProjectTags, source.ProjectTags)
+ target.ProjectTags = mergeComposeTagsInternal(ctx, target.ProjectTags, source.ProjectTags)
target.ProjectTagsAuthoritative = target.ProjectTagsAuthoritative && source.ProjectTagsAuthoritative
target.ComposeFiles = append(target.ComposeFiles, source.ComposeFiles...)
target.EnvFiles = append(target.EnvFiles, source.EnvFiles...)
diff --git a/backend/pkg/projects/discovery.go b/backend/pkg/projects/discovery.go
index b8fed2e97..62faeb086 100644
--- a/backend/pkg/projects/discovery.go
+++ b/backend/pkg/projects/discovery.go
@@ -125,7 +125,7 @@ func walkProjectDirectoriesInternal(ctx context.Context,
identity, err := ResolveDirectoryIdentityInternal(path)
if err != nil {
if !isRoot && errors.Is(err, os.ErrPermission) {
- slog.Warn("Skipping unreadable project directory during discovery", "path", path, "error", err)
+ slog.WarnContext(ctx, "Skipping unreadable project directory during discovery", "path", path, "error", err)
return nil
}
return err
@@ -148,7 +148,7 @@ func walkProjectDirectoriesInternal(ctx context.Context,
switch composePath, detectComposeFileErr := DetectComposeFile(ctx, root, path); {
case detectComposeFileErr == nil, errors.Is(detectComposeFileErr, common.ErrProjectEnvUnreadable) && composePath != "":
if detectComposeFileErr != nil {
- slog.Warn("Discovered project with an unreadable .env",
+ slog.WarnContext(ctx, "Discovered project with an unreadable .env",
"path", path,
"envFile", filepath.Join(path, EffectiveEnvFileName),
"uid", os.Geteuid(),
@@ -164,7 +164,7 @@ func walkProjectDirectoriesInternal(ctx context.Context,
}
case errors.Is(detectComposeFileErr, common.ErrComposeFileNotFound):
default:
- slog.Warn("Skipping undetectable project directory during discovery", "path", path, "error", detectComposeFileErr)
+ slog.WarnContext(ctx, "Skipping undetectable project directory during discovery", "path", path, "error", detectComposeFileErr)
}
if maxDepth > 0 && currentDepth >= maxDepth {
@@ -174,7 +174,7 @@ func walkProjectDirectoriesInternal(ctx context.Context,
entries, err := os.ReadDir(path)
if err != nil {
if !isRoot && errors.Is(err, os.ErrPermission) {
- slog.Warn("Skipping unreadable project directory during discovery", "path", path, "error", err)
+ slog.WarnContext(ctx, "Skipping unreadable project directory during discovery", "path", path, "error", err)
return nil
}
return err
diff --git a/backend/pkg/projects/env.go b/backend/pkg/projects/env.go
index 9c5930c31..1fdce5a89 100644
--- a/backend/pkg/projects/env.go
+++ b/backend/pkg/projects/env.go
@@ -196,7 +196,7 @@ func (l *EnvLoader) loadAndMergeGlobalEnv(ctx context.Context, path string, envM
injectionVars[k] = v
}
- slog.DebugContext(ctx, "Merged global env into environment map", "total_env_count", len(envMap))
+ slog.DebugContext(ctx, "Merged global env into environment map", "totalEnvCount", len(envMap))
return nil
}
@@ -217,7 +217,7 @@ func (l *EnvLoader) loadAndMergeProjectEnv(ctx context.Context, path string, env
}
}
- slog.DebugContext(ctx, "Merged project .env into environment map", "total_env_count", len(envMap))
+ slog.DebugContext(ctx, "Merged project .env into environment map", "totalEnvCount", len(envMap))
return nil
}
@@ -339,7 +339,7 @@ func WithTransientValidationEnvFile(ctx context.Context, projectPath string, eff
// Its contents can't be verified or safely overwritten, so leave it
// untouched and validate against whatever's already on disk instead of
// aborting the whole update.
- slog.Warn("skipping unreadable .env during compose validation; leaving it untouched", "projectPath", projectPath, "error", readErr)
+ slog.WarnContext(ctx, "skipping unreadable .env during compose validation; leaving it untouched", "projectPath", projectPath, "error", readErr)
if run == nil {
return nil
}
@@ -637,7 +637,8 @@ func ReadProjectEnvState(projectPath string) (ProjectEnvState, error) {
}
if effectiveUnreadable || gitSourceUnreadable || overrideUnreadable {
- slog.Warn("skipping unreadable project env file(s); leaving them untouched",
+ ctx := context.Background() //nolint:forbidigo // Compose environment parsing is a pure helper without a request context.
+ slog.WarnContext(ctx, "skipping unreadable project env file(s); leaving them untouched",
"projectPath", projectPath,
"effectiveUnreadable", effectiveUnreadable,
"gitSourceUnreadable", gitSourceUnreadable,
@@ -689,7 +690,7 @@ func ReadProjectEnvState(projectPath string) (ProjectEnvState, error) {
// typically unwritable too, so attempting the write would abort the whole caller.
func WriteManagedEnvFile(ctx context.Context, projectsDirectory, projectPath, fileName string, unreadable bool, content string) error {
if unreadable {
- slog.Warn("skipping unreadable project env file; leaving it untouched", "projectPath", projectPath, "file", fileName)
+ slog.WarnContext(ctx, "skipping unreadable project env file; leaving it untouched", "projectPath", projectPath, "file", fileName)
return nil
}
@@ -828,7 +829,7 @@ func ParseComposeEnvOptions(workdir string, env EnvMap) (ComposeEnvOptions, erro
if n, convErr := strconv.Atoi(raw); convErr == nil && n > 0 {
opts.ParallelLimit = n
} else {
- slog.Debug("ignoring invalid COMPOSE_PARALLEL_LIMIT", "value", raw)
+ slog.DebugContext(context.Background(), "ignoring invalid COMPOSE_PARALLEL_LIMIT", "value", raw) //nolint:forbidigo // Compose environment parsing is a pure helper without a request context.
}
}
@@ -993,7 +994,8 @@ func parseComposeBoolInternal(env EnvMap, key string) bool {
}
v, err := strconv.ParseBool(raw)
if err != nil {
- slog.Debug("ignoring invalid compose boolean env var", "key", key, "value", raw)
+ slog.DebugContext(context.Background(), "ignoring invalid compose boolean env var", //nolint:forbidigo // Compose environment parsing is a pure helper without a request context.
+ "key", key, "value", raw)
return false
}
return v
diff --git a/backend/pkg/projects/fs_templates.go b/backend/pkg/projects/fs_templates.go
index fbf8279b0..3b97d1c75 100644
--- a/backend/pkg/projects/fs_templates.go
+++ b/backend/pkg/projects/fs_templates.go
@@ -372,6 +372,6 @@ func ResolveTemplateIconURL(ctx context.Context, composeContent, envContent stri
return nil
}
- icon, _, _, _ := parseArcaneBlockInternal(project.Extensions[arcaneBlockKey])
+ icon, _, _, _ := parseArcaneBlockInternal(ctx, project.Extensions[arcaneBlockKey])
return mo.EmptyableToOption(strings.TrimSpace(icon.Icon)).ToPointer()
}
diff --git a/backend/pkg/projects/fs_writer.go b/backend/pkg/projects/fs_writer.go
index 7b7146b9f..0c48fa384 100644
--- a/backend/pkg/projects/fs_writer.go
+++ b/backend/pkg/projects/fs_writer.go
@@ -298,10 +298,10 @@ func RollbackRenamedProjectDirectory(ctx context.Context, oldPath, newPath strin
case oldExists && newExists:
conflictPath, relocateRenameConflictDirectoryErr := relocateRenameConflictDirectoryInternal(ctx, newPath)
if relocateRenameConflictDirectoryErr != nil {
- slog.Warn("project rename directory rollback found both paths and failed to relocate target path; keeping old path and clearing journal",
+ slog.WarnContext(ctx, "project rename directory rollback found both paths and failed to relocate target path; keeping old path and clearing journal",
"oldPath", oldPath, "newPath", newPath, "error", relocateRenameConflictDirectoryErr)
} else {
- slog.Warn("project rename directory rollback found both paths; moved target path aside and kept old path", "oldPath", oldPath, "newPath", newPath, "conflictPath", conflictPath)
+ slog.WarnContext(ctx, "project rename directory rollback found both paths; moved target path aside and kept old path", "oldPath", oldPath, "newPath", newPath, "conflictPath", conflictPath)
}
case !oldExists && newExists:
// Both paths share a parent whenever the rename stayed inside the
@@ -318,7 +318,7 @@ func RollbackRenamedProjectDirectory(ctx context.Context, oldPath, newPath strin
}
case !oldExists:
pathsMissing = true
- slog.Warn("project rename directory paths are missing during rollback", "oldPath", oldPath, "newPath", newPath)
+ slog.WarnContext(ctx, "project rename directory paths are missing during rollback", "oldPath", oldPath, "newPath", newPath)
}
return pathsMissing, nil
}
@@ -491,7 +491,8 @@ func findComposeOverrideCandidatesInternal(exists func(name string) bool) []stri
// highest-preference match will be used.
func warnOnMultipleComposeOverridesInternal(found []string) {
if len(found) > 1 {
- slog.Warn("multiple compose override files found; using highest-preference match",
+ ctx := context.Background() //nolint:forbidigo // Compose file discovery is a pure helper without a request context.
+ slog.WarnContext(ctx, "multiple compose override files found; using highest-preference match",
"using", found[0], "found", found)
}
}
diff --git a/backend/pkg/projects/load.go b/backend/pkg/projects/load.go
index 840c632e5..786afc449 100644
--- a/backend/pkg/projects/load.go
+++ b/backend/pkg/projects/load.go
@@ -301,7 +301,7 @@ func ApplyLenientLoaderOptions(ctx context.Context, opts *loader.Options, compos
opts.SkipValidation = true
opts.SkipConsistencyCheck = true
if opts.Interpolate == nil {
- slog.WarnContext(ctx, "compose loader did not initialize Interpolate options; lenient variable substitution will not apply", "compose_file", composeFile)
+ slog.WarnContext(ctx, "compose loader did not initialize Interpolate options; lenient variable substitution will not apply", "composeFile", composeFile)
return
}
@@ -322,7 +322,7 @@ func ApplyLenientLoaderOptions(ctx context.Context, opts *loader.Options, compos
default:
// Variable is unset with no default (or a ${VAR:?msg}
// required variable, which lenient loading tolerates).
- slog.DebugContext(ctx, "compose variable undefined during lenient load, using placeholder", "expression", substring, "compose_file", composeFile)
+ slog.DebugContext(ctx, "compose variable undefined during lenient load, using placeholder", "expression", substring, "composeFile", composeFile)
return lenientUndefinedPlaceholder, nil
}
}),
diff --git a/backend/pkg/projects/path_mapper.go b/backend/pkg/projects/path_mapper.go
index f35b51ac5..4e03dba25 100644
--- a/backend/pkg/projects/path_mapper.go
+++ b/backend/pkg/projects/path_mapper.go
@@ -372,7 +372,7 @@ func RemapEscapedRelativeSources(
slog.WarnContext(ctx,
"compose relative path resolves outside the mounted projects directory; remapped so the Docker host resolves it the same way `docker compose up` would",
"kind", target.kind, "name", target.name, "spec", rawSource,
- "container_path", target.current, "host_path", hostPath,
+ "containerPath", target.current, "hostPath", hostPath,
)
}
}
@@ -474,13 +474,13 @@ func hostWorkingDirInternal(ctx context.Context, pathMapper projecttypes.VolumeS
hostWorkingDir, mapped, err := pathMapper.ContainerToHost(containerWorkingDir)
if err != nil {
slog.WarnContext(ctx, "failed to resolve host path for project directory; relative paths outside the projects mount may resolve incorrectly",
- "working_dir", containerWorkingDir, "error", err)
+ "workingDir", containerWorkingDir, "error", err)
return "", false
}
if !mapped {
slog.WarnContext(ctx, "project directory is not inside a mounted directory; relative paths outside the projects mount may resolve incorrectly",
- "working_dir", containerWorkingDir)
+ "workingDir", containerWorkingDir)
return "", false
}
diff --git a/backend/pkg/projects/pull_policy.go b/backend/pkg/projects/pull_policy.go
index 36f8276b3..762198d7e 100644
--- a/backend/pkg/projects/pull_policy.go
+++ b/backend/pkg/projects/pull_policy.go
@@ -1,6 +1,7 @@
package projects
import (
+ "context"
"log/slog"
"strings"
"time"
@@ -67,7 +68,8 @@ func ResolveServiceImagePullMode(svc composetypes.ServiceConfig) ImagePullStep {
normalized.PullPolicy = rawPolicy
policy, refreshAfter, err := normalized.GetPullPolicy()
if err != nil {
- slog.Warn("failed to parse service pull_policy, defaulting to missing", "service", svc.Name, "pull_policy", svc.PullPolicy, "error", err)
+ slog.WarnContext(context.Background(), "failed to parse service pull_policy, defaulting to missing", //nolint:forbidigo // Pull policy parsing is a pure helper without a request context.
+ "service", svc.Name, "pullPolicy", svc.PullPolicy, "error", err)
return ImagePullStep{Mode: ImagePullModeIfMissing}
}
switch policy {
diff --git a/backend/pkg/projects/volume_migration.go b/backend/pkg/projects/volume_migration.go
index 9885ac21a..046409032 100644
--- a/backend/pkg/projects/volume_migration.go
+++ b/backend/pkg/projects/volume_migration.go
@@ -234,21 +234,21 @@ func FinalizeRenameAfterCommit(ctx context.Context,
) {
if renameJournal != nil {
if err := operations.WriteJournal(ctx, renameJournal, projecttypes.RenameJournalPhaseProjectStateCommitted); err != nil {
- slog.WarnContext(ctx, "failed to mark project rename journal committed", "projectID", projectID, "error", err)
+ slog.WarnContext(ctx, "failed to mark project rename journal committed", "projectId", projectID, "error", err)
}
}
if committer, ok := volumeMigration.(volumetypes.Committer); ok {
if err := committer.Commit(ctx); err != nil {
- slog.WarnContext(ctx, "failed to clean up project source volumes after committed rename", "projectID", projectID, "error", err)
+ slog.WarnContext(ctx, "failed to clean up project source volumes after committed rename", "projectId", projectID, "error", err)
if _, localOk := errors.AsType[*volumetypes.SourceCleanupError](err); localOk {
if writeErr := operations.WriteJournal(ctx, renameJournal, projecttypes.RenameJournalPhaseSourceCleanupPending); writeErr != nil {
- slog.WarnContext(ctx, "failed to mark project rename source cleanup pending", "projectID", projectID, "error", writeErr)
+ slog.WarnContext(ctx, "failed to mark project rename source cleanup pending", "projectId", projectID, "error", writeErr)
}
}
return
} else if writeJournalErr := operations.WriteJournal(ctx, renameJournal, projecttypes.RenameJournalPhaseOldVolumesRemoved); writeJournalErr != nil {
- slog.WarnContext(ctx, "failed to mark old project rename volumes removed", "projectID", projectID, "error", writeJournalErr)
+ slog.WarnContext(ctx, "failed to mark old project rename volumes removed", "projectId", projectID, "error", writeJournalErr)
}
}
@@ -260,7 +260,7 @@ func completeRenameJournalInternal(ctx context.Context, operations projecttypes.
return
}
if clearErr := operations.ClearJournal(ctx, projectID); clearErr != nil {
- slog.WarnContext(ctx, "failed to clear project rename journal", "projectID", projectID, "error", clearErr)
+ slog.WarnContext(ctx, "failed to clear project rename journal", "projectId", projectID, "error", clearErr)
return
}
*journalActive = false
@@ -298,7 +298,7 @@ func cleanupRenameJournalSourcesInternal(ctx context.Context, operations project
if missingWithSource, ok := errors.AsType[*volumetypes.TargetMissingWithSourceError](ensureTargetsReadyForCleanupErr); ok {
slog.WarnContext(ctx,
"rolling back project rename because target volume is missing and source volume remains",
- "projectID",
+ "projectId",
journal.ProjectID,
"sourceVolume",
missingWithSource.SourceVolume,
@@ -309,7 +309,7 @@ func cleanupRenameJournalSourcesInternal(ctx context.Context, operations project
if externallyRemoved, ok := errors.AsType[*volumetypes.VolumesExternallyRemovedError](ensureTargetsReadyForCleanupErr); ok {
slog.WarnContext(ctx,
"project rename cleanup found source and target volumes externally removed",
- "projectID",
+ "projectId",
journal.ProjectID,
"volumeCount",
len(externallyRemoved.Volumes),
@@ -335,7 +335,7 @@ func rollbackRenameJournalInternal(ctx context.Context, operations projecttypes.
if directoryErr != nil {
slog.WarnContext(ctx,
"keeping project rename journal after restoring database state because directory rollback failed",
- "projectID",
+ "projectId",
journal.ProjectID,
"pathsMissing",
pathsMissing,
@@ -345,14 +345,14 @@ func rollbackRenameJournalInternal(ctx context.Context, operations projecttypes.
if volumeErr != nil {
if volumes.OnlyPreservedTargetErrors(volumeErr) {
- slog.WarnContext(ctx, "clearing project rename journal after preserving target volume data", "projectID", journal.ProjectID, "pathsMissing", pathsMissing, "error", volumeErr)
+ slog.WarnContext(ctx, "clearing project rename journal after preserving target volume data", "projectId", journal.ProjectID, "pathsMissing", pathsMissing, "error", volumeErr)
} else {
if cleanupErr := operations.WriteRollbackCleanup(ctx, journal); cleanupErr != nil {
return errors.Join(directoryErr, volumeErr, cleanupErr)
}
slog.WarnContext(ctx,
"queued project rename target volume cleanup after restoring database state despite volume rollback failure",
- "projectID",
+ "projectId",
journal.ProjectID,
"pathsMissing",
pathsMissing,
@@ -413,7 +413,7 @@ func CleanupRenameRollbackTargets(ctx context.Context, cleanup *projecttypes.Ren
if cleanupRollbackTargetVolumesErr := volumes.CleanupRollbackTargetVolumes(ctx, dockerClient, cleanup.Volumes); cleanupRollbackTargetVolumesErr != nil {
if volumes.OnlyPreservedTargetErrors(cleanupRollbackTargetVolumesErr) {
- slog.WarnContext(ctx, "clearing project rename rollback cleanup after preserving target volume data", "projectID", cleanup.ProjectID, "error", cleanupRollbackTargetVolumesErr)
+ slog.WarnContext(ctx, "clearing project rename rollback cleanup after preserving target volume data", "projectId", cleanup.ProjectID, "error", cleanupRollbackTargetVolumesErr)
return operations.ClearRollbackCleanup(ctx, cleanup.ProjectID)
}
return cleanupRollbackTargetVolumesErr
diff --git a/backend/pkg/projects/workspace.go b/backend/pkg/projects/workspace.go
index 2782e27be..59ae010cc 100644
--- a/backend/pkg/projects/workspace.go
+++ b/backend/pkg/projects/workspace.go
@@ -2,6 +2,7 @@ package projects
import (
"bytes"
+ "context"
"crypto/sha256"
"encoding/hex"
"errors"
@@ -45,7 +46,14 @@ type ProjectWorkspaceApplyOptions struct {
MaxFileSizeBytes int64
}
-func ReadProjectWorkspace(projectPath string, maxDepth int, skipDirectories, composeFileName string, maxEntries int, maxFileSizeBytes int64) ([]workspacetypes.FileEntry, string, bool, error) {
+func ReadProjectWorkspace(
+ ctx context.Context,
+ projectPath string,
+ maxDepth int,
+ skipDirectories, composeFileName string,
+ maxEntries int,
+ maxFileSizeBytes int64,
+) ([]workspacetypes.FileEntry, string, bool, error) {
if maxDepth == ProjectWorkspaceUseScanDepth {
maxDepth = config.LoadProjectWorkspaceConfig().ProjectWorkspaceMaxDepth
}
@@ -73,6 +81,7 @@ func ReadProjectWorkspace(projectPath string, maxDepth int, skipDirectories, com
defer func() { _ = root.Close() }()
walker := &projectWorkspaceTreeWalkerInternal{
+ ctx: ctx,
projectAbs: projectAbs,
maxDepth: maxDepth,
maxEntries: maxEntries,
@@ -98,6 +107,7 @@ func ReadProjectWorkspace(projectPath string, maxDepth int, skipDirectories, com
}
type projectWorkspaceTreeWalkerInternal struct {
+ ctx context.Context
projectAbs string
maxDepth int
maxEntries int
@@ -119,7 +129,7 @@ func (w *projectWorkspaceTreeWalkerInternal) visit(rel string, entry fs.DirEntry
// on the project workspace root, or one that is not a permission/disappearance
// error, stays fatal so real I/O problems remain observable.
if rel != "." && entry != nil && entry.IsDir() && (os.IsPermission(walkErr) || os.IsNotExist(walkErr)) {
- slog.Debug("Skipping unreadable project workspace subdirectory", "relativePath", rel, "error", walkErr)
+ slog.DebugContext(w.ctx, "Skipping unreadable project workspace subdirectory", "relativePath", rel, "error", walkErr)
return fs.SkipDir
}
return walkErr
@@ -154,7 +164,7 @@ func (w *projectWorkspaceTreeWalkerInternal) visit(rel string, entry fs.DirEntry
if !os.IsPermission(err) && !os.IsNotExist(err) {
return err
}
- slog.Debug("Skipping unreadable project workspace entry", "relativePath", rel, "error", err)
+ slog.DebugContext(w.ctx, "Skipping unreadable project workspace entry", "relativePath", rel, "error", err)
return kit.Ternary(entry.IsDir(), fs.SkipDir, nil)
}
@@ -231,7 +241,7 @@ func classifyProjectWorkspaceFileInternal(filePath string, size, maxFileSizeByte
// atomicity — ProjectService.UpdateProjectWorkspace wraps every save in
// BackupProjectUpdateScope / RestoreProjectUpdateBackup, and project creation
// removes the whole directory on failure.
-func ApplyProjectWorkspaceChanges(projectPath string, changes []project.WorkspaceFileChange, uploads map[int][]byte, opts ProjectWorkspaceApplyOptions) error {
+func ApplyProjectWorkspaceChanges(ctx context.Context, projectPath string, changes []project.WorkspaceFileChange, uploads map[int][]byte, opts ProjectWorkspaceApplyOptions) error {
if opts.MaxFileSizeBytes <= 0 {
opts.MaxFileSizeBytes = workspacepkg.MaxFileSizeBytes(workspacepkg.DefaultMaxFileSizeMB)
}
@@ -247,7 +257,7 @@ func ApplyProjectWorkspaceChanges(projectPath string, changes []project.Workspac
}
if opts.ExpectedRevision != "" {
- _, currentRevision, _, err := ReadProjectWorkspace(projectPath, opts.MaxDepth, opts.SkipDirectories, opts.ComposeFileName, opts.MaxEntries, opts.MaxFileSizeBytes)
+ _, currentRevision, _, err := ReadProjectWorkspace(ctx, projectPath, opts.MaxDepth, opts.SkipDirectories, opts.ComposeFileName, opts.MaxEntries, opts.MaxFileSizeBytes)
if err != nil {
return fmt.Errorf("read project workspace revision: %w", err)
}
diff --git a/backend/pkg/projects/workspace_test.go b/backend/pkg/projects/workspace_test.go
index d4d5f7143..43c3eb92e 100644
--- a/backend/pkg/projects/workspace_test.go
+++ b/backend/pkg/projects/workspace_test.go
@@ -26,7 +26,7 @@ func TestReadProjectWorkspace_ExcludesProtectedFilesAndReturnsFolders(t *testing
require.NoError(t, os.MkdirAll(filepath.Join(projectDir, ".git"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, ".git", "config"), []byte("private"), 0o644))
- files, revision, _, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 0, 0)
+ files, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 0, 0)
require.NoError(t, err)
require.NotEmpty(t, revision)
@@ -46,7 +46,7 @@ func TestReadProjectWorkspace_ZeroMaxDepthDisablesExpansion(t *testing.T) {
require.NoError(t, os.MkdirAll(filepath.Join(projectDir, "config"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config", "app.yaml"), []byte("value: true\n"), 0o644))
- files, revision, _, err := ReadProjectWorkspace(projectDir, 0, "", "compose.yaml", 0, 0)
+ files, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 0, "", "compose.yaml", 0, 0)
require.NoError(t, err)
assert.NotEmpty(t, revision)
assert.Empty(t, files)
@@ -61,7 +61,7 @@ func TestReadProjectWorkspace_UseScanDepthSentinelUsesWorkspaceMaxDepth(t *testi
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "level1", "visible.txt"), []byte("visible\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "level1", "level2", "hidden.txt"), []byte("hidden\n"), 0o644))
- files, _, _, err := ReadProjectWorkspace(projectDir, ProjectWorkspaceUseScanDepth, "", "compose.yaml", 0, 0)
+ files, _, _, err := ReadProjectWorkspace(t.Context(), projectDir, ProjectWorkspaceUseScanDepth, "", "compose.yaml", 0, 0)
require.NoError(t, err)
relativePaths := make([]string, 0, len(files))
@@ -127,7 +127,7 @@ func TestApplyWorkspaceFileChanges_RejectsUnsafePathsAndProtectedFiles(t *testin
if tc.upload != nil {
uploads[0] = tc.upload
}
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{tc.change}, uploads, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{tc.change}, uploads, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
})
}
@@ -140,7 +140,7 @@ func TestApplyWorkspaceFileChanges_CreatesBinaryFileVerbatim(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
binary := []byte{0x1f, 0x8b, 0x08, 0x00, 0xff, 0x00, 0xde, 0xad, 0xbe, 0xef}
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "create_file", RelativePath: "db.sqlite", UploadIndex: new(0)},
}, map[int][]byte{0: binary}, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.NoError(t, err)
@@ -156,7 +156,7 @@ func TestApplyWorkspaceFileChanges_WrapsForbiddenSentinelErrors(t *testing.T) {
projectDir := t.TempDir()
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "delete", RelativePath: "compose.yaml"},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
@@ -170,7 +170,7 @@ func TestApplyWorkspaceFileChanges_WrapsForbiddenSentinelErrors(t *testing.T) {
}
content := []byte("updated\n")
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "update_file", RelativePath: "link.txt", UploadIndex: new(0)},
}, map[int][]byte{0: content}, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
@@ -183,7 +183,7 @@ func TestApplyWorkspaceFileChanges_WrapsForbiddenSentinelErrors(t *testing.T) {
t.Skipf("symlink creation is unavailable: %v", symlinkErr2)
}
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "update_file", RelativePath: "link-dir/outside.txt", UploadIndex: new(0)},
}, map[int][]byte{0: content}, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
@@ -197,11 +197,11 @@ func TestApplyWorkspaceFileChanges_UsesRevisionConflictDetection(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "notes.txt"), []byte("old\n"), 0o644))
- _, revision, _, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 0, 0)
+ _, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 0, 0)
require.NoError(t, err)
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "notes.txt"), []byte("changed elsewhere\n"), 0o644))
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "update_file", RelativePath: "notes.txt", UploadIndex: new(0)},
}, map[int][]byte{0: []byte("new\n")}, ProjectWorkspaceApplyOptions{
ExpectedRevision: revision,
@@ -219,7 +219,7 @@ func TestApplyWorkspaceFileChanges_AppliesOrderedTextFileOperations(t *testing.T
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
updated := []byte("updated\n")
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "create_folder", RelativePath: "config"},
{Operation: "create_file", RelativePath: "config/app.yaml", UploadIndex: new(0)},
{Operation: "update_file", RelativePath: "config/app.yaml", UploadIndex: new(1)},
@@ -242,7 +242,7 @@ func TestApplyWorkspaceFileChanges_MovesProjectPaths(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config", "app.yaml"), []byte("value: true\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config", "nested", "child.txt"), []byte("child\n"), 0o644))
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "move", RelativePath: "config/app.yaml", NewParentPath: "archive"},
{Operation: "move", RelativePath: "config/nested"},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
@@ -300,7 +300,7 @@ func TestApplyWorkspaceFileChanges_RejectsInvalidMoves(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config", "app.yaml"), []byte("value: true\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "archive", "app.yaml"), []byte("existing\n"), 0o644))
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "move", RelativePath: tc.relativePath, NewParentPath: tc.newParentPath},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
@@ -317,13 +317,13 @@ func TestApplyWorkspaceFileChanges_RequiresRecursiveForNonEmptyFolderDelete(t *t
require.NoError(t, os.MkdirAll(filepath.Join(projectDir, "config"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config", "app.yaml"), []byte("value: true\n"), 0o644))
- err := ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err := ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "delete", RelativePath: "config"},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.Error(t, err)
assert.Contains(t, err.Error(), "folder is not empty")
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "delete", RelativePath: "config", Recursive: true},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"})
require.NoError(t, err)
@@ -334,7 +334,7 @@ func TestApplyWorkspaceFileChanges_RequiresRecursiveForNonEmptyFolderDelete(t *t
func TestApplyProjectWorkspaceChangesRejectsUnusedUploadsForEmptyManifest(t *testing.T) {
t.Parallel()
- err := ApplyProjectWorkspaceChanges(t.TempDir(), nil, map[int][]byte{0: []byte("unused")}, ProjectWorkspaceApplyOptions{})
+ err := ApplyProjectWorkspaceChanges(t.Context(), t.TempDir(), nil, map[int][]byte{0: []byte("unused")}, ProjectWorkspaceApplyOptions{})
require.ErrorContains(t, err, "unused")
}
@@ -354,12 +354,12 @@ func TestReadProjectWorkspace_CapsEntriesWithStableRevision(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, fmt.Sprintf("file-%d.txt", i)), []byte("x\n"), 0o644))
}
- files, revision, truncated, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 3, 0)
+ files, revision, truncated, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 3, 0)
require.NoError(t, err)
assert.True(t, truncated)
assert.Len(t, files, 3)
- _, again, truncatedAgain, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 3, 0)
+ _, again, truncatedAgain, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 3, 0)
require.NoError(t, err)
assert.True(t, truncatedAgain)
assert.Equal(t, revision, again)
@@ -374,11 +374,11 @@ func TestApplyWorkspaceFileChanges_SucceedsWithCappedRevision(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, fmt.Sprintf("file-%d.txt", i)), []byte("x\n"), 0o644))
}
- _, revision, truncated, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 3, 0)
+ _, revision, truncated, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 3, 0)
require.NoError(t, err)
require.True(t, truncated)
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "update_file", RelativePath: "file-0.txt", UploadIndex: new(0)},
}, map[int][]byte{0: []byte("new\n")}, ProjectWorkspaceApplyOptions{
ExpectedRevision: revision,
@@ -404,21 +404,21 @@ func TestApplyProjectWorkspaceChanges_ContentChurnDoesNotConflict(t *testing.T)
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "app.log"), []byte("line1\n"), 0o644))
- _, revision, _, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 0, 0)
+ _, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 0, 0)
require.NoError(t, err)
// A running container appending to files in its own project directory
// (changed size + mtime) must not invalidate the workspace draft (#3199).
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "app.log"), []byte("line1\nline2\n"), 0o644))
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: project.FileOpCreateFile, RelativePath: "notes.txt", UploadIndex: new(0)},
}, map[int][]byte{0: []byte("hello")}, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml", ExpectedRevision: revision, MaxDepth: 3})
require.NoError(t, err)
require.FileExists(t, filepath.Join(projectDir, "notes.txt"))
// Structural drift (notes.txt now exists) does conflict against the old revision.
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: project.FileOpDelete, RelativePath: "app.log"},
}, nil, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml", ExpectedRevision: revision, MaxDepth: 3})
require.ErrorIs(t, err, ErrProjectWorkspaceRevisionConflict)
@@ -429,14 +429,14 @@ func TestApplyProjectWorkspaceChanges_BaselineGuardsConcurrentEdit(t *testing.T)
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services: {}\n"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config.txt"), []byte("original\n"), 0o644))
- _, revision, _, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 0, 0)
+ _, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 0, 0)
require.NoError(t, err)
// The structural revision still matches after an external content edit,
// but the uploaded baseline no longer matches the on-disk content: the
// stale draft must conflict instead of silently overwriting the newer file.
require.NoError(t, os.WriteFile(filepath.Join(projectDir, "config.txt"), []byte("external newer edit\n"), 0o644))
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: project.FileOpUpdateFile, RelativePath: "config.txt", UploadIndex: new(0), BaselineIndex: new(1)},
}, map[int][]byte{0: []byte("stale draft\n"), 1: []byte("original\n")}, ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml", ExpectedRevision: revision, MaxDepth: 3})
require.ErrorIs(t, err, ErrProjectWorkspaceRevisionConflict)
@@ -445,7 +445,7 @@ func TestApplyProjectWorkspaceChanges_BaselineGuardsConcurrentEdit(t *testing.T)
require.Equal(t, "external newer edit\n", string(content))
// A baseline matching the current on-disk content saves normally.
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: project.FileOpUpdateFile, RelativePath: "config.txt", UploadIndex: new(0), BaselineIndex: new(1)},
}, map[int][]byte{
0: []byte("fresh draft\n"),
@@ -470,7 +470,7 @@ func TestReadProjectWorkspace_ListsEnvDirectoryContents(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(projectDir, ".env"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(projectDir, ".env", "app.env"), []byte("APP_VALUE=sub\n"), 0o644))
- files, _, _, err := ReadProjectWorkspace(projectDir, 3, "", "compose.yaml", 0, 0)
+ files, _, _, err := ReadProjectWorkspace(t.Context(), projectDir, 3, "", "compose.yaml", 0, 0)
require.NoError(t, err)
relativePaths := make([]string, 0, len(files))
@@ -489,7 +489,7 @@ func TestApplyWorkspaceFileChanges_EnvDirectory(t *testing.T) {
require.NoError(t, os.WriteFile(filepath.Join(projectDir, ".env", "app.env"), []byte("A=1\n"), 0o644))
opts := ProjectWorkspaceApplyOptions{ComposeFileName: "compose.yaml"}
- require.NoError(t, ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ require.NoError(t, ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "update_file", RelativePath: ".env/app.env", UploadIndex: new(0)},
}, map[int][]byte{0: []byte("A=2\n")}, opts))
content, err := os.ReadFile(filepath.Join(projectDir, ".env", "app.env"))
@@ -498,7 +498,7 @@ func TestApplyWorkspaceFileChanges_EnvDirectory(t *testing.T) {
// Once the directory is gone, the name is protected configuration again,
// even within the same batch.
- err = ApplyProjectWorkspaceChanges(projectDir, []project.WorkspaceFileChange{
+ err = ApplyProjectWorkspaceChanges(t.Context(), projectDir, []project.WorkspaceFileChange{
{Operation: "delete", RelativePath: ".env", Recursive: true},
{Operation: "create_file", RelativePath: ".env", UploadIndex: new(0)},
}, map[int][]byte{0: []byte("B=1\n")}, opts)
diff --git a/backend/pkg/projects/workspace_unix_test.go b/backend/pkg/projects/workspace_unix_test.go
index 1b7819a80..283338175 100644
--- a/backend/pkg/projects/workspace_unix_test.go
+++ b/backend/pkg/projects/workspace_unix_test.go
@@ -32,7 +32,7 @@ func TestReadProjectWorkspace_SkipsUnreadableDirectory(t *testing.T) {
// Restore before t.TempDir's own cleanup runs, or it cannot remove the tree.
t.Cleanup(func() { _ = os.Chmod(workdir, 0o755) })
- files, revision, _, err := ReadProjectWorkspace(projectDir, 5, "", "compose.yaml", 0, 0)
+ files, revision, _, err := ReadProjectWorkspace(t.Context(), projectDir, 5, "", "compose.yaml", 0, 0)
require.NoError(t, err)
require.NotEmpty(t, revision, "an empty revision blocks every project workspace edit")
@@ -53,7 +53,7 @@ func TestReadProjectWorkspace_SkipsUnreadableDirectory(t *testing.T) {
// The compare walk in ApplyWorkspaceFileChanges skips identically, so the
// optimistic-concurrency check does not spuriously conflict.
- _, again, _, err := ReadProjectWorkspace(projectDir, 5, "", "compose.yaml", 0, 0)
+ _, again, _, err := ReadProjectWorkspace(t.Context(), projectDir, 5, "", "compose.yaml", 0, 0)
require.NoError(t, err)
assert.Equal(t, revision, again)
}
diff --git a/backend/pkg/scheduler/analytics_job.go b/backend/pkg/scheduler/analytics_job.go
index 7dc3eb1e6..b7107d7ea 100644
--- a/backend/pkg/scheduler/analytics_job.go
+++ b/backend/pkg/scheduler/analytics_job.go
@@ -113,11 +113,11 @@ func (j *AnalyticsJob) Run(ctx context.Context) (schedulertypes.Outcome, error)
AnalyticsJobName,
"version",
payload.Version,
- "instanceID",
+ "instanceId",
payload.InstanceID,
"serverType",
payload.ServerType,
- "heartbeatURL",
+ "heartbeatUrl",
j.heartbeatURL,
"env",
j.cfg.Environment,
@@ -177,11 +177,11 @@ func (j *AnalyticsJob) Run(ctx context.Context) (schedulertypes.Outcome, error)
AnalyticsJobName,
"version",
payload.Version,
- "instanceID",
+ "instanceId",
payload.InstanceID,
"serverType",
payload.ServerType,
- "heartbeatURL",
+ "heartbeatUrl",
j.heartbeatURL,
"env",
j.cfg.Environment,
diff --git a/backend/pkg/scheduler/auto_heal_job.go b/backend/pkg/scheduler/auto_heal_job.go
index 3e0af26b7..5b4d8812f 100644
--- a/backend/pkg/scheduler/auto_heal_job.go
+++ b/backend/pkg/scheduler/auto_heal_job.go
@@ -108,7 +108,7 @@ func (j *AutoHealJob) Schedule(ctx context.Context) string {
parser := scheduleutil.Parser()
if _, err := parser.Parse(schedule); err != nil {
- slog.WarnContext(ctx, "Invalid cron expression for auto-heal, using default", "invalid_schedule", schedule, "error", err)
+ slog.WarnContext(ctx, "Invalid cron expression for auto-heal, using default", "invalidSchedule", schedule, "error", err)
return autoHealDefaultSchedule
}
@@ -203,7 +203,7 @@ func (j *AutoHealJob) selfContainerIDInternal(ctx context.Context) string {
return
}
j.selfID = strings.ToLower(strings.TrimSpace(id))
- slog.InfoContext(ctx, "auto-heal: detected own container; it will never be auto-restarted", "container_id", j.selfID)
+ slog.InfoContext(ctx, "auto-heal: detected own container; it will never be auto-restarted", "containerId", j.selfID)
})
return j.selfID
}
@@ -276,8 +276,8 @@ func (j *AutoHealJob) processCandidateInternal(
slog.WarnContext(
ctx, "auto-heal restart-loop protection: skipping container",
"container", containerName,
- "max_restarts", maxRestarts,
- "window_minutes", restartWindowMinutes,
+ "maxRestarts", maxRestarts,
+ "windowMinutes", restartWindowMinutes,
)
return target, nil
}
@@ -303,7 +303,7 @@ func (j *AutoHealJob) processCandidateInternal(
j.postRestartActionsInternal(ctx, containerID, containerName)
- slog.InfoContext(ctx, "auto-heal restarted unhealthy container", "container", containerName, "container_id", containerID)
+ slog.InfoContext(ctx, "auto-heal restarted unhealthy container", "container", containerName, "containerId", containerID)
target.Status = schedulertypes.Succeeded
return target, nil
}
diff --git a/backend/pkg/scheduler/auto_patch_job.go b/backend/pkg/scheduler/auto_patch_job.go
index 400cfd6ad..fa3500e5e 100644
--- a/backend/pkg/scheduler/auto_patch_job.go
+++ b/backend/pkg/scheduler/auto_patch_job.go
@@ -54,7 +54,7 @@ func (j *AutoPatchJob) Schedule(ctx context.Context) string {
parser := scheduleutil.Parser()
if _, err := parser.Parse(schedule); err != nil {
- slog.WarnContext(ctx, "Invalid cron expression for auto-patch, using default", "invalid_schedule", schedule, "error", err)
+ slog.WarnContext(ctx, "Invalid cron expression for auto-patch, using default", "invalidSchedule", schedule, "error", err)
return "0 0 3 * * *"
}
diff --git a/backend/pkg/scheduler/docker_client_refresh_job.go b/backend/pkg/scheduler/docker_client_refresh_job.go
index f7ef36d15..b8aac5532 100644
--- a/backend/pkg/scheduler/docker_client_refresh_job.go
+++ b/backend/pkg/scheduler/docker_client_refresh_job.go
@@ -41,7 +41,7 @@ func (j *DockerClientRefreshJob) Schedule(ctx context.Context) string {
parser := scheduleutil.Parser()
if _, err := parser.Parse(schedule); err != nil {
- slog.WarnContext(ctx, "Invalid cron expression for Docker client refresh, using default", "invalid_schedule", schedule, "error", err)
+ slog.WarnContext(ctx, "Invalid cron expression for Docker client refresh, using default", "invalidSchedule", schedule, "error", err)
return dockerClientRefreshDefaultSchedule
}
diff --git a/backend/pkg/scheduler/scheduled_prune_job.go b/backend/pkg/scheduler/scheduled_prune_job.go
index 211cae7dd..6d8e65035 100644
--- a/backend/pkg/scheduler/scheduled_prune_job.go
+++ b/backend/pkg/scheduler/scheduled_prune_job.go
@@ -43,7 +43,7 @@ func (j *ScheduledPruneJob) Schedule(ctx context.Context) string {
parser := scheduleutil.Parser()
if _, err := parser.Parse(schedule); err != nil {
- slog.WarnContext(ctx, "Invalid cron expression for scheduled-prune, using default", "invalid_schedule", schedule, "error", err)
+ slog.WarnContext(ctx, "Invalid cron expression for scheduled-prune, using default", "invalidSchedule", schedule, "error", err)
return "0 0 0 * * *"
}
@@ -69,7 +69,7 @@ func (j *ScheduledPruneJob) Run(ctx context.Context) (schedulertypes.Outcome, er
"images", req.Images,
"volumes", req.Volumes,
"networks", req.Networks,
- "build_cache", req.BuildCache,
+ "buildCache", req.BuildCache,
)
result, started, err := j.systemService.PruneScheduled(ctx, "0", req)
@@ -84,11 +84,11 @@ func (j *ScheduledPruneJob) Run(ctx context.Context) (schedulertypes.Outcome, er
slog.InfoContext(ctx, "scheduled prune run completed",
"success", result.Success,
- "space_reclaimed_bytes", result.SpaceReclaimed,
- "containers_pruned", len(result.ContainersPruned),
- "images_deleted", len(result.ImagesDeleted),
- "volumes_deleted", len(result.VolumesDeleted),
- "networks_deleted", len(result.NetworksDeleted),
+ "spaceReclaimedBytes", result.SpaceReclaimed,
+ "containersPruned", len(result.ContainersPruned),
+ "imagesDeleted", len(result.ImagesDeleted),
+ "volumesDeleted", len(result.VolumesDeleted),
+ "networksDeleted", len(result.NetworksDeleted),
"errors", len(result.Errors),
)
if len(result.Errors) > 0 {
diff --git a/backend/pkg/scheduler/vulnerability_scan_job.go b/backend/pkg/scheduler/vulnerability_scan_job.go
index 8476103aa..aa54f0f3f 100644
--- a/backend/pkg/scheduler/vulnerability_scan_job.go
+++ b/backend/pkg/scheduler/vulnerability_scan_job.go
@@ -54,7 +54,7 @@ func (j *VulnerabilityScanJob) Schedule(ctx context.Context) string {
parser := scheduleutil.Parser()
if _, err := parser.Parse(schedule); err != nil {
- slog.WarnContext(ctx, "Invalid cron expression for vulnerability-scan, using default", "invalid_schedule", schedule, "error", err)
+ slog.WarnContext(ctx, "Invalid cron expression for vulnerability-scan, using default", "invalidSchedule", schedule, "error", err)
return "0 0 0 * * *"
}
diff --git a/backend/pkg/utils/logging/logrus_bridge.go b/backend/pkg/utils/logging/logrus_bridge.go
index 5da040dbb..a3cd91b11 100644
--- a/backend/pkg/utils/logging/logrus_bridge.go
+++ b/backend/pkg/utils/logging/logrus_bridge.go
@@ -76,7 +76,7 @@ func (logrusSlogHook) Fire(entry *logrus.Entry) error {
ctx = context.Background() //nolint:forbidigo // Legacy log entry has no context; logging still needs an empty root.
}
message := strings.TrimSpace(entry.Message)
- slog.Log(ctx, level, message, args...)
+ slog.Log(ctx, level, message, args...) //nolint:sloglint // Bridged logrus entries carry their own message.
if level >= slog.LevelInfo && message != "" {
// Snapshot under the lock, write outside it: a writer that logs through
diff --git a/backend/pkg/utils/notifications/config_credentials.go b/backend/pkg/utils/notifications/config_credentials.go
index 5a4a870b1..3668d2d4d 100644
--- a/backend/pkg/utils/notifications/config_credentials.go
+++ b/backend/pkg/utils/notifications/config_credentials.go
@@ -1,6 +1,7 @@
package notifications
import (
+ "context"
"encoding/base64"
"encoding/json/v2"
"errors"
@@ -37,7 +38,8 @@ func DecryptStringCredential(value *string) error {
if isPlausibleEncryptedCredentialInternal(*value) {
return fmt.Errorf("failed to decrypt notification credential: %w", err)
}
- slog.Warn("Failed to decrypt notification credential, using raw legacy value", "error", err)
+ slog.WarnContext(context.Background(), "Failed to decrypt notification credential, using raw legacy value", //nolint:forbidigo // Credential decryption is a pure helper without a request context.
+ "error", err)
return nil
}
*value = decrypted
diff --git a/backend/pkg/utils/recover.go b/backend/pkg/utils/recover.go
index d2bdee0ed..b04b4a57c 100644
--- a/backend/pkg/utils/recover.go
+++ b/backend/pkg/utils/recover.go
@@ -28,7 +28,7 @@ func RecoverToError(errPtr *error, label string, args ...any) { //nolint:gocriti
}
err := fmt.Errorf("%s: %w", label+" panicked", panicErr)
- slog.Error(label+" panicked", append([]any{"error", err}, args...)...)
+ slog.ErrorContext(context.Background(), "Recovered from panic", append([]any{"label", label, "error", err}, args...)...) //nolint:forbidigo // Panic recovery runs without a request context.
if errPtr != nil {
*errPtr = err
}
diff --git a/backend/pkg/utils/update_value_util.go b/backend/pkg/utils/update_value_util.go
index a55702ebe..3b1a7f8c1 100644
--- a/backend/pkg/utils/update_value_util.go
+++ b/backend/pkg/utils/update_value_util.go
@@ -1,6 +1,7 @@
package utils
import (
+ "context"
"fmt"
"log/slog"
"os"
@@ -84,7 +85,9 @@ func LookupEnvOrFile(name string) (value string, found, fromFile bool) {
// Secret paths are arbitrary host paths, so there is no acfs root to confine them to.
content, err := os.ReadFile(filePath) //nolint:gosec // path intentionally comes from a *_FILE env var
if err != nil {
- slog.Warn("Failed to read secret file, falling back to direct env var", "env", name+suffix, "error", err)
+ ctx := context.Background() //nolint:forbidigo // Environment lookup runs during configuration loading without a request context.
+ slog.WarnContext(ctx, "Failed to read secret file, falling back to direct env var",
+ "env", name+suffix, "error", err)
break
}