From 26de83883a22a2fbfd17ffb946b07fcb51843d49 Mon Sep 17 00:00:00 2001
From: YczYanchengzhe <45945752+YczYanchengzhe@users.noreply.github.com>
Date: Sat, 8 May 2021 07:19:16 +0800
Subject: [PATCH] etcd client problem : fix the byte buff leak reported by
 io.netty.util.ResourceLeakDetector (#6912)

---
 CHANGES.md                                                | 1 +
 dist-material/release-docs/LICENSE                        | 2 +-
 oap-server/pom.xml                                        | 2 +-
 tools/dependencies/known-oap-backend-dependencies-es7.txt | 2 +-
 tools/dependencies/known-oap-backend-dependencies.txt     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cee073245a..d4d12cdc71 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -38,6 +38,7 @@ Release Notes.
 * perf: use iterator.remove() to remove modulesWithoutProvider
 * Support analyzing Envoy TCP access logs and persist error TCP logs.
 * Fix: Envoy error logs are not persisted when no metrics are generated
+* Fix: Memory leakage of low version etcd client. [fix-issue](https://github.com/jurmous/etcd4j/pull/185)
 
 #### UI
 * Add logo for kong plugin.
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 81f257d8d4..b2da952a39 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -325,7 +325,7 @@ The text of each license is the standard Apache 2.0 license.
     Apache: commons-text 1.4: https://github.com/apache/commons-text Apache 2.0
     sundrio 0.9.2: https://github.com/sundrio/sundrio Apache 2.0
     Ctripcorp: apollo 1.4.0: https://github.com/ctripcorp/apollo Apache 2.0
-    etcd4j 2.17.0: https://github.com/jurmous/etcd4j Apache 2.0
+    etcd4j 2.18.0: https://github.com/jurmous/etcd4j Apache 2.0
     javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0
     jackson-module-afterburner 2.9.5: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
     perfmark-api 0.19.0: https://github.com/perfmark/perfmark, Apache 2.0
diff --git a/oap-server/pom.xml b/oap-server/pom.xml
index df7ee01abf..beac50f7d9 100755
--- a/oap-server/pom.xml
+++ b/oap-server/pom.xml
@@ -84,7 +84,7 @@
         <maven-docker-plugin.version>0.30.0</maven-docker-plugin.version>
         <curator.version>4.0.1</curator.version>
         <curator-test.version>2.12.0</curator-test.version>
-        <etcd4j.version>2.17.0</etcd4j.version>
+        <etcd4j.version>2.18.0</etcd4j.version>
         <etcd.version>v3.2.3</etcd.version>
         <netty.version>4.1.42.Final</netty.version>
         <jackson-module-afterburner.version>2.9.5</jackson-module-afterburner.version>
diff --git a/tools/dependencies/known-oap-backend-dependencies-es7.txt b/tools/dependencies/known-oap-backend-dependencies-es7.txt
index 06df41b59b..5d699fca9c 100755
--- a/tools/dependencies/known-oap-backend-dependencies-es7.txt
+++ b/tools/dependencies/known-oap-backend-dependencies-es7.txt
@@ -42,7 +42,7 @@ mapper-extras-client-7.5.0.jar
 parent-join-client-7.5.0.jar
 rank-eval-client-7.5.0.jar
 error_prone_annotations-2.3.2.jar
-etcd4j-2.17.0.jar
+etcd4j-2.18.0.jar
 failureaccess-1.0.1.jar
 flatbuffers-java-1.12.0.jar
 freemarker-2.3.28.jar
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index 9469791ad8..d36755244e 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -38,7 +38,7 @@ elasticsearch-rest-high-level-client-6.3.2.jar
 elasticsearch-secure-sm-6.3.2.jar
 elasticsearch-x-content-6.3.2.jar
 error_prone_annotations-2.3.2.jar
-etcd4j-2.17.0.jar
+etcd4j-2.18.0.jar
 failureaccess-1.0.1.jar
 flatbuffers-java-1.12.0.jar
 freemarker-2.3.28.jar
-- 
GitLab