Skip to content
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

Jump to bottom

[usage] Return extra fields for ListBilledUsage #11447

Merged
merged 2 commits into from
Jul 19, 2022
Merged

[usage] Return extra fields for ListBilledUsage #11447

merged 2 commits into from
Jul 19, 2022

Conversation

easyCZ
Copy link
Member

@easyCZ easyCZ commented Jul 18, 2022 •
edited

Description

API uses extra fields from the DB.

Related Issue(s)

How to test

Release Notes

NONE

Documentation

Werft options:

  • /werft with-preview

@easyCZ easyCZ force-pushed the mp/usage-ws-usage-extra-fields branch 5 times, most recently from 704369e to db2d281 Compare July 19, 2022 06:46
@easyCZ easyCZ force-pushed the mp/usage-ws-usage-extra-fields branch from db2d281 to bfe951f Compare July 19, 2022 06:47
@easyCZ
Copy link
Member Author

easyCZ commented Jul 19, 2022

/hold
for dependency on parent PR

@easyCZ easyCZ marked this pull request as ready for review July 19, 2022 06:52
@easyCZ easyCZ requested a review from a team July 19, 2022 06:52
@github-actions github-actions bot added the team: webapp Issue belongs to the WebApp team label Jul 19, 2022
@andrew-farries andrew-farries self-assigned this Jul 19, 2022
@easyCZ
Copy link
Member Author

easyCZ commented Jul 19, 2022

Fields are not yet set in the DB, but will be in subsequent PR

andrew-farries
andrew-farries approved these changes Jul 19, 2022
View reviewed changes
Copy link
Contributor

@andrew-farries andrew-farries left a comment

Choose a reason for hiding this comment

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

These fields are still unpopulated:

gitpod/components/usage/pkg/controller/reconciler.go

Lines 247 to 254 in 98bb647

usageRecords = append(usageRecords, db.WorkspaceInstanceUsage{
InstanceID: instance.ID,
AttributionID: attributionId,
StartedAt: instance.CreationTime.Time(),
StoppedAt: stoppedAt,
CreditsUsed: pricer.CreditsUsedByInstance(&instance, now),
GenerationID: 0,
})

Base automatically changed from mp/usage-ws-usage-extra-fields to main July 19, 2022 06:58
@roboquat roboquat added size/M and removed size/S labels Jul 19, 2022
@easyCZ
Copy link
Member Author

easyCZ commented Jul 19, 2022

/unhold

@roboquat roboquat merged commit 3fd02a7 into main Jul 19, 2022
@roboquat roboquat deleted the mp/usage-return-data branch July 19, 2022 07:06
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrew-farries andrew-farries andrew-farries approved these changes

Assignees

@andrew-farries andrew-farries

Labels
deployed: webapp Meta team change is running in production deployed Change is completely running in production release-note-none size/M team: webapp Issue belongs to the WebApp team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@easyCZ @andrew-farries @roboquat