Skip to content

fix(provisionerd): add more detailed workspace build logging #6331

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 3 commits into from
Feb 24, 2023
Merged

fix(provisionerd): add more detailed workspace build logging #6331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f40035
fix(provisionerd): add more detailed workspace build logging
johnstcn Feb 23, 2023
472e943
Update provisionerd/runner/runner.go
johnstcn Feb 23, 2023
17861c7
fixup! fix(provisionerd): add more detailed workspace build logging
johnstcn Feb 23, 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
Next Next commit
fix(provisionerd): add more detailed workspace build logging
  • Loading branch information
@johnstcn
johnstcn committed Feb 23, 2023
commit 0f40035c4b2e494740d2c04288e5eff7481de634
21 changes: 16 additions & 5 deletions provisionerd/provisionerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,22 @@ func (p *Server) acquireJob(ctx context.Context) {
))
defer span.End()

fields := []slog.Field{
slog.F("initiator_username", job.UserName),
slog.F("provisioner", job.Provisioner),
slog.F("job_id", job.JobId),
}

if build := job.GetWorkspaceBuild(); build != nil {
fields = append(fields,
slog.F("workspace_build_id", build.WorkspaceBuildId),
slog.F("workspace_id", build.Metadata.WorkspaceId),
slog.F("workspace_name", build.WorkspaceName),
slog.F("workspace_owner_id", build.Metadata.WorkspaceOwnerId),
slog.F("workspace_owner", build.Metadata.WorkspaceOwner),
slog.F("action", build.Metadata.WorkspaceTransition.String()),
)

span.SetAttributes(
attribute.String("workspace_build_id", build.WorkspaceBuildId),
attribute.String("workspace_id", build.Metadata.WorkspaceId),
Expand All @@ -356,11 +371,7 @@ func (p *Server) acquireJob(ctx context.Context) {
)
}

p.opts.Logger.Info(ctx, "acquired job",
slog.F("initiator_username", job.UserName),
slog.F("provisioner", job.Provisioner),
slog.F("job_id", job.JobId),
)
p.opts.Logger.Info(ctx, "acquired job", fields...)

provisioner, ok := p.opts.Provisioners[job.Provisioner]
if !ok {
Expand Down
17 changes: 14 additions & 3 deletions provisionerd/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,25 @@ func New(
forceStopContext, forceStopFunc := context.WithCancel(ctx)
gracefulContext, cancelFunc := context.WithCancel(forceStopContext)

logger := opts.Logger.With(slog.F("job_id", job.JobId))
if build := job.GetWorkspaceBuild(); build != nil {
logger = logger.With(
slog.F("owner_email", build.Metadata.WorkspaceOwnerEmail),
slog.F("workspace_id", build.Metadata.WorkspaceId),
slog.F("workspace_name", build.Metadata.WorkspaceName),
slog.F("template_name", build.Metadata.TemplateName),
slog.F("template_version", build.Metadata.TemplateVersion),
slog.F("transition", build.Metadata.WorkspaceTransition.String()),
)
}

return &Runner{
tracer: opts.Tracer,
metrics: opts.Metrics,
job: job,
sender: opts.Updater,
quotaCommitter: opts.QuotaCommitter,
logger: opts.Logger.With(slog.F("job_id", job.JobId)),
logger: logger,
filesystem: opts.Filesystem,
workDirectory: opts.WorkDirectory,
provisioner: opts.Provisioner,
Expand Down Expand Up @@ -856,7 +868,7 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
}
switch msgType := msg.Type.(type) {
case *sdkproto.Provision_Response_Log:
r.logger.Debug(context.Background(), "workspace provision job logged",
r.logger.Info(context.Background(), "workspace provision job logged",
slog.F("level", msgType.Log.Level),
slog.F("output", msgType.Log.Output),
slog.F("workspace_build_id", r.job.GetWorkspaceBuild().WorkspaceBuildId),
Expand Down Expand Up @@ -886,7 +898,6 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
}
}

r.logger.Debug(context.Background(), "provision complete no error")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review: removing this as it looks unnecessary

r.logger.Info(context.Background(), "provision successful",
slog.F("resource_count", len(msgType.Complete.Resources)),
slog.F("resources", msgType.Complete.Resources),
Expand Down