You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/23 10:33:26 UTC
[shardingsphere] branch master updated: Rename AgentReflectionUtil (#23062)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 f1bedeb45cd Rename AgentReflectionUtil (#23062)
f1bedeb45cd is described below
commit f1bedeb45cd9863060ce4f07e2e00c0c0fc73bda
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 23 18:33:18 2022 +0800
Rename AgentReflectionUtil (#23062)
---
.../core/util/{ReflectionUtil.java => AgentReflectionUtil.java} | 4 ++--
.../util/{ReflectionUtilTest.java => AgentReflectionUtilTest.java} | 4 ++--
.../agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java | 4 ++--
.../agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java | 4 ++--
.../agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java | 4 ++--
.../agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java | 4 ++--
.../plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java | 6 +++---
.../tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java | 6 +++---
.../plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java | 4 ++--
.../plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java | 6 +++---
11 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/ReflectionUtil.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtil.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/ReflectionUtil.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtil.java
index cb1a65be627..187e4ab1a73 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/ReflectionUtil.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtil.java
@@ -25,10 +25,10 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
/**
- * Reflection utility.
+ * Agent reflection utility.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ReflectionUtil {
+public final class AgentReflectionUtil {
/**
* Get field value.
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/ReflectionUtilTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtilTest.java
similarity index 88%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/ReflectionUtilTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtilTest.java
index f6b5c2c04a2..6311509f229 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/ReflectionUtilTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/util/AgentReflectionUtilTest.java
@@ -23,11 +23,11 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class ReflectionUtilTest {
+public final class AgentReflectionUtilTest {
@Test
public void assertGetFieldValue() {
ReflectionFixture reflectionFixture = new ReflectionFixture("foo");
- assertThat(ReflectionUtil.getFieldValue(reflectionFixture, "value"), is(reflectionFixture.getValue()));
+ assertThat(AgentReflectionUtil.getFieldValue(reflectionFixture, "value"), is(reflectionFixture.getValue()));
}
}
diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java
index 1f402d8a135..c902f087a24 100644
--- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java
+++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
import io.prometheus.client.Counter;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +32,7 @@ public final class CounterWrapperTest {
CounterWrapper counterWrapper = new CounterWrapper(counter);
counterWrapper.inc();
counterWrapper.inc(1);
- counter = (Counter) ReflectionUtil.getFieldValue(counterWrapper, "counter");
+ counter = (Counter) AgentReflectionUtil.getFieldValue(counterWrapper, "counter");
assertThat(counter.get(), is(2.0));
}
}
diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
index 3583cbc1919..ec260526602 100644
--- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
+++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
import io.prometheus.client.Gauge;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +32,7 @@ public final class GaugeWrapperTest {
GaugeWrapper gaugeWrapper = new GaugeWrapper(gauge);
gaugeWrapper.inc();
gaugeWrapper.inc(1);
- gauge = (Gauge) ReflectionUtil.getFieldValue(gaugeWrapper, "gauge");
+ gauge = (Gauge) AgentReflectionUtil.getFieldValue(gaugeWrapper, "gauge");
assertThat(gauge.get(), is(2.0));
}
}
diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java
index 6e56358a982..eb2d42f07d1 100644
--- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java
+++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
import io.prometheus.client.Histogram;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -31,7 +31,7 @@ public final class HistogramWrapperTest {
Histogram histogram = Histogram.build().name("a").help("help").create();
HistogramWrapper histogramWrapper = new HistogramWrapper(histogram);
histogramWrapper.observe(1);
- histogram = (Histogram) ReflectionUtil.getFieldValue(histogramWrapper, "histogram");
+ histogram = (Histogram) AgentReflectionUtil.getFieldValue(histogramWrapper, "histogram");
assertThat(histogram.collect().size(), is(1));
}
}
diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java
index 65408c97c13..a8cb2b9b6fb 100644
--- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java
+++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
import io.prometheus.client.Summary;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
@@ -30,7 +30,7 @@ public final class SummaryWrapperTest {
public void assertCreate() {
SummaryWrapper summaryWrapper = new SummaryWrapper(Summary.build().name("a").help("help").create());
summaryWrapper.observe(1);
- Summary summary = (Summary) ReflectionUtil.getFieldValue(summaryWrapper, "summary");
+ Summary summary = (Summary) AgentReflectionUtil.getFieldValue(summaryWrapper, "summary");
assertThat(summary.collect().size(), is(1));
}
}
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
index 3377538c1f5..ef592b71654 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
@@ -23,7 +23,7 @@ import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.advice.MethodInvocationResult;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -50,7 +50,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
@Override
public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
ExecutorDataMap.getValue().remove(JaegerConstants.ROOT_SPAN);
- BackendConnection connection = ((ConnectionSession) ReflectionUtil.getFieldValue(target, "connectionSession")).getBackendConnection();
+ BackendConnection connection = ((ConnectionSession) AgentReflectionUtil.getFieldValue(target, "connectionSession")).getBackendConnection();
Scope scope = GlobalTracer.get().scopeManager().active();
scope.span().setTag(JaegerConstants.ShardingSphereTags.CONNECTION_COUNT.getKey(), connection.getConnectionSize());
scope.close();
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
index 38ca7088db4..2263f07dd1b 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import java.lang.reflect.Method;
import java.sql.DatabaseMetaData;
@@ -56,8 +56,8 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
builder = builder.asChildOf(root);
}
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) ReflectionUtil.getFieldValue(target, "storageTypes");
- DataSourceMetaData metaData = (DataSourceMetaData) ReflectionUtil.invokeMethod(
+ Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) AgentReflectionUtil.getFieldValue(target, "storageTypes");
+ DataSourceMetaData metaData = (DataSourceMetaData) AgentReflectionUtil.invokeMethod(
JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class, DatabaseType.class),
target, executionUnit.getStorageResource().getConnection().getMetaData(), storageTypes.get(executionUnit.getExecutionUnit().getDataSourceName()));
builder.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
index c4b3d606820..d1c85302d63 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import java.lang.reflect.Method;
import java.sql.DatabaseMetaData;
@@ -58,8 +58,8 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
spanBuilder.setAttribute(OpenTelemetryConstants.COMPONENT, OpenTelemetryConstants.COMPONENT_NAME);
spanBuilder.setAttribute(OpenTelemetryConstants.DB_TYPE, OpenTelemetryConstants.DB_TYPE_VALUE);
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) ReflectionUtil.getFieldValue(target, "storageTypes");
- DataSourceMetaData metaData = (DataSourceMetaData) ReflectionUtil.invokeMethod(
+ Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) AgentReflectionUtil.getFieldValue(target, "storageTypes");
+ DataSourceMetaData metaData = (DataSourceMetaData) AgentReflectionUtil.invokeMethod(
JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class, DatabaseType.class),
target, executionUnit.getStorageResource().getConnection().getMetaData(), storageTypes.get(executionUnit.getExecutionUnit().getDataSourceName()));
spanBuilder.setAttribute(OpenTelemetryConstants.DB_INSTANCE, executionUnit.getExecutionUnit().getDataSourceName())
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
index 7f5f23b51ab..d60d01fcd63 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
@@ -22,7 +22,7 @@ import brave.Tracing;
import org.apache.shardingsphere.agent.advice.MethodInvocationResult;
import org.apache.shardingsphere.agent.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.advice.type.InstanceMethodAdvice;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.shardingsphere.proxy.backend.communication.BackendConnection;
@@ -46,7 +46,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAdvice {
@Override
public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult invocationResult) {
- BackendConnection connection = ((ConnectionSession) ReflectionUtil.getFieldValue(target, "connectionSession")).getBackendConnection();
+ BackendConnection connection = ((ConnectionSession) AgentReflectionUtil.getFieldValue(target, "connectionSession")).getBackendConnection();
Span span = (Span) ExecutorDataMap.getValue().remove(ZipkinConstants.ROOT_SPAN);
span.tag(ZipkinConstants.Tags.CONNECTION_COUNT, String.valueOf(connection.getConnectionSize()));
span.finish();
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
index e24e9c45783..897f455c8a4 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
-import org.apache.shardingsphere.agent.core.util.ReflectionUtil;
+import org.apache.shardingsphere.agent.core.util.AgentReflectionUtil;
import java.lang.reflect.Method;
import java.sql.DatabaseMetaData;
@@ -51,8 +51,8 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAdvice {
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
span.tag(ZipkinConstants.Tags.DB_TYPE, ZipkinConstants.DB_TYPE_VALUE);
JDBCExecutionUnit executionUnit = (JDBCExecutionUnit) args[0];
- Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) ReflectionUtil.getFieldValue(target, "storageTypes");
- DataSourceMetaData metaData = (DataSourceMetaData) ReflectionUtil.invokeMethod(
+ Map<String, DatabaseType> storageTypes = (Map<String, DatabaseType>) AgentReflectionUtil.getFieldValue(target, "storageTypes");
+ DataSourceMetaData metaData = (DataSourceMetaData) AgentReflectionUtil.invokeMethod(
JDBCExecutorCallback.class.getDeclaredMethod("getDataSourceMetaData", DatabaseMetaData.class, DatabaseType.class),
target, executionUnit.getStorageResource().getConnection().getMetaData(), storageTypes.get(executionUnit.getExecutionUnit().getDataSourceName()));
span.tag(ZipkinConstants.Tags.DB_INSTANCE, executionUnit.getExecutionUnit().getDataSourceName());