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

Bump HdrHistogram to 2.2.2 and move the dependency version to version.properties #13986

Merged
merged 2 commits into from
Jun 6, 2024

Conversation

LantaoJin
Copy link
Member

@LantaoJin LantaoJin commented Jun 5, 2024

Description

  1. Bump org.hdrhistogram:HdrHistogram from 2.2.1 to 2.2.2 in /server.
    Sourced from org.hdrhistogram:HdrHistogram's releases.

HdrHistogram-2.2.2

Revert moditect plugin use and use Automatic-Module-Name instead
Fixes HdrHistogram/HdrHistogram#206

  1. Add the dependency versions of t-digest and hdrhistogram to version.properties and fix a typo in comment.
    Upgraded to t-digest 3.3. #3634 upgraded t-digest to 3.3 in main only, but keep using 3.2 in 2.x branch. SQL plugin which depends on these percentile aggregation dependencies has to set different versions for each branch. Move the versions to version.properties file could reduce the dependency maintenance efforts in plugins.

Related Issues

Followup #3634
Duplicates #13937

Check List

  • [ ] New functionality includes testing.
  • [ ] All tests pass
  • [ ] New functionality has been documented.
    • [ ] New functionality has javadoc added
  • [ ] API changes companion pull request created.
  • Commits are signed per the DCO using --signoff
  • [ ] Public documentation issue/PR created

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.

Copy link
Contributor

github-actions bot commented Jun 5, 2024

❌ Gradle check result for af271f6: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@LantaoJin LantaoJin changed the title Add the percentiles dependency versions to version.properties Bump HdrHistogram to 2.2.2 and move the dependency version to version.properties Jun 6, 2024
Copy link
Contributor

github-actions bot commented Jun 6, 2024

❕ Gradle check result for fba12bd: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Jun 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.62%. Comparing base (b15cb0c) to head (c83e229).
Report is 354 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13986      +/-   ##
============================================
+ Coverage     71.42%   71.62%   +0.20%     
- Complexity    59978    61378    +1400     
============================================
  Files          4985     5071      +86     
  Lines        282275   288390    +6115     
  Branches      40946    41764     +818     
============================================
+ Hits         201603   206572    +4969     
- Misses        63999    64728     +729     
- Partials      16673    17090     +417     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

github-actions bot commented Jun 6, 2024

❌ Gradle check result for c83e229: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta reta added dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch labels Jun 6, 2024
@reta
Copy link
Collaborator

reta commented Jun 6, 2024

❌ Gradle check result for c83e229: FAILURE

java.lang.Exception: Suite timeout exceeded (>= 1200000 msec).
	at __randomizedtesting.SeedInfo.seed([E01B74F9814450C]:0)

Copy link
Contributor

github-actions bot commented Jun 6, 2024

✅ Gradle check result for c83e229: SUCCESS

@peternied peternied merged commit 298aeda into opensearch-project:main Jun 6, 2024
35 of 36 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-13986-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 298aeda5fdffaa4f6a707d7b0248f7871cf83d80
# Push it to GitHub
git push --set-upstream origin backport/backport-13986-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

@reta
Copy link
Collaborator

reta commented Jun 6, 2024

@LantaoJin could you please backport to 2.x manually? thank you

@LantaoJin
Copy link
Member Author

@reta sure, I will backport this to 2.x.

reta pushed a commit that referenced this pull request Jun 6, 2024
….properties (#13986) (#14040)

Signed-off-by: LantaoJin <[email protected]>
(cherry picked from commit 298aeda)
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants