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

feat: basic tracing using monitor trace id (backport #22126) #25216

Merged
merged 2 commits into from Mar 4, 2024
Merged

feat: basic tracing using monitor trace id (backport #22126) #25216

merged 2 commits into from Mar 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 4, 2024

This is an automatic backport of pull request #22126 done by Mergify.
Cherry-pick of 59e49d8 has failed:

On branch mergify/bp/version-14-hotfix/pr-22126
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 59e49d89fe.
  (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:   frappe/monitor.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/database/database.py
	both modified:   frappe/tests/test_recorder.py

Cherry-pick of 11806c3 has failed:

On branch mergify/bp/version-14-hotfix/pr-22126
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 11806c37a0.
  (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:   frappe/core/doctype/error_log/error_log.json
	modified:   frappe/monitor.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/error_log/error_log.py
	both modified:   frappe/utils/error.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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 requested a review from a team as a code owner March 4, 2024 07:23
@mergify mergify bot added the conflicts label Mar 4, 2024
@mergify mergify bot requested review from ankush and removed request for a team March 4, 2024 07:23
@mergify mergify bot assigned ankush Mar 4, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Mar 4, 2024

Cherry-pick of 59e49d8 has failed:

On branch mergify/bp/version-14-hotfix/pr-22126
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 59e49d89fe.
  (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:   frappe/monitor.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/database/database.py
	both modified:   frappe/tests/test_recorder.py

Cherry-pick of 11806c3 has failed:

On branch mergify/bp/version-14-hotfix/pr-22126
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 11806c37a0.
  (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:   frappe/core/doctype/error_log/error_log.json
	modified:   frappe/monitor.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/error_log/error_log.py
	both modified:   frappe/utils/error.py

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

@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-22126 branch from 4760c15 to b61872e Compare March 4, 2024 07:29
@ankush
fix: trace id missing
4874f13 
DB gets initted before request
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-22126 branch from b61872e to 4874f13 Compare March 4, 2024 10:02
@ankush ankush enabled auto-merge (squash) March 4, 2024 10:02
@ankush ankush merged commit 59791dc into version-14-hotfix Mar 4, 2024
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-22126 branch March 4, 2024 10:18
frappe-pr-bot pushed a commit that referenced this pull request Mar 5, 2024
@frappe-bot
chore(release): Bumped to Version 14.67.0
9199a4e 
# [14.67.0](v14.66.3...v14.67.0) (2024-03-05)

### Bug Fixes

* add "If Owner" column to roles viewer ([#25218](#25218)) ([#25219](#25219)) ([51db516](51db516))
* always show is_standard on web form ([#25144](#25144)) ([#25147](#25147)) ([92ea2e7](92ea2e7))
* dont get message attribute in error string in  has_login_limit_exceeded ([#25165](#25165)) ([ae07a32](ae07a32))
* dont translate numbers ([#25208](#25208)) ([#25209](#25209)) ([9a7b217](9a7b217))
* escape single quotes ([#25104](#25104)) ([#25153](#25153)) ([37bd2ad](37bd2ad)), closes [/github.com//pull/25078#discussion_r1504084483](https://github.com//github.com/frappe/frappe/pull/25078/issues/discussion_r1504084483)
* restrict method for security critical endpoints (backport [#25105](#25105)) ([#25107](#25107)) ([3b34ca6](3b34ca6))
* **search:** Don't break when query doesn't return title ([#25168](#25168)) ([#25196](#25196)) ([2718373](2718373))
* update file attached_to details in submitted doc ([#25140](#25140)) ([f116cdc](f116cdc))
* Use current language in attachment prints ([0e32b42](0e32b42))
* use name for RQ worker instead of PID (backport [#25175](#25175)) ([#25176](#25176)) ([359b103](359b103))
* **UX:** correctly disable standard web form form ([#25143](#25143)) ([#25145](#25145)) ([95f5dde](95f5dde))
* **UX:** list filter take zero as null ([#25156](#25156)) ([#25221](#25221)) ([d04607a](d04607a))
* **UX:** reload form after renaming field (backport [#25159](#25159)) ([#25160](#25160)) ([6c7b4cd](6c7b4cd))

### Features

* basic tracing using monitor trace id (backport [#22126](#22126)) ([#25216](#25216)) ([59791dc](59791dc))
* Skip locked rows while selecting + fix delete race condition (backport [#24298](#24298) and [#25170](#25170)) ([#25169](#25169)) ([1119bfd](1119bfd))
* track skipped patch with traceback (backport [#20931](#20931)) ([#25214](#25214)) ([f50b53d](f50b53d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.67.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ankush ankush Awaiting requested review from ankush ankush was automatically assigned from frappe/frappe-review-team

Assignees

@ankush ankush

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@frappe-pr-bot @ankush