Skip to content

Commit 4d65dbd

Browse files
DanielleMaywoodDanielleMaywood
committed
feat: add job_id and display_name to script timings
1 parent e842137 commit 4d65dbd

16 files changed

+66
-6
lines changed

‎coderd/agentapi/api.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ func New(opts Options) *API {
154154
}
155155

156156
api.ScriptsAPI = &ScriptsAPI{
157+
AgentID: opts.AgentID,
157158
Database: opts.Database,
158159
}
159160

‎coderd/agentapi/scripts.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,29 @@ import (
55

66
agentproto "github.com/coder/coder/v2/agent/proto"
77
"github.com/coder/coder/v2/coderd/database"
8+
"github.com/google/uuid"
89
)
910

1011
type ScriptsAPI struct {
12+
AgentID uuid.UUID
1113
Database database.Store
1214
}
1315

1416
func (s *ScriptsAPI) ScriptCompleted(ctx context.Context, req *agentproto.WorkspaceAgentScriptCompletedRequest) (*agentproto.WorkspaceAgentScriptCompletedResponse, error) {
1517
res := &agentproto.WorkspaceAgentScriptCompletedResponse{}
1618

17-
_, err := s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
19+
agent, err := s.Database.GetWorkspaceAgentByID(ctx, s.AgentID)
20+
if err != nil {
21+
return nil, err
22+
}
23+
24+
resource, err := s.Database.GetWorkspaceResourceByID(ctx, agent.ResourceID)
25+
if err != nil {
26+
return nil, err
27+
}
28+
29+
_, err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
30+
JobID: resource.JobID,
1831
DisplayName: req.Timing.DisplayName,
1932
StartedAt: req.Timing.Start.AsTime(),
2033
EndedAt: req.Timing.End.AsTime(),

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmem/dbmem.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7338,9 +7338,11 @@ func (q *FakeQuerier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg
73387338
defer q.mutex.Unlock()
73397339

73407340
scriptTiming := database.WorkspaceAgentScriptTiming{
7341-
StartedAt: arg.StartedAt,
7342-
EndedAt: arg.EndedAt,
7343-
ExitCode: arg.ExitCode,
7341+
StartedAt: arg.StartedAt,
7342+
EndedAt: arg.EndedAt,
7343+
ExitCode: arg.ExitCode,
7344+
DisplayName: arg.DisplayName,
7345+
JobID: arg.JobID,
73447346
}
73457347

73467348
q.workspaceAgentScriptTimings = append(q.workspaceAgentScriptTimings, scriptTiming)

‎coderd/database/dump.sql

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/foreign_key_constraint.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000250_workspace_agent_script_timings.up.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CREATE TABLE workspace_agent_script_timings
22
(
3+
job_id uuid not null references provisioner_jobs (id) on delete cascade,
34
display_name text not null,
45
started_at timestamp with time zone not null,
56
ended_at timestamp with time zone not null,

‎coderd/database/models.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceagents.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ WHERE
291291
-- name: InsertWorkspaceAgentScriptTimings :one
292292
INSERT INTO
293293
workspace_agent_script_timings (
294+
job_id,
294295
display_name,
295296
started_at,
296297
ended_at,
297298
exit_code
298299
)
299300
VALUES
300-
($1, $2, $3, $4) RETURNING *;
301+
($1, $2, $3, $4, $5) RETURNING *;

‎docs/reference/api/agents.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/api/builds.md

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)