Skip to content

fix: deduplicate agent script timings #15631

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
BrunoQuaresma merged 2 commits into from
Nov 22, 2024
Merged

fix: deduplicate agent script timings #15631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc219e6
fix: deduplicate agent script timings
BrunoQuaresma Nov 22, 2024
3b39fba
Fix fmt
BrunoQuaresma Nov 22, 2024
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
14 changes: 14 additions & 0 deletions site/src/modules/workspaces/WorkspaceTiming/WorkspaceTimings.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,17 @@ export const NavigateToStartStage: Story = {
await canvas.findByText("Startup Script");
},
};

// Test case for https://github.com/coder/coder/issues/15413
export const DuplicatedScriptTiming: Story = {
args: {
agentScriptTimings: [
WorkspaceTimingsResponse.agent_script_timings[0],
{
...WorkspaceTimingsResponse.agent_script_timings[0],
started_at: "2021-09-01T00:00:00Z",
ended_at: "2021-09-01T00:00:00Z",
},
],
},
};
15 changes: 13 additions & 2 deletions site/src/modules/workspaces/WorkspaceTiming/WorkspaceTimings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import type {
AgentScriptTiming,
ProvisionerTiming,
} from "api/typesGenerated";
import sortBy from "lodash/sortBy";
import uniqBy from "lodash/uniqBy";
import { type FC, useState } from "react";
import { type TimeRange, calcDuration, mergeTimeRanges } from "./Chart/utils";
import { ResourcesChart, isCoderResource } from "./ResourcesChart";
Expand Down Expand Up @@ -42,11 +44,20 @@ export const WorkspaceTimings: FC<WorkspaceTimingsProps> = ({
defaultIsOpen = false,
}) => {
const [view, setView] = useState<TimingView>({ name: "default" });
// This is a workaround to deal with the BE returning multiple timings for a
// single agent script when it should return only one. Reference:
// https://github.com/coder/coder/issues/15413#issuecomment-2493663571
const uniqScriptTimings = uniqBy(
sortBy(agentScriptTimings, (t) => new Date(t.started_at).getTime() * -1),
(t) => t.display_name,
);
const timings = [
...provisionerTimings,
...agentScriptTimings,
...uniqScriptTimings,
...agentConnectionTimings,
];
].sort((a, b) => {
return new Date(a.started_at).getTime() - new Date(b.started_at).getTime();
});
const [isOpen, setIsOpen] = useState(defaultIsOpen);
const isLoading = timings.length === 0;

Expand Down
Loading