Fix deadlock problem when using elasticsearch-client-7.0.0 (#5775)

* Update elasticsearch client 7.0.0 to elasticsearch client 7.5.0.
* Update CHANGES.md and LICENSE.

CHANGES.md

@@ -9,7 +9,7 @@ Release Notes.
 
 #### Java Agent
 * Support propagate the sending timestamp in MQ plugins to calculate the transfer latency in the async MQ scenarios.
-* Support auto-tag with the fixed values propagated in the correlation context.   
+* Support auto-tag with the fixed values propagated in the correlation context.
 * Make HttpClient 3.x, 4.x, and HttpAsyncClient 3.x plugins to support collecting HTTP parameters.
 * Make the Feign plugin to support Java 14
 * Make the okhttp3 plugin to support Java 14
@@ -24,6 +24,7 @@ Release Notes.
 * Improve Kubernetes service registry for ALS analysis.
 * Improve the queryable tags generation. Remove the duplicated tags to reduce the storage payload.
 * Fix the excessive timeout period set by the kubernetes-client.
+* Fix deadlock problem when using elasticsearch-client-7.0.0.
 
 #### UI
 

dist-material/release-docs/LICENSE

@@ -233,9 +233,12 @@ The text of each license is the standard Apache 2.0 license.
     Google: proto-google-common-protos 1.17.0: https://github.com/googleapis/googleapis , Apache 2.0
     Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
     Elasticsearch BV (Elasticsearch) 6.3.2: https://www.elastic.co/products/elasticsearch , Apache 2.0
-    Elasticsearch BV (Elasticsearch) 7.0.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
-    lang-mustache-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/lang-mustache , Apache 2.0
-    parent-join-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/parent-join , Apache 2.0
+    Elasticsearch BV (Elasticsearch) 7.5.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
+    aggs-matrix-stats-client 6.3.2, 7.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/aggs-matrix-stats Apache 2.0
+    lang-mustache-client 7.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/lang-mustache Apache 2.0
+    mapper-extras-client 7.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/mapper-extras Apache 2.0
+    parent-join-client 6.3.2, 7.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/parent-join , Apache 2.0
+    rank-eval-client 6.3.2, 7.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/rank-eval , Apache 2.0
     reindex-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/reindex , Apache 2.0
     percolator-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/percolator , Apache 2.0
     rest 5.5.0: https://github.com/elastic/elasticsearch/tree/master/client/rest , Apache 2.0
@@ -257,8 +260,8 @@ The text of each license is the standard Apache 2.0 license.
     Apache: commons-lang 3.6: https://github.com/apache/commons-lang, Apache 2.0
     Apache: commons-text 1.8: https://github.com/apache/commons-text, Apache 2.0
     Apache: commons-beanutils 1.9.4: https://github.com/apache/commons-beanutils, Apache 2.0
-    Apache: lucene 6.6.0: https://github.com/apache/lucene-solr/tree/master/lucene, Apache 2.0
-    Apache: httpasyncclient 4.1.2: https://github.com/apache/httpasyncclient/tree/4.1.2, Apache 2.0
+    Apache: lucene 7.3.1, 8.3.0: https://github.com/apache/lucene-solr/tree/master/lucene, Apache 2.0
+    Apache: httpasyncclient 4.1.2, 4.1.4: https://github.com/apache/httpasyncclient/tree/4.1.2, Apache 2.0
     Apache: log4j 1.2.16: http://logging.apache.org/log4j/1.2/, Apache 2.0
     Apache: log4j2 2.9.0: https://github.com/apache/logging-log4j2, Apache 2.0
     Apache: zookeeper 3.4.10: https://github.com/apache/zookeeper, Apache 2.0
@@ -269,16 +272,16 @@ The text of each license is the standard Apache 2.0 license.
     Apache: commons-collections4 4.1: https://mvnrepository.com/artifact/org.apache.commons/commons-collections4, Apache 2.0
     Apache: tomcat 8.5.27: https://github.com/apache/tomcat/tree/trunk, Apache 2.0
     Apache: freemarker 2.3.28: https://github.com/apache/freemarker, Apache 2.0
-    netty 4.1.12: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
+    netty 4.1.42: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
     annotations 13.0: http://www.jetbrains.org, Apache 2.0
-    compiler 0.9.3: https://github.com/spullara/mustache.java, Apache 2.0
+    compiler 0.9.6: https://github.com/spullara/mustache.java, Apache 2.0
     error_prone_annotations 2.3.2: https://github.com/google/error-prone, Apache 2.0
-    hppc 0.7.1: https://github.com/carrotsearch/hppc, Apache 2.0
+    hppc 0.7.1, 0.8.1: https://github.com/carrotsearch/hppc, Apache 2.0
     instrumentation-api 0.4.3: https://github.com/google/instrumentation-java, Apache 2.0
     jackson-annotations 2.8.0: https://github.com/FasterXML/jackson-annotations, Apache 2.0
     jackson-core 2.8.8: https://github.com/FasterXML/jackson-core, Apache 2.0
     jackson-databind 2.9.10: https://github.com/FasterXML/jackson-databind, Apache 2.0
-    jackson-dataformat 2.8.6: https://github.com/FasterXML/jackson-dataformats-binary, Apache 2.0
+    jackson-dataformat 2.8.10, 2.8.11: https://github.com/FasterXML/jackson-dataformats-binary, Apache 2.0
     jackson-datatype-jdk8 2.8.8: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0
     jackson-module-kotlin 2.8.8: http://kotlinlang.org, Apache 2.0
     jackson-module-afterburner 2.7.5: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
@@ -286,7 +289,7 @@ The text of each license is the standard Apache 2.0 license.
     jna 4.4.0: https://github.com/java-native-access/jna, Apache 2.0
     kotlin-reflect 1.1.1: http://kotlinlang.org, Apache 2.0
     kotlin-stdlib 1.1.60: http://kotlinlang.org, Apache 2.0
-    t-digest 3.0: https://github.com/tdunning/t-digest, Apache 2.0
+    t-digest 3.2: https://github.com/tdunning/t-digest, Apache 2.0
     archaius-core 0.7.4: https://github.com/Netflix/archaius, Apache 2.0
     classmate 1.3.1: https://github.com/FasterXML/java-classmate, Apache 2.0
     hibernate-validator 5.3.6.Final: https://github.com/hibernate/hibernate-validator, Apache 2.0
@@ -327,8 +330,8 @@ The text of each license is the standard Apache 2.0 license.
     moshi 1.5.0: https://github.com/square/moshi, Apache 2.0
     logging-interceptor 3.13.1: https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor, Apache 2.0
     msgpack-core 0.8.16: https://github.com/msgpack/msgpack-java, Apache 2.0
-    sundr-codegen 0.2.10: https://mvnrepository.com/artifact/io.sundr/sundr-codegen, Apache 2.0
-    sundr-core 0.2.10: https://mvnrepository.com/artifact/io.sundr/sundr-core, Apache 2.0
+    sundr-codegen 0.21.0: https://mvnrepository.com/artifact/io.sundr/sundr-codegen, Apache 2.0
+    sundr-core 0.21.0: https://mvnrepository.com/artifact/io.sundr/sundr-core, Apache 2.0
     swagger-annotations 1.5.22: https://mvnrepository.com/artifact/io.swagger.core.v3/swagger-annotations, Apache 2.0
     resourcecify-annotations 0.21.0: https://mvnrepository.com/artifact/io.sundr/resourcecify-annotations, Apache 2.0
     jose4j 0.7.0: https://mvnrepository.com/artifact/org.bitbucket.b_c/jose4j, Apache 2.0
@@ -339,6 +342,8 @@ The text of each license is the standard Apache 2.0 license.
     snappy-java 1.1.7.3: https://github.com/xerial/snappy-java, Apache 2.0
     slf4j-api 1.7.28: http://www.slf4j.org, Apache 2.0
     mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
+    okio 1.13.0: https://github.com/square/okio Apache 2.0
+    caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
 
 ========================================================================
 MIT licenses
@@ -349,8 +354,8 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
 
     slf4j 1.7.25: https://www.slf4j.org/ , MIT
     Jedis 2.9.0: https://github.com/xetorthio/jedis , MIT
-    GraphQL java 6.0: https://github.com/graphql-java/graphql-java , MIT
-    GraphQL Java Tools 4.3.0: https://github.com/graphql-java/graphql-java-tools , MIT
+    GraphQL java 8.0: https://github.com/graphql-java/graphql-java , MIT
+    GraphQL Java Tools 5.2.3: https://github.com/graphql-java/graphql-java-tools , MIT
     jopt-simple 5.0.2: https://github.com/jopt-simple/jopt-simple , MIT
     bcpkix-jdk15on 1.61: http://www.bouncycastle.org/licence.html , MIT
     bcprov-jdk15on 1.61: http://www.bouncycastle.org/licence.html , MIT
@@ -379,7 +384,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     jline 0.9.94: http://mvnrepository.com/artifact/jline/jline/0.9.94, BSD
     Google: protobuf-java 3.13.0: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
     Google: protobuf-java-util 3.12.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
-    reflectasm 1.11.3: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause
+    reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause
 
     proto files from gogo: https://github.com/gogo/protobuf  BSD-2
     proto files from grpc-gateway, https://github.com/grpc-ecosystem/grpc-gateway/tree/master/protoc-gen-swagger/options BSD-3
@@ -399,7 +404,7 @@ CC0-1.0 licenses
 ========================================
 
 HdrHistogram 2.1.9:	https://github.com/HdrHistogram/HdrHistogram , CC0-1.0 and BSD 2-Clause
-reactive-streams 1.0.1:	https://github.com/reactive-streams/reactive-streams-jvm , CC0-1.0
+reactive-streams 1.0.2:	https://github.com/reactive-streams/reactive-streams-jvm , CC0-1.0
 
 ========================================================================
 EPL licenses

oap-server/server-starter-es7/pom.xml

@@ -30,7 +30,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <elasticsearch.version>7.0.0</elasticsearch.version>
+        <elasticsearch.version>7.5.0</elasticsearch.version>
     </properties>
 
     <dependencies>

oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml

@@ -29,7 +29,7 @@
     <artifactId>storage-elasticsearch7-plugin</artifactId>
 
     <properties>
-        <elasticsearch.version>7.0.0</elasticsearch.version>
+        <elasticsearch.version>7.5.0</elasticsearch.version>
     </properties>
 
     <dependencyManagement>

tools/dependencies/known-oap-backend-dependencies-es7.txt

-aggs-matrix-stats-client-7.0.0.jar
+aggs-matrix-stats-client-7.5.0.jar
 animal-sniffer-annotations-1.18.jar
 annotations-13.0.jar
 antlr4-runtime-4.7.1.jar
@@ -21,7 +21,7 @@ commons-io-2.6.jar
 commons-lang3-3.7.jar
 commons-pool-1.5.4.jar
 commons-text-1.4.jar
-compiler-0.9.3.jar
+compiler-0.9.6.jar
 consul-client-1.2.6.jar
 converter-jackson-2.3.0.jar
 converter-moshi-2.5.0.jar
@@ -29,14 +29,18 @@ curator-client-4.0.1.jar
 curator-framework-4.0.1.jar
 curator-recipes-4.0.1.jar
 curator-x-discovery-4.0.1.jar
-elasticsearch-7.0.0.jar
-elasticsearch-cli-7.0.0.jar
-elasticsearch-core-7.0.0.jar
-elasticsearch-geo-7.0.0.jar
-elasticsearch-rest-client-7.0.0.jar
-elasticsearch-rest-high-level-client-7.0.0.jar
-elasticsearch-secure-sm-7.0.0.jar
-elasticsearch-x-content-7.0.0.jar
+elasticsearch-7.5.0.jar
+elasticsearch-cli-7.5.0.jar
+elasticsearch-core-7.5.0.jar
+elasticsearch-geo-7.5.0.jar
+elasticsearch-rest-client-7.5.0.jar
+elasticsearch-rest-high-level-client-7.5.0.jar
+elasticsearch-secure-sm-7.5.0.jar
+elasticsearch-x-content-7.5.0.jar
+lang-mustache-client-7.5.0.jar
+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
 failureaccess-1.0.1.jar
@@ -58,11 +62,11 @@ guice-4.1.0.jar
 h2-1.4.196.jar
 HdrHistogram-2.1.9.jar
 HikariCP-3.1.0.jar
-hppc-0.7.1.jar
+hppc-0.8.1.jar
 httpasyncclient-4.1.4.jar
-httpclient-4.5.7.jar
-httpcore-4.4.11.jar
-httpcore-nio-4.4.11.jar
+httpclient-4.5.10.jar
+httpcore-4.4.12.jar
+httpcore-nio-4.4.12.jar
 influxdb-java-2.15.jar
 jackson-annotations-2.9.5.jar
 jackson-core-2.9.5.jar
@@ -97,7 +101,6 @@ json-flattener-0.6.0.jar
 jsr305-3.0.2.jar
 kotlin-reflect-1.1.1.jar
 kotlin-stdlib-1.1.60.jar
-lang-mustache-client-7.0.0.jar
 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 log4j-1.2.16.jar
 log4j-api-2.9.0.jar
@@ -105,21 +108,21 @@ log4j-core-2.9.0.jar
 log4j-over-slf4j-1.7.25.jar
 log4j-slf4j-impl-2.9.0.jar
 logging-interceptor-3.13.1.jar
-lucene-analyzers-common-8.0.0.jar
-lucene-backward-codecs-8.0.0.jar
-lucene-core-8.0.0.jar
-lucene-grouping-8.0.0.jar
-lucene-highlighter-8.0.0.jar
-lucene-join-8.0.0.jar
-lucene-memory-8.0.0.jar
-lucene-misc-8.0.0.jar
-lucene-queries-8.0.0.jar
-lucene-queryparser-8.0.0.jar
-lucene-sandbox-8.0.0.jar
-lucene-spatial-8.0.0.jar
-lucene-spatial-extras-8.0.0.jar
-lucene-spatial3d-8.0.0.jar
-lucene-suggest-8.0.0.jar
+lucene-analyzers-common-8.3.0.jar
+lucene-backward-codecs-8.3.0.jar
+lucene-core-8.3.0.jar
+lucene-grouping-8.3.0.jar
+lucene-highlighter-8.3.0.jar
+lucene-join-8.3.0.jar
+lucene-memory-8.3.0.jar
+lucene-misc-8.3.0.jar
+lucene-queries-8.3.0.jar
+lucene-queryparser-8.3.0.jar
+lucene-sandbox-8.3.0.jar
+lucene-spatial-8.3.0.jar
+lucene-spatial-extras-8.3.0.jar
+lucene-spatial3d-8.3.0.jar
+lucene-suggest-8.3.0.jar
 minimal-json-0.9.5.jar
 moshi-1.5.0.jar
 msgpack-core-0.8.16.jar
@@ -142,12 +145,10 @@ netty-tcnative-boringssl-static-2.0.26.Final.jar
 netty-transport-4.1.42.Final.jar
 okhttp-3.9.0.jar
 okio-1.13.0.jar
-parent-join-client-7.0.0.jar
 perfmark-api-0.19.0.jar
 proto-google-common-protos-1.17.0.jar
 protobuf-java-3.13.0.jar
 protobuf-java-util-3.12.4.jar
-rank-eval-client-7.0.0.jar
 reactive-streams-1.0.2.jar
 reflectasm-1.11.7.jar
 resourcecify-annotations-0.21.0.jar