From ef39526e9faf59cdeceaac661fc1e43e6a063bca Mon Sep 17 00:00:00 2001
From: Lantao Jin <jinlantao@gmail.com>
Date: Thu, 6 Jun 2024 21:06:54 +0800
Subject: [PATCH] Bump HdrHistogram to 2.2.2 and move the dependency version to
 version.properties (#13986)

Signed-off-by: LantaoJin <ltjin@amazon.com>
---
 CHANGELOG.md                                | 2 +-
 buildSrc/version.properties                 | 2 ++
 server/build.gradle                         | 6 +++---
 server/licenses/HdrHistogram-2.2.1.jar.sha1 | 1 -
 server/licenses/HdrHistogram-2.2.2.jar.sha1 | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 server/licenses/HdrHistogram-2.2.1.jar.sha1
 create mode 100644 server/licenses/HdrHistogram-2.2.2.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 759cf53adf8b8..b122d062fe8c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.github.spullara.mustache.java:compiler` from 0.9.10 to 0.9.13 ([#13329](https://github.com/opensearch-project/OpenSearch/pull/13329), [#13559](https://github.com/opensearch-project/OpenSearch/pull/13559))
 - Bump `org.gradle.test-retry` from 1.5.8 to 1.5.9 ([#13442](https://github.com/opensearch-project/OpenSearch/pull/13442))
 - Bump `org.apache.commons:commons-text` from 1.11.0 to 1.12.0 ([#13557](https://github.com/opensearch-project/OpenSearch/pull/13557))
-- Bump `org.hdrhistogram:HdrHistogram` from 2.1.12 to 2.2.1 ([#13556](https://github.com/opensearch-project/OpenSearch/pull/13556))
+- Bump `org.hdrhistogram:HdrHistogram` from 2.1.12 to 2.2.2 ([#13556](https://github.com/opensearch-project/OpenSearch/pull/13556), [#13986](https://github.com/opensearch-project/OpenSearch/pull/13986))
 - Bump `com.gradle.enterprise` from 3.17.2 to 3.17.4 ([#13641](https://github.com/opensearch-project/OpenSearch/pull/13641), [#13753](https://github.com/opensearch-project/OpenSearch/pull/13753))
 - Bump `org.apache.hadoop:hadoop-minicluster` from 3.3.6 to 3.4.0 ([#13642](https://github.com/opensearch-project/OpenSearch/pull/13642))
 - Bump `mockito` from 5.11.0 to 5.12.0 ([#13665](https://github.com/opensearch-project/OpenSearch/pull/13665))
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 0a36ed5e200f7..3a76cf6e9b7ad 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -23,6 +23,8 @@ guava             = 32.1.1-jre
 protobuf          = 3.22.3
 jakarta_annotation = 1.3.5
 google_http_client = 1.44.1
+tdigest           = 3.3
+hdrhistogram      = 2.2.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0
diff --git a/server/build.gradle b/server/build.gradle
index 15301e68fca3d..624e5fe332662 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -96,9 +96,9 @@ dependencies {
   api "joda-time:joda-time:${versions.joda}"
 
   // percentiles aggregation
-  api 'com.tdunning:t-digest:3.3'
-  // precentil ranks aggregation
-  api 'org.hdrhistogram:HdrHistogram:2.2.1'
+  api "com.tdunning:t-digest:${versions.tdigest}"
+  // percentile ranks aggregation
+  api "org.hdrhistogram:HdrHistogram:${versions.hdrhistogram}"
 
   // lucene spatial
   api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
diff --git a/server/licenses/HdrHistogram-2.2.1.jar.sha1 b/server/licenses/HdrHistogram-2.2.1.jar.sha1
deleted file mode 100644
index 68225950d4744..0000000000000
--- a/server/licenses/HdrHistogram-2.2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0eb1feb351f64176c377772a30174e582c0274d5
\ No newline at end of file
diff --git a/server/licenses/HdrHistogram-2.2.2.jar.sha1 b/server/licenses/HdrHistogram-2.2.2.jar.sha1
new file mode 100644
index 0000000000000..2c895841bce81
--- /dev/null
+++ b/server/licenses/HdrHistogram-2.2.2.jar.sha1
@@ -0,0 +1 @@
+7959933ebcc0f05b2eaa5af0a0c8689fa257b15c