Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Add error specific timings in per-program metrics logging (backport #22225)#22251

Merged
mergify[bot] merged 1 commit intov1.8from
mergify/bp/v1.8/pr-22225
Jan 4, 2022
Merged

Add error specific timings in per-program metrics logging (backport #22225)#22251
mergify[bot] merged 1 commit intov1.8from
mergify/bp/v1.8/pr-22225

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 3, 2022

This is an automatic backport of pull request #22225 done by Mergify.
Cherry-pick of 0055929 has failed:

On branch mergify/bp/v1.8/pr-22225
Your branch is up to date with 'origin/v1.8'.

You are currently cherry-picking commit 005592998.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/cost_update_service.rs
	modified:   core/src/progress_map.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   program-runtime/src/timings.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 3, 2022
@carllin carllin force-pushed the mergify/bp/v1.8/pr-22225 branch from 6d5d2ed to 4a535e7 Compare January 3, 2022 22:37
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2022
@carllin carllin force-pushed the mergify/bp/v1.8/pr-22225 branch from 4a535e7 to 0c83189 Compare January 4, 2022 00:05
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 4, 2022

automerge label removed due to a CI failure

@carllin carllin force-pushed the mergify/bp/v1.8/pr-22225 branch from 0c83189 to 7e607e9 Compare January 4, 2022 05:54
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 4, 2022

Codecov Report

Merging #22251 (7e607e9) into v1.8 (84d535b) will decrease coverage by 0.0%.
The diff coverage is 92.6%.

@@            Coverage Diff            @@
##             v1.8   #22251     +/-   ##
=========================================
- Coverage    81.6%    81.5%   -0.1%     
=========================================
  Files         459      459             
  Lines      131039   131105     +66     
=========================================
+ Hits       106934   106973     +39     
- Misses      24105    24132     +27     

@mergify mergify Bot merged commit 6d7b64b into v1.8 Jan 4, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-22225 branch January 4, 2022 09:24
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants