From a219354d3dfa80a32335e3c6cd2d49261f731b90 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Fri, 14 Feb 2025 20:53:57 +0800 Subject: [PATCH 1/2] feat:upgrade polaris-all maven shade configuration. --- .../polaris-assembly-client/pom.xml | 10 +-- polaris-auth/polaris-auth-client/pom.xml | 7 -- polaris-auth/polaris-auth-factory/pom.xml | 6 -- .../polaris-circuitbreaker-client/pom.xml | 10 +-- .../polaris-circuitbreaker-factory/pom.xml | 7 -- polaris-common/polaris-client/pom.xml | 10 +-- polaris-common/polaris-config/pom.xml | 10 +-- .../config/global/AdminConfigImpl.java | 8 ++ polaris-common/polaris-encrypt/pom.xml | 6 -- polaris-common/polaris-logging/pom.xml | 11 +-- polaris-common/polaris-model/pom.xml | 6 -- polaris-common/polaris-threadlocal/pom.xml | 44 ++++------ .../polaris-configuration-client/pom.xml | 6 -- .../polaris-discovery-client/pom.xml | 10 +-- polaris-distribution/polaris-all/pom.xml | 42 +++++---- polaris-factory/pom.xml | 7 -- polaris-plugins/polaris-plugin-api/pom.xml | 6 -- .../auth-block-allow-list/pom.xml | 6 -- .../circuitbreaker-common/pom.xml | 10 +-- .../circuitbreaker-composite/pom.xml | 10 +-- .../circuitbreaker-errcount/pom.xml | 10 +-- .../circuitbreaker-errrate/pom.xml | 10 +-- .../configfilefilter-crypto/pom.xml | 6 -- .../consul-configuration-connector/pom.xml | 6 -- .../pom.xml | 28 +++--- .../polaris-configuration-connector/pom.xml | 6 -- .../connector-common/pom.xml | 6 -- .../connector-composite/pom.xml | 6 -- .../connector-consul/pom.xml | 6 -- .../connector/consul/ConsulAPIConnector.java | 10 ++- .../connector/consul/ConsulServerUtils.java | 8 +- .../connector-nacos/pom.xml | 10 +-- .../connector-polaris-grpc/pom.xml | 10 +-- .../healthchecker-http/pom.xml | 10 +-- .../healthchecker-tcp/pom.xml | 10 +-- .../healthchecker-udp/pom.xml | 10 +-- .../polaris-plugins-location/pom.xml | 88 +++++++++---------- .../lossless-common/pom.xml | 6 -- .../lossless-deregister/pom.xml | 6 -- .../lossless-register/pom.xml | 6 -- .../lossless-warmup/pom.xml | 6 -- .../event-logger/pom.xml | 8 -- .../event-tsf/pom.xml | 7 -- .../stat-common/pom.xml | 6 -- .../stat-prometheus/pom.xml | 10 +-- .../trace-otel/pom.xml | 59 +++++-------- .../ratelimiter-common/pom.xml | 10 +-- .../ratelimiter-reject-concurrency/pom.xml | 6 -- .../ratelimiter-reject/pom.xml | 10 +-- .../ratelimiter-tsf/pom.xml | 6 -- .../ratelimiter-unirate/pom.xml | 10 +-- .../registry-memory/pom.xml | 10 +-- .../router-lane/pom.xml | 6 -- .../router-namespace/pom.xml | 6 -- .../router-nearby/pom.xml | 10 +-- .../router-rule/pom.xml | 10 +-- .../polaris-plugins-router/router-set/pom.xml | 10 +-- .../polaris-ratelimit-client/pom.xml | 7 -- .../polaris-ratelimit-factory/pom.xml | 6 -- polaris-router/polaris-router-client/pom.xml | 10 +-- .../polaris-test-mock-discovery/pom.xml | 10 +-- pom.xml | 14 +-- 62 files changed, 191 insertions(+), 536 deletions(-) diff --git a/polaris-assembly/polaris-assembly-client/pom.xml b/polaris-assembly/polaris-assembly-client/pom.xml index e4b5cb390..d456c5924 100644 --- a/polaris-assembly/polaris-assembly-client/pom.xml +++ b/polaris-assembly/polaris-assembly-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-assembly com.tencent.polaris @@ -20,12 +20,6 @@ polaris-assembly-api ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-discovery-client diff --git a/polaris-auth/polaris-auth-client/pom.xml b/polaris-auth/polaris-auth-client/pom.xml index 2edbf9729..b8cad6dfc 100644 --- a/polaris-auth/polaris-auth-client/pom.xml +++ b/polaris-auth/polaris-auth-client/pom.xml @@ -20,12 +20,5 @@ polaris-auth-api ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-auth/polaris-auth-factory/pom.xml b/polaris-auth/polaris-auth-factory/pom.xml index e3d60ce4c..fb8ad7468 100644 --- a/polaris-auth/polaris-auth-factory/pom.xml +++ b/polaris-auth/polaris-auth-factory/pom.xml @@ -30,11 +30,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-circuitbreaker/polaris-circuitbreaker-client/pom.xml b/polaris-circuitbreaker/polaris-circuitbreaker-client/pom.xml index edda4258c..97970275a 100644 --- a/polaris-circuitbreaker/polaris-circuitbreaker-client/pom.xml +++ b/polaris-circuitbreaker/polaris-circuitbreaker-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-circuitbreaker com.tencent.polaris @@ -21,12 +21,6 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-circuitbreaker-api diff --git a/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml b/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml index 959baef7a..6d9c692f0 100644 --- a/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml +++ b/polaris-circuitbreaker/polaris-circuitbreaker-factory/pom.xml @@ -153,12 +153,5 @@ ${project.version} test - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-common/polaris-client/pom.xml b/polaris-common/polaris-client/pom.xml index 36f1c420e..c17ac009b 100644 --- a/polaris-common/polaris-client/pom.xml +++ b/polaris-common/polaris-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-common com.tencent.polaris @@ -26,12 +26,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-plugin-api diff --git a/polaris-common/polaris-config/pom.xml b/polaris-common/polaris-config/pom.xml index 2da33c032..655389e74 100644 --- a/polaris-common/polaris-config/pom.xml +++ b/polaris-common/polaris-config/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-common com.tencent.polaris @@ -21,12 +21,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.fasterxml.jackson.dataformat jackson-dataformat-yaml diff --git a/polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/AdminConfigImpl.java b/polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/AdminConfigImpl.java index 463002d5d..ea76037f7 100644 --- a/polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/AdminConfigImpl.java +++ b/polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/AdminConfigImpl.java @@ -66,4 +66,12 @@ public void setDefault(Object defaultObject) { } } } + + @Override + public String toString() { + return "AdminConfigImpl{" + + "host='" + host + '\'' + + ", port=" + port + + '}'; + } } diff --git a/polaris-common/polaris-encrypt/pom.xml b/polaris-common/polaris-encrypt/pom.xml index 541a5738e..7d11529cd 100644 --- a/polaris-common/polaris-encrypt/pom.xml +++ b/polaris-common/polaris-encrypt/pom.xml @@ -20,12 +20,6 @@ polaris-model ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - org.bouncycastle bcpkix-jdk15to18 diff --git a/polaris-common/polaris-logging/pom.xml b/polaris-common/polaris-logging/pom.xml index acd16cdcc..463db606e 100644 --- a/polaris-common/polaris-logging/pom.xml +++ b/polaris-common/polaris-logging/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-common com.tencent.polaris @@ -16,13 +16,6 @@ - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - log4j log4j diff --git a/polaris-common/polaris-model/pom.xml b/polaris-common/polaris-model/pom.xml index 18a9c5bf2..173762f92 100644 --- a/polaris-common/polaris-model/pom.xml +++ b/polaris-common/polaris-model/pom.xml @@ -35,12 +35,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.google.protobuf protobuf-java diff --git a/polaris-common/polaris-threadlocal/pom.xml b/polaris-common/polaris-threadlocal/pom.xml index 38eee2fd0..039a9cdd5 100644 --- a/polaris-common/polaris-threadlocal/pom.xml +++ b/polaris-common/polaris-threadlocal/pom.xml @@ -1,30 +1,24 @@ - - polaris-common - com.tencent.polaris - ${revision} - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + polaris-common + com.tencent.polaris + ${revision} + ../pom.xml + + 4.0.0 - polaris-threadlocal - Polaris Common ThreadLocal - Polaris Common ThreadLocal JAR + polaris-threadlocal + Polaris Common ThreadLocal + Polaris Common ThreadLocal JAR - - - com.tencent.polaris - polaris-logging - ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - + + + com.tencent.polaris + polaris-logging + ${project.version} + + \ No newline at end of file diff --git a/polaris-configuration/polaris-configuration-client/pom.xml b/polaris-configuration/polaris-configuration-client/pom.xml index 5c3770358..a5484e117 100644 --- a/polaris-configuration/polaris-configuration-client/pom.xml +++ b/polaris-configuration/polaris-configuration-client/pom.xml @@ -35,11 +35,5 @@ guava ${guava.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - diff --git a/polaris-discovery/polaris-discovery-client/pom.xml b/polaris-discovery/polaris-discovery-client/pom.xml index 45b3868a0..1cb6c93f4 100644 --- a/polaris-discovery/polaris-discovery-client/pom.xml +++ b/polaris-discovery/polaris-discovery-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-discovery com.tencent.polaris @@ -30,11 +30,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-distribution/polaris-all/pom.xml b/polaris-distribution/polaris-all/pom.xml index f933d827c..e122185bf 100644 --- a/polaris-distribution/polaris-all/pom.xml +++ b/polaris-distribution/polaris-all/pom.xml @@ -36,12 +36,6 @@ ${project.version} compile - - org.slf4j - slf4j-api - ${slf4j.version} - provided - javax.annotation javax.annotation-api @@ -71,6 +65,13 @@ resolveCiFriendliesOnly + + flatten.clean + clean + + clean + + flatten process-resources @@ -79,10 +80,10 @@ - flatten.clean - clean + flatten-again + package - clean + flatten @@ -141,6 +142,16 @@ shade.polaris.org.apache.commons.codec + + org.apache.commons.logging + shade.polaris.org.apache.commons.logging + + + + org.apache.http + shade.polaris.org.apache.org.apache.http + + io.perfmark shade.polaris.io.perfmark @@ -192,19 +203,6 @@ - - org.codehaus.mojo - flatten-maven-plugin - - - flatten - package - - flatten - - - - maven-javadoc-plugin ${maven.javadoc.plugin.version} diff --git a/polaris-factory/pom.xml b/polaris-factory/pom.xml index 760731276..51f17d7a5 100644 --- a/polaris-factory/pom.xml +++ b/polaris-factory/pom.xml @@ -16,13 +16,6 @@ Polaris Factory JAR - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - com.tencent.polaris polaris-discovery-factory diff --git a/polaris-plugins/polaris-plugin-api/pom.xml b/polaris-plugins/polaris-plugin-api/pom.xml index 92791a7e7..28b7f43ac 100644 --- a/polaris-plugins/polaris-plugin-api/pom.xml +++ b/polaris-plugins/polaris-plugin-api/pom.xml @@ -36,11 +36,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-auth/auth-block-allow-list/pom.xml b/polaris-plugins/polaris-plugins-auth/auth-block-allow-list/pom.xml index 189ee1606..e2478c230 100644 --- a/polaris-plugins/polaris-plugins-auth/auth-block-allow-list/pom.xml +++ b/polaris-plugins/polaris-plugins-auth/auth-block-allow-list/pom.xml @@ -20,11 +20,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-common/pom.xml b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-common/pom.xml index 34b683072..eec97dffa 100644 --- a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-common/pom.xml +++ b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-common/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-circuitbreaker com.tencent.polaris @@ -27,11 +27,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/pom.xml b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/pom.xml index cfcd51d75..00972abd5 100644 --- a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/pom.xml +++ b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-composite/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-circuitbreaker com.tencent.polaris @@ -25,12 +25,6 @@ guava ${guava.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-test-common diff --git a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errcount/pom.xml b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errcount/pom.xml index d542796bf..35660127a 100644 --- a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errcount/pom.xml +++ b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errcount/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-circuitbreaker com.tencent.polaris @@ -21,11 +21,5 @@ circuitbreaker-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errrate/pom.xml b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errrate/pom.xml index 9456ef309..3c514cb27 100644 --- a/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errrate/pom.xml +++ b/polaris-plugins/polaris-plugins-circuitbreaker/circuitbreaker-errrate/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-circuitbreaker com.tencent.polaris @@ -21,11 +21,5 @@ circuitbreaker-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml index 16a5b82b1..56270727f 100644 --- a/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml +++ b/polaris-plugins/polaris-plugins-configfilefilter/configfilefilter-crypto/pom.xml @@ -24,12 +24,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - org.bouncycastle bcpkix-jdk15to18 diff --git a/polaris-plugins/polaris-plugins-configuration-connector/consul-configuration-connector/pom.xml b/polaris-plugins/polaris-plugins-configuration-connector/consul-configuration-connector/pom.xml index 8521b10ca..f2edf5b3c 100644 --- a/polaris-plugins/polaris-plugins-configuration-connector/consul-configuration-connector/pom.xml +++ b/polaris-plugins/polaris-plugins-configuration-connector/consul-configuration-connector/pom.xml @@ -34,11 +34,5 @@ httpclient ${httpclient.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - diff --git a/polaris-plugins/polaris-plugins-configuration-connector/local-file-configuration-connector/pom.xml b/polaris-plugins/polaris-plugins-configuration-connector/local-file-configuration-connector/pom.xml index 15e6bada4..c242420ee 100644 --- a/polaris-plugins/polaris-plugins-configuration-connector/local-file-configuration-connector/pom.xml +++ b/polaris-plugins/polaris-plugins-configuration-connector/local-file-configuration-connector/pom.xml @@ -1,23 +1,15 @@ - - polaris-plugins-configuration-connector - com.tencent.polaris - ${revision} - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + polaris-plugins-configuration-connector + com.tencent.polaris + ${revision} + ../pom.xml + + 4.0.0 - local-file-configuration-connector + local-file-configuration-connector - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - diff --git a/polaris-plugins/polaris-plugins-configuration-connector/polaris-configuration-connector/pom.xml b/polaris-plugins/polaris-plugins-configuration-connector/polaris-configuration-connector/pom.xml index cf7df79f9..72c2295ca 100644 --- a/polaris-plugins/polaris-plugins-configuration-connector/polaris-configuration-connector/pom.xml +++ b/polaris-plugins/polaris-plugins-configuration-connector/polaris-configuration-connector/pom.xml @@ -18,12 +18,6 @@ okhttp 4.10.0 - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.google.code.gson gson diff --git a/polaris-plugins/polaris-plugins-connector/connector-common/pom.xml b/polaris-plugins/polaris-plugins-connector/connector-common/pom.xml index 8dfa9b4ad..5690582bb 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-common/pom.xml +++ b/polaris-plugins/polaris-plugins-connector/connector-common/pom.xml @@ -22,11 +22,5 @@ guava ${guava.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-connector/connector-composite/pom.xml b/polaris-plugins/polaris-plugins-connector/connector-composite/pom.xml index 1ccd58cba..151689f2b 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-composite/pom.xml +++ b/polaris-plugins/polaris-plugins-connector/connector-composite/pom.xml @@ -32,11 +32,5 @@ connector-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/pom.xml b/polaris-plugins/polaris-plugins-connector/connector-consul/pom.xml index 0f1ad981d..9a8bb5c24 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-consul/pom.xml +++ b/polaris-plugins/polaris-plugins-connector/connector-consul/pom.xml @@ -43,11 +43,5 @@ httpclient ${httpclient.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java index 448200f40..d02ccc087 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java +++ b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java @@ -51,8 +51,8 @@ import com.tencent.polaris.plugins.connector.consul.service.ServiceService; import com.tencent.polaris.plugins.connector.consul.service.authority.AuthorityService; import com.tencent.polaris.plugins.connector.consul.service.circuitbreaker.CircuitBreakingService; -import com.tencent.polaris.plugins.connector.consul.service.lossless.LosslessService; import com.tencent.polaris.plugins.connector.consul.service.lane.LaneService; +import com.tencent.polaris.plugins.connector.consul.service.lossless.LosslessService; import com.tencent.polaris.plugins.connector.consul.service.ratelimiting.RateLimitingService; import com.tencent.polaris.plugins.connector.consul.service.router.NearByRouteRuleService; import com.tencent.polaris.plugins.connector.consul.service.router.RoutingService; @@ -342,7 +342,13 @@ private NewService buildRegisterInstanceRequest(CommonProviderRequest req) { meta.putAll(req.getExtendedMetadata().get(SERVER_CONNECTOR_CONSUL)); } service.setMeta(meta); - service.setTags(consulContext.getTags()); + + List tags = new ArrayList<>(consulContext.getTags()); + if (req.getExtendedMetadata().containsKey(TAGS_KEY)) { + tags.addAll(req.getExtendedMetadata().get(TAGS_KEY).values()); + } + service.setTags(tags); + if (null != req.getTtl()) { Check check = new Check(); check.setTtl(req.getTtl() * 1.5 + "s"); diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulServerUtils.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulServerUtils.java index 671fe445d..5b5eb964e 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulServerUtils.java +++ b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulServerUtils.java @@ -19,8 +19,8 @@ import com.ecwid.consul.v1.health.model.HealthService; import com.tencent.polaris.api.utils.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.tencent.polaris.logging.LoggerFactory; +import org.slf4j.Logger; import java.net.Inet6Address; import java.net.InetAddress; @@ -42,7 +42,7 @@ */ public class ConsulServerUtils { - private static final Log log = LogFactory.getLog(ConsulServerUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(ConsulServerUtils.class); public static String findHost(HealthService healthService) { HealthService.Service service = healthService.getService(); @@ -64,7 +64,7 @@ public static String fixIPv6Address(String address) { } return address; } catch (UnknownHostException e) { - log.debug("Not InetAddress: " + address + " , resolved as is."); + LOG.debug("Not InetAddress: " + address + " , resolved as is."); return address; } } diff --git a/polaris-plugins/polaris-plugins-connector/connector-nacos/pom.xml b/polaris-plugins/polaris-plugins-connector/connector-nacos/pom.xml index 62230b9d9..38fb24a80 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-nacos/pom.xml +++ b/polaris-plugins/polaris-plugins-connector/connector-nacos/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-connector com.tencent.polaris @@ -33,11 +33,5 @@ httpclient ${httpclient.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/pom.xml b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/pom.xml index 7961f4de9..102e69d02 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/pom.xml +++ b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-connector com.tencent.polaris @@ -37,12 +37,6 @@ commons-codec ${commons.codec.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - io.grpc grpc-all diff --git a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/pom.xml b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/pom.xml index 1f2fab764..fdbb61dc9 100644 --- a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/pom.xml +++ b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-healthchecker com.tencent.polaris @@ -20,11 +20,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-tcp/pom.xml b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-tcp/pom.xml index e9c8a02f3..0f2df4240 100644 --- a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-tcp/pom.xml +++ b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-tcp/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-healthchecker com.tencent.polaris @@ -27,11 +27,5 @@ ${project.version} test - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-udp/pom.xml b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-udp/pom.xml index 173a33850..5dc41cdee 100644 --- a/polaris-plugins/polaris-plugins-healthchecker/healthchecker-udp/pom.xml +++ b/polaris-plugins/polaris-plugins-healthchecker/healthchecker-udp/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-healthchecker com.tencent.polaris @@ -21,11 +21,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-location/pom.xml b/polaris-plugins/polaris-plugins-location/pom.xml index bcfadddff..302d9d6fa 100644 --- a/polaris-plugins/polaris-plugins-location/pom.xml +++ b/polaris-plugins/polaris-plugins-location/pom.xml @@ -1,55 +1,49 @@ - - polaris-plugins - com.tencent.polaris - ${revision} - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + polaris-plugins + com.tencent.polaris + ${revision} + ../pom.xml + + 4.0.0 - polaris-plugins-location - pom + polaris-plugins-location + pom - Polaris Plugins Location Provider - Polaris Plugins Location Provider POM + Polaris Plugins Location Provider + Polaris Plugins Location Provider POM - - location-provider-base - location-provider-local - location-provider-remotehttp - location-provider-remoteservice - + + location-provider-base + location-provider-local + location-provider-remotehttp + location-provider-remoteservice + - - - com.tencent.polaris - polaris-model - ${project.version} - - - com.tencent.polaris - polaris-plugin-api - ${project.version} - - - com.tencent.polaris - polaris-config - ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - com.google.code.gson - gson - 2.9.0 - - + + + com.tencent.polaris + polaris-model + ${project.version} + + + com.tencent.polaris + polaris-plugin-api + ${project.version} + + + com.tencent.polaris + polaris-config + ${project.version} + + + com.google.code.gson + gson + 2.9.0 + + \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-lossless/lossless-common/pom.xml b/polaris-plugins/polaris-plugins-lossless/lossless-common/pom.xml index 2d73d3d42..4cb017de9 100644 --- a/polaris-plugins/polaris-plugins-lossless/lossless-common/pom.xml +++ b/polaris-plugins/polaris-plugins-lossless/lossless-common/pom.xml @@ -17,12 +17,6 @@ polaris-plugin-api ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-client diff --git a/polaris-plugins/polaris-plugins-lossless/lossless-deregister/pom.xml b/polaris-plugins/polaris-plugins-lossless/lossless-deregister/pom.xml index 19d706f24..96d4867b6 100644 --- a/polaris-plugins/polaris-plugins-lossless/lossless-deregister/pom.xml +++ b/polaris-plugins/polaris-plugins-lossless/lossless-deregister/pom.xml @@ -17,11 +17,5 @@ lossless-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - diff --git a/polaris-plugins/polaris-plugins-lossless/lossless-register/pom.xml b/polaris-plugins/polaris-plugins-lossless/lossless-register/pom.xml index ebd1c5bf0..753386449 100644 --- a/polaris-plugins/polaris-plugins-lossless/lossless-register/pom.xml +++ b/polaris-plugins/polaris-plugins-lossless/lossless-register/pom.xml @@ -17,11 +17,5 @@ lossless-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - diff --git a/polaris-plugins/polaris-plugins-lossless/lossless-warmup/pom.xml b/polaris-plugins/polaris-plugins-lossless/lossless-warmup/pom.xml index 206d34112..e24807f30 100644 --- a/polaris-plugins/polaris-plugins-lossless/lossless-warmup/pom.xml +++ b/polaris-plugins/polaris-plugins-lossless/lossless-warmup/pom.xml @@ -17,11 +17,5 @@ lossless-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - diff --git a/polaris-plugins/polaris-plugins-observability/event-logger/pom.xml b/polaris-plugins/polaris-plugins-observability/event-logger/pom.xml index c4a5f8b00..0b651d7b0 100644 --- a/polaris-plugins/polaris-plugins-observability/event-logger/pom.xml +++ b/polaris-plugins/polaris-plugins-observability/event-logger/pom.xml @@ -15,12 +15,4 @@ Polaris Plugins Observability Logger Event Reporter Polaris Plugins Observability Logger Event Reporter JAR - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-observability/event-tsf/pom.xml b/polaris-plugins/polaris-plugins-observability/event-tsf/pom.xml index 87f8c616b..65a12d505 100644 --- a/polaris-plugins/polaris-plugins-observability/event-tsf/pom.xml +++ b/polaris-plugins/polaris-plugins-observability/event-tsf/pom.xml @@ -27,12 +27,5 @@ gson ${gson.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-observability/stat-common/pom.xml b/polaris-plugins/polaris-plugins-observability/stat-common/pom.xml index 728082b30..6d3513462 100644 --- a/polaris-plugins/polaris-plugins-observability/stat-common/pom.xml +++ b/polaris-plugins/polaris-plugins-observability/stat-common/pom.xml @@ -21,11 +21,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-observability/stat-prometheus/pom.xml b/polaris-plugins/polaris-plugins-observability/stat-prometheus/pom.xml index 6cd967f80..e6d510783 100644 --- a/polaris-plugins/polaris-plugins-observability/stat-prometheus/pom.xml +++ b/polaris-plugins/polaris-plugins-observability/stat-prometheus/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-observability com.tencent.polaris @@ -24,12 +24,6 @@ stat-common ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - io.prometheus simpleclient_httpserver diff --git a/polaris-plugins/polaris-plugins-observability/trace-otel/pom.xml b/polaris-plugins/polaris-plugins-observability/trace-otel/pom.xml index 454784fcc..4298594aa 100644 --- a/polaris-plugins/polaris-plugins-observability/trace-otel/pom.xml +++ b/polaris-plugins/polaris-plugins-observability/trace-otel/pom.xml @@ -1,40 +1,29 @@ - - polaris-plugins-observability - com.tencent.polaris - ${revision} - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + polaris-plugins-observability + com.tencent.polaris + ${revision} + ../pom.xml + + 4.0.0 - trace-otel - Polaris Plugins Observability Trace OTel - Polaris Plugins Observability Trace OTel JAR + trace-otel + Polaris Plugins Observability Trace OTel + Polaris Plugins Observability Trace OTel JAR - - - polaris-plugin-api - com.tencent.polaris - ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - com.tencent.polaris - polaris-logging - ${project.version} - - - io.opentelemetry - opentelemetry-api - ${otel.version} - - + + + com.tencent.polaris + polaris-logging + ${project.version} + + + io.opentelemetry + opentelemetry-api + ${otel.version} + + \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-common/pom.xml b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-common/pom.xml index 20e49618c..af15cf5da 100644 --- a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-common/pom.xml +++ b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-common/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-ratelimiter com.tencent.polaris @@ -21,11 +21,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject-concurrency/pom.xml b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject-concurrency/pom.xml index 4382d562f..2ace445af 100644 --- a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject-concurrency/pom.xml +++ b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject-concurrency/pom.xml @@ -25,11 +25,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject/pom.xml b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject/pom.xml index d5c141856..e13dace9e 100644 --- a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject/pom.xml +++ b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-reject/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-ratelimiter com.tencent.polaris @@ -26,11 +26,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-tsf/pom.xml b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-tsf/pom.xml index 0b76c66e0..47a25a71f 100644 --- a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-tsf/pom.xml +++ b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-tsf/pom.xml @@ -30,11 +30,5 @@ guava ${guava.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-unirate/pom.xml b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-unirate/pom.xml index a2e7069f0..8a6c0e44a 100644 --- a/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-unirate/pom.xml +++ b/polaris-plugins/polaris-plugins-ratelimiter/ratelimiter-unirate/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-ratelimiter com.tencent.polaris @@ -26,12 +26,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.google.protobuf protobuf-java-util diff --git a/polaris-plugins/polaris-plugins-registry/registry-memory/pom.xml b/polaris-plugins/polaris-plugins-registry/registry-memory/pom.xml index 4d29a4650..eba6a0345 100644 --- a/polaris-plugins/polaris-plugins-registry/registry-memory/pom.xml +++ b/polaris-plugins/polaris-plugins-registry/registry-memory/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-registry com.tencent.polaris @@ -21,12 +21,6 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.google.protobuf protobuf-java-util diff --git a/polaris-plugins/polaris-plugins-router/router-lane/pom.xml b/polaris-plugins/polaris-plugins-router/router-lane/pom.xml index b26a99e51..f6cf36eab 100644 --- a/polaris-plugins/polaris-plugins-router/router-lane/pom.xml +++ b/polaris-plugins/polaris-plugins-router/router-lane/pom.xml @@ -26,12 +26,6 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-router/router-namespace/pom.xml b/polaris-plugins/polaris-plugins-router/router-namespace/pom.xml index b3ee7c65f..ea1adc443 100644 --- a/polaris-plugins/polaris-plugins-router/router-namespace/pom.xml +++ b/polaris-plugins/polaris-plugins-router/router-namespace/pom.xml @@ -31,12 +31,6 @@ polaris-metadata ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-router/router-nearby/pom.xml b/polaris-plugins/polaris-plugins-router/router-nearby/pom.xml index 7645bcafd..40079eb79 100644 --- a/polaris-plugins/polaris-plugins-router/router-nearby/pom.xml +++ b/polaris-plugins/polaris-plugins-router/router-nearby/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-router com.tencent.polaris @@ -26,11 +26,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-plugins/polaris-plugins-router/router-rule/pom.xml b/polaris-plugins/polaris-plugins-router/router-rule/pom.xml index 2283870f6..a4bb6e38e 100644 --- a/polaris-plugins/polaris-plugins-router/router-rule/pom.xml +++ b/polaris-plugins/polaris-plugins-router/router-rule/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-router com.tencent.polaris @@ -26,12 +26,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - io.grpc grpc-all diff --git a/polaris-plugins/polaris-plugins-router/router-set/pom.xml b/polaris-plugins/polaris-plugins-router/router-set/pom.xml index 7c45711f1..659138c25 100644 --- a/polaris-plugins/polaris-plugins-router/router-set/pom.xml +++ b/polaris-plugins/polaris-plugins-router/router-set/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-plugins-router com.tencent.polaris @@ -26,11 +26,5 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-ratelimit/polaris-ratelimit-client/pom.xml b/polaris-ratelimit/polaris-ratelimit-client/pom.xml index 22ae64c1c..d6090400f 100644 --- a/polaris-ratelimit/polaris-ratelimit-client/pom.xml +++ b/polaris-ratelimit/polaris-ratelimit-client/pom.xml @@ -54,12 +54,5 @@ gson ${gson.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-ratelimit/polaris-ratelimit-factory/pom.xml b/polaris-ratelimit/polaris-ratelimit-factory/pom.xml index eaaa113b2..5b9fa327b 100644 --- a/polaris-ratelimit/polaris-ratelimit-factory/pom.xml +++ b/polaris-ratelimit/polaris-ratelimit-factory/pom.xml @@ -14,12 +14,6 @@ Polaris Ratelimit Factory Polaris Ratelimit Factory JAR - - org.slf4j - slf4j-api - ${slf4j.version} - provided - com.tencent.polaris polaris-ratelimit-client diff --git a/polaris-router/polaris-router-client/pom.xml b/polaris-router/polaris-router-client/pom.xml index 2186ee63c..8e349c223 100644 --- a/polaris-router/polaris-router-client/pom.xml +++ b/polaris-router/polaris-router-client/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-router com.tencent.polaris @@ -25,11 +25,5 @@ polaris-client ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - \ No newline at end of file diff --git a/polaris-test/polaris-test-mock-discovery/pom.xml b/polaris-test/polaris-test-mock-discovery/pom.xml index 0185a5b4f..a3b4b19dc 100644 --- a/polaris-test/polaris-test-mock-discovery/pom.xml +++ b/polaris-test/polaris-test-mock-discovery/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> polaris-test com.tencent.polaris @@ -24,12 +24,6 @@ polaris-logging ${project.version} - - org.slf4j - slf4j-api - ${slf4j.version} - provided - io.grpc grpc-all diff --git a/pom.xml b/pom.xml index e5320c38f..06411520a 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.slf4j slf4j-api ${slf4j.version} - test + provided ch.qos.logback @@ -253,17 +253,17 @@ - flatten - process-resources + flatten.clean + clean - flatten + clean - flatten.clean - clean + flatten + process-resources - clean + flatten From c76b80dad864afb2431811432393c5e60d6f618f Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Tue, 18 Feb 2025 11:09:00 +0800 Subject: [PATCH 2/2] feat:support composite connector check event supported. --- .../api/plugin/server/ServerConnector.java | 11 ++ .../connector/common/utils/DiscoverUtils.java | 127 ++++++++++++++++++ .../composite/CompositeConnector.java | 20 +++ .../plugins/connector/grpc/GrpcConnector.java | 20 +-- .../plugins/connector/grpc/GrpcUtil.java | 88 ------------ .../connector/grpc/SpecStreamClient.java | 19 +-- 6 files changed, 167 insertions(+), 118 deletions(-) create mode 100644 polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/utils/DiscoverUtils.java diff --git a/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ServerConnector.java b/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ServerConnector.java index 0d5680b5c..dd95fc766 100644 --- a/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ServerConnector.java +++ b/polaris-plugins/polaris-plugin-api/src/main/java/com/tencent/polaris/api/plugin/server/ServerConnector.java @@ -40,6 +40,17 @@ public interface ServerConnector extends Plugin { */ void registerServiceHandler(ServiceEventHandler handler) throws PolarisException; + /** + * 检查服务事件是否支持 + * + * @param eventType 服务事件类型 + * @return + * @throws PolarisException + */ + default boolean checkEventSupported(ServiceEventKey.EventType eventType) throws PolarisException { + return true; + } + /** * 反注册服务监听器 * diff --git a/polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/utils/DiscoverUtils.java b/polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/utils/DiscoverUtils.java new file mode 100644 index 000000000..dfac89939 --- /dev/null +++ b/polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/utils/DiscoverUtils.java @@ -0,0 +1,127 @@ +/* + * Tencent is pleased to support the open source community by making polaris-java available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * Licensed under the BSD 3-Clause License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/BSD-3-Clause + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ + +package com.tencent.polaris.plugins.connector.common.utils; + +import com.google.protobuf.StringValue; +import com.google.protobuf.UInt32Value; +import com.tencent.polaris.api.pojo.ServiceEventKey; +import com.tencent.polaris.specification.api.v1.service.manage.RequestProto; +import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto; +import com.tencent.polaris.specification.api.v1.service.manage.ServiceProto; + +import static com.tencent.polaris.specification.api.v1.model.CodeProto.Code.ExecuteSuccess; + +/** + * @author Haotian Zhang + */ +public class DiscoverUtils { + + public static ResponseProto.DiscoverResponse buildEmptyResponse(ServiceEventKey serviceEventKey) { + ResponseProto.DiscoverResponse.Builder builder = ResponseProto.DiscoverResponse.newBuilder(); + builder.setService( + ServiceProto.Service.newBuilder().setName(StringValue.newBuilder().setValue(serviceEventKey.getService()).build()) + .setNamespace( + StringValue.newBuilder().setValue(serviceEventKey.getNamespace()).build())); + builder.setCode(UInt32Value.newBuilder().setValue(ExecuteSuccess.getNumber()).build()); + builder.setType(buildDiscoverResponseType(serviceEventKey.getEventType())); + return builder.build(); + } + + public static RequestProto.DiscoverRequest.DiscoverRequestType buildDiscoverRequestType( + ServiceEventKey.EventType type) { + switch (type) { + case INSTANCE: + return RequestProto.DiscoverRequest.DiscoverRequestType.INSTANCE; + case ROUTING: + return RequestProto.DiscoverRequest.DiscoverRequestType.ROUTING; + case RATE_LIMITING: + return RequestProto.DiscoverRequest.DiscoverRequestType.RATE_LIMIT; + case CIRCUIT_BREAKING: + return RequestProto.DiscoverRequest.DiscoverRequestType.CIRCUIT_BREAKER; + case SERVICE: + return RequestProto.DiscoverRequest.DiscoverRequestType.SERVICES; + case FAULT_DETECTING: + return RequestProto.DiscoverRequest.DiscoverRequestType.FAULT_DETECTOR; + case LANE_RULE: + return RequestProto.DiscoverRequest.DiscoverRequestType.LANE; + case NEARBY_ROUTE_RULE: + return RequestProto.DiscoverRequest.DiscoverRequestType.NEARBY_ROUTE_RULE; + case LOSSLESS: + return RequestProto.DiscoverRequest.DiscoverRequestType.LOSSLESS; + case BLOCK_ALLOW_RULE: + return RequestProto.DiscoverRequest.DiscoverRequestType.BLOCK_ALLOW_RULE; + default: + return RequestProto.DiscoverRequest.DiscoverRequestType.UNKNOWN; + } + } + + public static ResponseProto.DiscoverResponse.DiscoverResponseType buildDiscoverResponseType( + ServiceEventKey.EventType type) { + switch (type) { + case INSTANCE: + return ResponseProto.DiscoverResponse.DiscoverResponseType.INSTANCE; + case ROUTING: + return ResponseProto.DiscoverResponse.DiscoverResponseType.ROUTING; + case RATE_LIMITING: + return ResponseProto.DiscoverResponse.DiscoverResponseType.RATE_LIMIT; + case CIRCUIT_BREAKING: + return ResponseProto.DiscoverResponse.DiscoverResponseType.CIRCUIT_BREAKER; + case SERVICE: + return ResponseProto.DiscoverResponse.DiscoverResponseType.SERVICES; + case FAULT_DETECTING: + return ResponseProto.DiscoverResponse.DiscoverResponseType.FAULT_DETECTOR; + case LANE_RULE: + return ResponseProto.DiscoverResponse.DiscoverResponseType.LANE; + case NEARBY_ROUTE_RULE: + return ResponseProto.DiscoverResponse.DiscoverResponseType.NEARBY_ROUTE_RULE; + case LOSSLESS: + return ResponseProto.DiscoverResponse.DiscoverResponseType.LOSSLESS; + case BLOCK_ALLOW_RULE: + return ResponseProto.DiscoverResponse.DiscoverResponseType.BLOCK_ALLOW_RULE; + default: + return ResponseProto.DiscoverResponse.DiscoverResponseType.UNKNOWN; + } + } + + public static ServiceEventKey.EventType buildEventType(ResponseProto.DiscoverResponse.DiscoverResponseType responseType) { + switch (responseType) { + case INSTANCE: + return ServiceEventKey.EventType.INSTANCE; + case ROUTING: + return ServiceEventKey.EventType.ROUTING; + case RATE_LIMIT: + return ServiceEventKey.EventType.RATE_LIMITING; + case CIRCUIT_BREAKER: + return ServiceEventKey.EventType.CIRCUIT_BREAKING; + case SERVICES: + return ServiceEventKey.EventType.SERVICE; + case FAULT_DETECTOR: + return ServiceEventKey.EventType.FAULT_DETECTING; + case LANE: + return ServiceEventKey.EventType.LANE_RULE; + case NEARBY_ROUTE_RULE: + return ServiceEventKey.EventType.NEARBY_ROUTE_RULE; + case LOSSLESS: + return ServiceEventKey.EventType.LOSSLESS; + case BLOCK_ALLOW_RULE: + return ServiceEventKey.EventType.BLOCK_ALLOW_RULE; + default: + return ServiceEventKey.EventType.UNKNOWN; + } + } +} diff --git a/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeConnector.java b/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeConnector.java index 388fc55a9..724b5d49d 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeConnector.java +++ b/polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeConnector.java @@ -36,6 +36,7 @@ import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask; import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant; import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant.Type; +import com.tencent.polaris.plugins.connector.common.utils.DiscoverUtils; import com.tencent.polaris.plugins.connector.composite.zero.TestConnectivityTask; import com.tencent.polaris.plugins.connector.composite.zero.TestConnectivityTaskManager; import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto; @@ -154,10 +155,29 @@ public void postContextInit(Extensions ctx) throws PolarisException { @Override public void registerServiceHandler(ServiceEventHandler handler) throws PolarisException { checkDestroyed(); + ServiceEventKey serviceEventKey = handler.getServiceEventKey(); + if (!checkEventSupported(serviceEventKey.getEventType())) { + LOG.info("[CompositeConnector] not supported event type for {}", serviceEventKey); + handler.getEventHandler() + .onEventUpdate(new ServerEvent(serviceEventKey, DiscoverUtils.buildEmptyResponse(serviceEventKey), null)); + return; + } ServiceUpdateTask serviceUpdateTask = new CompositeServiceUpdateTask(handler, this); submitServiceHandler(serviceUpdateTask, 0); } + @Override + public boolean checkEventSupported(ServiceEventKey.EventType eventType) throws PolarisException { + checkDestroyed(); + boolean supported = true; + for (DestroyableServerConnector sc : serverConnectors) { + if (!sc.checkEventSupported(eventType)) { + supported = false; + } + } + return supported; + } + @Override public void deRegisterServiceHandler(ServiceEventKey eventKey) throws PolarisException { checkDestroyed(); diff --git a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java index ecb8ac764..24c1bf87f 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java +++ b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java @@ -45,6 +45,7 @@ import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask; import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant.Status; import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant.Type; +import com.tencent.polaris.plugins.connector.common.utils.DiscoverUtils; import com.tencent.polaris.plugins.connector.grpc.Connection.ConnID; import com.tencent.polaris.specification.api.v1.model.ModelProto; import com.tencent.polaris.specification.api.v1.service.manage.*; @@ -52,7 +53,6 @@ import com.tencent.polaris.specification.api.v1.service.manage.ClientProto.StatInfo; import com.tencent.polaris.specification.api.v1.service.manage.RequestProto.DiscoverRequest; import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto.DiscoverResponse; -import com.tencent.polaris.specification.api.v1.service.manage.ServiceProto.Service; import io.grpc.stub.StreamObserver; import org.slf4j.Logger; @@ -61,7 +61,6 @@ import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy; import java.util.concurrent.atomic.AtomicReference; -import static com.tencent.polaris.specification.api.v1.model.CodeProto.Code.ExecuteSuccess; import static com.tencent.polaris.specification.api.v1.model.CodeProto.Code.InvalidDiscoverResource; /** @@ -191,25 +190,14 @@ public void registerServiceHandler(ServiceEventHandler handler) { if (!checkEventSupported(serviceEventKey.getEventType())) { LOG.info("[ServerConnector] not supported event type for {}", serviceEventKey); handler.getEventHandler() - .onEventUpdate(new ServerEvent(serviceEventKey, buildEmptyResponse(serviceEventKey), null)); + .onEventUpdate(new ServerEvent(serviceEventKey, DiscoverUtils.buildEmptyResponse(serviceEventKey), null)); return; } ServiceUpdateTask serviceUpdateTask = new GrpcServiceUpdateTask(handler, this); submitServiceHandler(serviceUpdateTask, 0); } - private DiscoverResponse buildEmptyResponse(ServiceEventKey serviceEventKey) { - DiscoverResponse.Builder builder = DiscoverResponse.newBuilder(); - builder.setService( - Service.newBuilder().setName(StringValue.newBuilder().setValue(serviceEventKey.getService()).build()) - .setNamespace( - StringValue.newBuilder().setValue(serviceEventKey.getNamespace()).build())); - builder.setCode(UInt32Value.newBuilder().setValue(ExecuteSuccess.getNumber()).build()); - builder.setType(GrpcUtil.buildDiscoverResponseType(serviceEventKey.getEventType())); - return builder.build(); - } - - private boolean checkEventSupported(EventType eventType) { + public boolean checkEventSupported(EventType eventType) { Boolean aBoolean = supportedResourcesType.get(eventType); if (null != aBoolean) { return aBoolean; @@ -257,7 +245,7 @@ public void onCompleted() { } }); RequestProto.DiscoverRequest.Builder req = RequestProto.DiscoverRequest.newBuilder(); - req.setType(GrpcUtil.buildDiscoverRequestType(eventType)); + req.setType(DiscoverUtils.buildDiscoverRequestType(eventType)); discoverClient.onNext(req.build()); try { countDownLatch.await(); diff --git a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcUtil.java b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcUtil.java index 914a10f0e..af7537413 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcUtil.java +++ b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcUtil.java @@ -20,13 +20,9 @@ import com.tencent.polaris.api.exception.ErrorCode; import com.tencent.polaris.api.exception.PolarisException; import com.tencent.polaris.api.exception.ServerCodes; -import com.tencent.polaris.api.pojo.ServiceEventKey; -import com.tencent.polaris.api.pojo.ServiceEventKey.EventType; import com.tencent.polaris.api.utils.MapUtils; import com.tencent.polaris.api.utils.StringUtils; -import com.tencent.polaris.specification.api.v1.service.manage.RequestProto.DiscoverRequest.DiscoverRequestType; import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto; -import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto.DiscoverResponse.DiscoverResponseType; import io.grpc.Metadata; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -234,88 +230,4 @@ public static void checkGrpcException(Throwable t) throws PolarisException { throw new PolarisException(ErrorCode.SERVER_ERROR, grpcEx.getMessage()); } } - - public static DiscoverRequestType buildDiscoverRequestType( - ServiceEventKey.EventType type) { - switch (type) { - case INSTANCE: - return DiscoverRequestType.INSTANCE; - case ROUTING: - return DiscoverRequestType.ROUTING; - case RATE_LIMITING: - return DiscoverRequestType.RATE_LIMIT; - case CIRCUIT_BREAKING: - return DiscoverRequestType.CIRCUIT_BREAKER; - case SERVICE: - return DiscoverRequestType.SERVICES; - case FAULT_DETECTING: - return DiscoverRequestType.FAULT_DETECTOR; - case LANE_RULE: - return DiscoverRequestType.LANE; - case NEARBY_ROUTE_RULE: - return DiscoverRequestType.NEARBY_ROUTE_RULE; - case LOSSLESS: - return DiscoverRequestType.LOSSLESS; - case BLOCK_ALLOW_RULE: - return DiscoverRequestType.BLOCK_ALLOW_RULE; - default: - return DiscoverRequestType.UNKNOWN; - } - } - - public static DiscoverResponseType buildDiscoverResponseType( - ServiceEventKey.EventType type) { - switch (type) { - case INSTANCE: - return DiscoverResponseType.INSTANCE; - case ROUTING: - return DiscoverResponseType.ROUTING; - case RATE_LIMITING: - return DiscoverResponseType.RATE_LIMIT; - case CIRCUIT_BREAKING: - return DiscoverResponseType.CIRCUIT_BREAKER; - case SERVICE: - return DiscoverResponseType.SERVICES; - case FAULT_DETECTING: - return DiscoverResponseType.FAULT_DETECTOR; - case LANE_RULE: - return DiscoverResponseType.LANE; - case NEARBY_ROUTE_RULE: - return DiscoverResponseType.NEARBY_ROUTE_RULE; - case LOSSLESS: - return DiscoverResponseType.LOSSLESS; - case BLOCK_ALLOW_RULE: - return DiscoverResponseType.BLOCK_ALLOW_RULE; - default: - return DiscoverResponseType.UNKNOWN; - } - } - - public static EventType buildEventType(DiscoverResponseType responseType) { - switch (responseType) { - case INSTANCE: - return EventType.INSTANCE; - case ROUTING: - return EventType.ROUTING; - case RATE_LIMIT: - return EventType.RATE_LIMITING; - case CIRCUIT_BREAKER: - return EventType.CIRCUIT_BREAKING; - case SERVICES: - return EventType.SERVICE; - case FAULT_DETECTOR: - return EventType.FAULT_DETECTING; - case LANE: - return EventType.LANE_RULE; - case NEARBY_ROUTE_RULE: - return EventType.NEARBY_ROUTE_RULE; - case LOSSLESS: - return EventType.LOSSLESS; - case BLOCK_ALLOW_RULE: - return EventType.BLOCK_ALLOW_RULE; - default: - return EventType.UNKNOWN; - } - } - } diff --git a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/SpecStreamClient.java b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/SpecStreamClient.java index 8a9da8644..b5b59b084 100644 --- a/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/SpecStreamClient.java +++ b/polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/SpecStreamClient.java @@ -35,6 +35,7 @@ import com.tencent.polaris.logging.LoggerFactory; import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask; import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant.Type; +import com.tencent.polaris.plugins.connector.common.utils.DiscoverUtils; import com.tencent.polaris.specification.api.v1.service.manage.PolarisGRPCGrpc; import com.tencent.polaris.specification.api.v1.service.manage.RequestProto; import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto; @@ -42,22 +43,12 @@ import io.grpc.stub.StreamObserver; import org.slf4j.Logger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; +import java.util.*; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.BiConsumer; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -197,7 +188,7 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) { StringValue.newBuilder().setValue(serviceUpdateTask.getEventHandler().getRevision()).build()); RequestProto.DiscoverRequest.Builder req = RequestProto.DiscoverRequest.newBuilder(); - req.setType(GrpcUtil.buildDiscoverRequestType(serviceEventKey.getEventType())); // switch + req.setType(DiscoverUtils.buildDiscoverRequestType(serviceEventKey.getEventType())); // switch req.setService(builder); if (serviceUpdateTask.getTaskType() == Type.FIRST) { LOG.info("[ServerConnector]send request(id={}) to {} for service {}", reqId, connection.getConnID(), @@ -221,7 +212,7 @@ private ValidResult validMessage(ResponseProto.DiscoverResponse response) { errorCode = ServerCodes.convertServerErrorToRpcError(response.getCode().getValue()); } ServiceProto.Service service = response.getService(); - EventType eventType = GrpcUtil.buildEventType(response.getType()); + EventType eventType = DiscoverUtils.buildEventType(response.getType()); if (!eventType.equals(EventType.SERVICE) && (StringUtils.isEmpty(service.getNamespace().getValue()) || StringUtils.isEmpty(service.getName().getValue()))) { return new ValidResult(null, ErrorCode.INVALID_SERVER_RESPONSE, @@ -309,7 +300,7 @@ public void onNext(ResponseProto.DiscoverResponse response) { } ServiceProto.Service service = response.getService(); ServiceKey serviceKey = new ServiceKey(service.getNamespace().getValue(), service.getName().getValue()); - EventType eventType = GrpcUtil.buildEventType(response.getType()); + EventType eventType = DiscoverUtils.buildEventType(response.getType()); ServiceEventKey serviceEventKey = new ServiceEventKey(serviceKey, eventType); ServiceUpdateTask updateTask; synchronized (clientLock) {