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.

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

Record container id and type in core job metrics #18579

Merged
merged 4 commits into from
Jul 29, 2024

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Jul 20, 2024

Closes #16588. Not sure if we want to do this versus a separate but always loaded plugin vs a regular relationship in the database.

Seems unlikely that we'd do anything beyond reporting, so maybe this is fine for now ?

Screenshot 2024-07-20 at 22 48 00

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@jmchilton
Copy link
Member

This has been... honestly very high... on my priority list for like 9 years at this point I think 😅.

mvdbeek added 3 commits July 25, 2024 15:29
Closes galaxyproject#16588.
Not sure if we want to do this versus a separate but always loaded
plugin vs a regular relationship in the database.

Seems unlikely that we'd do anything beyond reporting, so maybe this is
fine for now ?
And re-use abstractions for determining file path.
@mvdbeek mvdbeek force-pushed the container_job_metrics branch from 7385b93 to 9b772f1 Compare July 26, 2024 16:51
@mvdbeek mvdbeek marked this pull request as ready for review July 26, 2024 16:51
@mvdbeek
Copy link
Member Author

mvdbeek commented Jul 26, 2024

This has changed a little, still ok @jmchilton ?

@github-actions github-actions bot added this to the 24.2 milestone Jul 26, 2024
@jmchilton
Copy link
Member

FAILED test/integration/test_kubernetes_runner.py::TestKubernetesIntegration::test_explicit - AttributeError: 'TestKubernetesIntegration' object has no attribute 'container_type'

is this related?

@mvdbeek
Copy link
Member Author

mvdbeek commented Jul 28, 2024

Yep, thanks!

@jmchilton jmchilton merged commit 9d975b5 into galaxyproject:dev Jul 29, 2024
47 of 53 checks passed
Copy link

This PR was merged without a "kind/" label, please correct.

@nsoranzo nsoranzo deleted the container_job_metrics branch July 29, 2024 15:56
@nsoranzo
Copy link
Member

Sorry for the late review, I think you need to add the container_type class attribute also to https://github.com/galaxyproject/galaxy/blob/dev/test/integration/test_coexecution.py#L242 ? Tests pass because this is skipped in GitHub workflows.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show container resolution and actual used container in job-info page
3 participants