You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/12/20 10:35:13 UTC
[shardingsphere] branch master updated: Unify AdvisorDefinitionService's impl (#22994)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8d5aca6bf6a Unify AdvisorDefinitionService's impl (#22994)
8d5aca6bf6a is described below
commit 8d5aca6bf6a055cc643c42785f88439aff6df33a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 20 18:35:05 2022 +0800
Unify AdvisorDefinitionService's impl (#22994)
---
.../logging/base/BaseLoggingAdvisorDefinitionService.java | 4 ++--
.../baselogging/{advisors.yaml => jdbc-advisors.yaml} | 0
.../baselogging/{advisors.yaml => proxy-advisors.yaml} | 0
.../metrics/prometheus/PrometheusAdvisorDefinitionService.java | 6 ++----
.../src/main/resources/prometheus/jdbc-advisors.yaml} | 10 ----------
.../prometheus/{advisors.yaml => proxy-advisors.yaml} | 0
.../plugin/tracing/jaeger/JaegerAdvisorDefinitionService.java | 6 ++----
.../type/jaeger/src/main/resources/jaeger/jdbc-advisors.yaml} | 10 ----------
.../resources/jaeger/{advisors.yaml => proxy-advisors.yaml} | 0
.../OpenTelemetryTracingAdvisorDefinitionService.java | 6 ++----
.../src/main/resources/opentelemetry/jdbc-advisors.yaml} | 10 ----------
.../opentelemetry/{advisors.yaml => proxy-advisors.yaml} | 0
.../opentracing/OpenTracingAdvisorDefinitionService.java | 6 ++----
.../src/main/resources/opentracing/jdbc-advisors.yaml} | 10 ----------
.../opentracing/{advisors.yaml => proxy-advisors.yaml} | 0
.../plugin/tracing/zipkin/ZipkinAdvisorDefinitionService.java | 6 ++----
.../type/zipkin/src/main/resources/zipkin/jdbc-advisors.yaml} | 10 ----------
.../resources/zipkin/{advisors.yaml => proxy-advisors.yaml} | 0
18 files changed, 12 insertions(+), 72 deletions(-)
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingAdvisorDefinitionService.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingAdvisorDefinitionService.java
index 1d789921df3..c56e6c25cf3 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingAdvisorDefinitionService.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingAdvisorDefinitionService.java
@@ -35,12 +35,12 @@ public final class BaseLoggingAdvisorDefinitionService implements AdvisorDefinit
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/baselogging/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/baselogging/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/logging/base/src/main/resources/baselogging/jdbc-advisors.yaml
similarity index 100%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/logging/base/src/main/resources/baselogging/jdbc-advisors.yaml
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/logging/base/src/main/resources/baselogging/proxy-advisors.yaml
similarity index 100%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/logging/base/src/main/resources/baselogging/proxy-advisors.yaml
diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusAdvisorDefinitionService.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusAdvisorDefinitionService.java
index 6b816c0fe06..5cf2617ba30 100644
--- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusAdvisorDefinitionService.java
+++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusAdvisorDefinitionService.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConf
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
-import java.util.Collections;
/**
* Prometheus advisor definition service.
@@ -36,13 +35,12 @@ public final class PrometheusAdvisorDefinitionService implements AdvisorDefiniti
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/prometheus/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- // TODO add JDBC advisor
- return Collections.emptyList();
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml
similarity index 71%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml
index 3fe1b6be3d6..b1312a0905c 100644
--- a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
+++ b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml
@@ -14,13 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-advisors:
- - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory
- advice: org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice
- pointcuts:
- - name: create
- type: method
- params:
- - index: 3
- name: storageNodes
\ No newline at end of file
diff --git a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml
similarity index 100%
rename from agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/advisors.yaml
rename to agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerAdvisorDefinitionService.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerAdvisorDefinitionService.java
index 886408a3895..5f99e43d889 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerAdvisorDefinitionService.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerAdvisorDefinitionService.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConf
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
-import java.util.Collections;
/**
* Jaeger advisor definition service.
@@ -36,13 +35,12 @@ public final class JaegerAdvisorDefinitionService implements AdvisorDefinitionSe
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/jaeger/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- // TODO add JDBC advisor
- return Collections.emptyList();
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/jdbc-advisors.yaml
similarity index 71%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/jdbc-advisors.yaml
index 3fe1b6be3d6..b1312a0905c 100644
--- a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
+++ b/agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/jdbc-advisors.yaml
@@ -14,13 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-advisors:
- - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory
- advice: org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice
- pointcuts:
- - name: create
- type: method
- params:
- - index: 3
- name: storageNodes
\ No newline at end of file
diff --git a/agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/advisors.yaml b/agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/proxy-advisors.yaml
similarity index 100%
rename from agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/advisors.yaml
rename to agent/plugins/tracing/type/jaeger/src/main/resources/jaeger/proxy-advisors.yaml
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingAdvisorDefinitionService.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingAdvisorDefinitionService.java
index bab2e8d75b2..db462c6001e 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingAdvisorDefinitionService.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingAdvisorDefinitionService.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConf
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
-import java.util.Collections;
/**
* OpenTelemetry advisor definition service.
@@ -36,13 +35,12 @@ public final class OpenTelemetryTracingAdvisorDefinitionService implements Advis
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/opentelemetry/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- // TODO add JDBC advisor
- return Collections.emptyList();
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/jdbc-advisors.yaml
similarity index 71%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/jdbc-advisors.yaml
index 3fe1b6be3d6..b1312a0905c 100644
--- a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/jdbc-advisors.yaml
@@ -14,13 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-advisors:
- - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory
- advice: org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice
- pointcuts:
- - name: create
- type: method
- params:
- - index: 3
- name: storageNodes
\ No newline at end of file
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/advisors.yaml b/agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/proxy-advisors.yaml
similarity index 100%
rename from agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/advisors.yaml
rename to agent/plugins/tracing/type/opentelemetry/src/main/resources/opentelemetry/proxy-advisors.yaml
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingAdvisorDefinitionService.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingAdvisorDefinitionService.java
index 1b23e061f1b..72750d74bb1 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingAdvisorDefinitionService.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingAdvisorDefinitionService.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConf
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
-import java.util.Collections;
/**
* OpenTracing advisor definition service.
@@ -36,13 +35,12 @@ public final class OpenTracingAdvisorDefinitionService implements AdvisorDefinit
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/opentracing/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- // TODO add JDBC advisor
- return Collections.emptyList();
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/jdbc-advisors.yaml
similarity index 71%
copy from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
copy to agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/jdbc-advisors.yaml
index 3fe1b6be3d6..b1312a0905c 100644
--- a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
+++ b/agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/jdbc-advisors.yaml
@@ -14,13 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-advisors:
- - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory
- advice: org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice
- pointcuts:
- - name: create
- type: method
- params:
- - index: 3
- name: storageNodes
\ No newline at end of file
diff --git a/agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/advisors.yaml b/agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/proxy-advisors.yaml
similarity index 100%
rename from agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/advisors.yaml
rename to agent/plugins/tracing/type/opentracing/src/main/resources/opentracing/proxy-advisors.yaml
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinAdvisorDefinitionService.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinAdvisorDefinitionService.java
index f88c3b4d18a..6729c4aae4b 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinAdvisorDefinitionService.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinAdvisorDefinitionService.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConf
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
-import java.util.Collections;
/**
* Zipkin advisor definition service.
@@ -36,13 +35,12 @@ public final class ZipkinAdvisorDefinitionService implements AdvisorDefinitionSe
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/zipkin/advisors.yaml")), getType());
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/proxy-advisors.yaml")), getType());
}
@Override
public Collection<AdvisorConfiguration> getJDBCAdvisorConfigurations() {
- // TODO add JDBC advisor
- return Collections.emptyList();
+ return swapper.swapToObject(loader.load(getClass().getResourceAsStream("/" + getType().toLowerCase() + "/jdbc-advisors.yaml")), getType());
}
@Override
diff --git a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml b/agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/jdbc-advisors.yaml
similarity index 71%
rename from agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
rename to agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/jdbc-advisors.yaml
index 3fe1b6be3d6..b1312a0905c 100644
--- a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
+++ b/agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/jdbc-advisors.yaml
@@ -14,13 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-advisors:
- - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory
- advice: org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice
- pointcuts:
- - name: create
- type: method
- params:
- - index: 3
- name: storageNodes
\ No newline at end of file
diff --git a/agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/advisors.yaml b/agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/proxy-advisors.yaml
similarity index 100%
rename from agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/advisors.yaml
rename to agent/plugins/tracing/type/zipkin/src/main/resources/zipkin/proxy-advisors.yaml