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

Add separate metric for cluster manager service events and metrics #579

Merged
merged 3 commits into from
Oct 10, 2023

Conversation

khushbr
Copy link
Collaborator

@khushbr khushbr commented Oct 10, 2023

Related commit in Commons: opensearch-project/performance-analyzer-commons@83cb2d4

Check List

  • Backport Labels added.
  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

Merging #579 (d26ee45) into main (7d6206e) will increase coverage by 0.19%.
The diff coverage is 0.00%.

❗ Current head d26ee45 differs from pull request most recent head a05d61c. Consider uploading reports for the commit a05d61c to get more accurate results

@@             Coverage Diff              @@
##               main     #579      +/-   ##
============================================
+ Coverage     69.02%   69.22%   +0.19%     
- Complexity      370      372       +2     
============================================
  Files            45       45              
  Lines          2696     2697       +1     
  Branches        172      172              
============================================
+ Hits           1861     1867       +6     
+ Misses          731      727       -4     
+ Partials        104      103       -1     
Files Coverage Δ
...lyzer/collectors/ClusterManagerServiceMetrics.java 62.79% <ø> (ø)
.../collectors/ClusterManagerServiceEventMetrics.java 75.49% <0.00%> (+0.83%) ⬆️

... and 1 file with indirect coverage changes

@ansjcy ansjcy merged commit 951df93 into opensearch-project:main Oct 10, 2023
7 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-579-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 951df934428562f1c0978310c6e3909c03e4aeda
# Push it to GitHub
git push --set-upstream origin backport/backport-579-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-579-to-1.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 10, 2023
)

* Add separate metric for cluster manager service events and metrics

* Fix build error related to missing import

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

* Fix test build failure

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

---------

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
(cherry picked from commit 951df93)
ansjcy pushed a commit that referenced this pull request Oct 10, 2023
) (#581)

* Add separate metric for cluster manager service events and metrics

* Fix build error related to missing import

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

* Fix test build failure

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

---------

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
(cherry picked from commit 951df93)

Co-authored-by: Khushboo Rajput <59671881+khushbr@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 14, 2023
)

* Add separate metric for cluster manager service events and metrics

* Fix build error related to missing import

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

* Fix test build failure

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>

---------

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
(cherry picked from commit 951df93)
sbcd90 pushed a commit that referenced this pull request Nov 14, 2023
) (#594)

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
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.

None yet

3 participants