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

[Heartbeat] Fix monitor duration wrapper #36900

Merged
merged 12 commits into from
Oct 25, 2023
Merged

[Heartbeat] Fix monitor duration wrapper #36900

merged 12 commits into from
Oct 25, 2023

Conversation

emilioalvap
Copy link
Collaborator

Proposed commit message

Fixes #36892.

Monitor duration is not being calculated correctly, where start time is initialized after monitor execution and wrapping order is overriding retries event order.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

  1. Build hb locally.
  2. Set up a always-down monitor with max_attempts: 2
  3. Check monitor.duration.us in the generated docs do not account for retry delays but include resolve.rrt.us time.

@emilioalvap emilioalvap added bug Team:obs-ds-hosted-services Label for the Observability Hosted Services team v8.11.0 backport-v8.11.0 Automated backport with mergify labels Oct 18, 2023
@emilioalvap emilioalvap requested a review from a team as a code owner October 18, 2023 21:06
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 18, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 18, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-10-25T15:24:06.576+0000

  • Duration: 29 min 58 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

andrewvc
andrewvc reviewed Oct 19, 2023
View reviewed changes
Copy link
Contributor

@andrewvc andrewvc left a comment

Choose a reason for hiding this comment

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

The code looks good, and the behavior with manual testing seems correct. There are not, however, any tests, and I do think we should add some before merging.

andrewvc
andrewvc approved these changes Oct 23, 2023
View reviewed changes
Copy link
Contributor

@andrewvc andrewvc left a comment

Choose a reason for hiding this comment

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

LGTM with the one added comment mentioned prior

heartbeat/monitors/wrappers/summarizer/summarizer_test.go Show resolved Hide resolved
@emilioalvap emilioalvap enabled auto-merge (squash) October 25, 2023 14:18
@emilioalvap
Copy link
Collaborator Author

/test

@emilioalvap emilioalvap merged commit 5d6c308 into elastic:main Oct 25, 2023
mergify bot pushed a commit that referenced this pull request Oct 25, 2023
@emilioalvap @mergify
[Heartbeat] Fix monitor duration wrapper (#36900)
6533ef2 
Fixes #36892.

Monitor duration is not being calculated correctly, where start time is initialized after monitor execution and wrapping order is overriding retries event order.

(cherry picked from commit 5d6c308)
@mergify mergify bot mentioned this pull request Oct 25, 2023
Merged
emilioalvap added a commit that referenced this pull request Oct 25, 2023
@mergify @emilioalvap
[Heartbeat] Fix monitor duration wrapper (#36900) (#36962)
01f4196 
Fixes #36892.

Monitor duration is not being calculated correctly, where start time is initialized after monitor execution and wrapping order is overriding retries event order.

(cherry picked from commit 5d6c308)

Co-authored-by: Emilio Alvarez Piñeiro <[email protected]>
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
@emilioalvap @Scholar-Li
[Heartbeat] Fix monitor duration wrapper (elastic#36900)
6fb8a11 
Fixes elastic#36892.

Monitor duration is not being calculated correctly, where start time is initialized after monitor execution and wrapping order is overriding retries event order.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vigneshshanmugam vigneshshanmugam vigneshshanmugam approved these changes

@andrewvc andrewvc andrewvc approved these changes

Assignees

@emilioalvap emilioalvap

Labels
backport-v8.11.0 Automated backport with mergify bug Team:obs-ds-hosted-services Label for the Observability Hosted Services team v8.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Heartbeat] Retests are including the delay in the overall duration
4 participants
@emilioalvap @elasticmachine @andrewvc @vigneshshanmugam