Skip to content

feat: use named loggers in coderd #8148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 22, 2023
Merged

feat: use named loggers in coderd #8148

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97ddf3a
workspace build error
mtojek Jun 22, 2023
f7e87a0
provisioner job error
mtojek Jun 22, 2023
54d5546
prometheusmetrics error
mtojek Jun 22, 2023
4cf9115
userauth
mtojek Jun 22, 2023
b03a208
fix: ignore errors
mtojek Jun 22, 2023
6f89a92
Use named loggers
mtojek Jun 22, 2023
7e83891
no need for label here
mtojek Jun 22, 2023
7c4d5c2
autobuild
mtojek Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
provisioner job error
  • Loading branch information
@mtojek
mtojek committed Jun 22, 2023
commit f7e87a0d6fa1a1cfec317b07cec0afd5a7af952f
22 changes: 12 additions & 10 deletions coderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ import (
sdkproto "github.com/coder/coder/provisionersdk/proto"
)

const logPrefix = "provisioner job error: "

var (
lastAcquire time.Time
lastAcquireMutex sync.RWMutex
Expand Down Expand Up @@ -490,7 +492,7 @@ func (server *Server) UpdateJob(ctx context.Context, request *proto.UpdateJobReq

logs, err := server.Database.InsertProvisionerJobLogs(ctx, insertParams)
if err != nil {
server.Logger.Error(ctx, "failed to insert job logs", slog.F("job_id", parsedID), slog.Error(err))
server.Logger.Error(ctx, logPrefix+"failed to insert job logs", slog.F("job_id", parsedID), slog.Error(err))
return nil, xerrors.Errorf("insert job logs: %w", err)
}
// Publish by the lowest log ID inserted so the log stream will fetch
Expand All @@ -505,8 +507,8 @@ func (server *Server) UpdateJob(ctx context.Context, request *proto.UpdateJobReq
}
err = server.Pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(parsedID), data)
if err != nil {
server.Logger.Error(ctx, "failed to publish job logs", slog.F("job_id", parsedID), slog.Error(err))
return nil, xerrors.Errorf("publish job log: %w", err)
server.Logger.Error(ctx, logPrefix+"failed to publish job logs", slog.F("job_id", parsedID), slog.Error(err))
return nil, xerrors.Errorf("publish job logs: %w", err)
}
server.Logger.Debug(ctx, "published job logs", slog.F("job_id", parsedID))
}
Expand All @@ -525,7 +527,7 @@ func (server *Server) UpdateJob(ctx context.Context, request *proto.UpdateJobReq
if len(request.TemplateVariables) > 0 {
templateVersion, err := server.Database.GetTemplateVersionByJobID(ctx, job.ID)
if err != nil {
server.Logger.Error(ctx, "failed to get the template version", slog.F("job_id", parsedID), slog.Error(err))
server.Logger.Error(ctx, logPrefix+"failed to get the template version", slog.F("job_id", parsedID), slog.Error(err))
return nil, xerrors.Errorf("get template version by job id: %w", err)
}

Expand Down Expand Up @@ -703,7 +705,7 @@ func (server *Server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*p

wriBytes, err := json.Marshal(buildResourceInfo)
if err != nil {
server.Logger.Error(ctx, "marshal workspace resource info for failed job", slog.Error(err))
server.Logger.Error(ctx, logPrefix+"marshal workspace resource info for failed job", slog.Error(err))
}

audit.BuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
Expand All @@ -727,7 +729,7 @@ func (server *Server) FailJob(ctx context.Context, failJob *proto.FailedJob) (*p
}
err = server.Pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(jobID), data)
if err != nil {
server.Logger.Error(ctx, "failed to publish end of job logs", slog.F("job_id", jobID), slog.Error(err))
server.Logger.Error(ctx, logPrefix+"failed to publish end of job logs", slog.F("job_id", jobID), slog.Error(err))
return nil, xerrors.Errorf("publish end of job logs: %w", err)
}
return &proto.Empty{}, nil
Expand Down Expand Up @@ -905,7 +907,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
workspace, getWorkspaceError = db.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
if getWorkspaceError != nil {
server.Logger.Error(ctx,
"fetch workspace for build",
logPrefix+"fetch workspace for build",
slog.F("workspace_build_id", workspaceBuild.ID),
slog.F("workspace_id", workspaceBuild.WorkspaceID),
)
Expand Down Expand Up @@ -1002,7 +1004,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
// have a shutdown signal we can listen to.
<-wait
if err := server.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspaceBuild.WorkspaceID), []byte{}); err != nil {
server.Logger.Error(ctx, "workspace notification after agent timeout failed",
server.Logger.Error(ctx, logPrefix+"workspace notification after agent timeout failed",
slog.F("workspace_build_id", workspaceBuild.ID),
slog.Error(err),
)
Expand Down Expand Up @@ -1054,7 +1056,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete

wriBytes, err := json.Marshal(buildResourceInfo)
if err != nil {
server.Logger.Error(ctx, "marshal resource info for successful job", slog.Error(err))
server.Logger.Error(ctx, logPrefix+"marshal resource info for successful job", slog.Error(err))
}

audit.BuildAudit(ctx, &audit.BuildAuditParams[database.WorkspaceBuild]{
Expand Down Expand Up @@ -1117,7 +1119,7 @@ func (server *Server) CompleteJob(ctx context.Context, completed *proto.Complete
}
err = server.Pubsub.Publish(provisionersdk.ProvisionerJobLogsNotifyChannel(jobID), data)
if err != nil {
server.Logger.Error(ctx, "failed to publish end of job logs", slog.F("job_id", jobID), slog.Error(err))
server.Logger.Error(ctx, logPrefix+"failed to publish end of job logs", slog.F("job_id", jobID), slog.Error(err))
return nil, xerrors.Errorf("publish end of job logs: %w", err)
}

Expand Down