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 c92102c5704 Rename PrometheusMetricsCollectorFactory (#23665)
c92102c5704 is described below
commit c92102c570427764987320e3225443a354357d2f
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jan 20 10:03:30 2023 +0800
Rename PrometheusMetricsCollectorFactory (#23665)
* Add test cases of PrometheusMetricsExporter
* Rename PrometheusMetricsCollectorFactory
* Rename AgentLoggerFactory
---
.../advisor/config/AdvisorConfigurationLoader.java | 6 +--
.../executor/type/ConstructorAdviceExecutor.java | 6 +--
.../type/InstanceMethodAdviceExecutor.java | 6 +--
.../executor/type/StaticMethodAdviceExecutor.java | 6 +--
.../agent/core/builder/AgentLoggingListener.java | 6 +--
.../impl/MethodAdvisorBuilderInterceptor.java | 6 +--
...{LoggerFactory.java => AgentLoggerFactory.java} | 21 +++++-----
.../core/plugin/PluginLifecycleServiceManager.java | 6 +--
.../agent/core/plugin/jar/PluginJarLoader.java | 10 ++---
...ry.java => FixtureMetricsCollectorFactory.java} | 2 +-
....metrics.core.collector.MetricsCollectorFactory | 2 +-
...java => PrometheusMetricsCollectorFactory.java} | 22 +++++-----
...java => PrometheusMetricsCounterCollector.java} | 6 +--
...r.java => PrometheusMetricsGaugeCollector.java} | 6 +--
...ometheusMetricsGaugeMetricFamilyCollector.java} | 6 +--
...va => PrometheusMetricsHistogramCollector.java} | 6 +--
...java => PrometheusMetricsSummaryCollector.java} | 6 +--
....metrics.core.collector.MetricsCollectorFactory | 2 +-
... => PrometheusMetricsCollectorFactoryTest.java} | 22 +++++-----
... => PrometheusMetricsCounterCollectorTest.java} | 6 +--
...va => PrometheusMetricsGaugeCollectorTest.java} | 6 +--
...heusMetricsGaugeMetricFamilyCollectorTest.java} | 6 +--
...> PrometheusMetricsHistogramCollectorTest.java} | 6 +--
.../type/PrometheusSummaryWrapperTest.java | 4 +-
.../exoprter/PrometheusMetricsExporterTest.java | 47 ++++++++++++++++++++++
25 files changed, 138 insertions(+), 90 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
index 27b54d1b0e3..2a4603a76ee 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/config/AdvisorConfigurationLoader.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.agent.core.advisor.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJar;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJarLoader;
import
org.apache.shardingsphere.agent.core.advisor.config.yaml.loader.YamlAdvisorsConfigurationLoader;
@@ -38,7 +38,7 @@ import java.util.Map;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class AdvisorConfigurationLoader {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PluginJarLoader.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(PluginJarLoader.class);
/**
* Load advisor configurations.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
index 543c4efc56d..9015f4e25ac 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/ConstructorAdviceExecutor.java
@@ -29,8 +29,8 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.util.Collection;
@@ -43,7 +43,7 @@ import java.util.Map.Entry;
@RequiredArgsConstructor
public final class ConstructorAdviceExecutor implements AdviceExecutor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(ConstructorAdviceExecutor.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(ConstructorAdviceExecutor.class);
private final Map<String, Collection<ConstructorAdvice>> advices;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
index 4497e31a96f..4426967f000 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/InstanceMethodAdviceExecutor.java
@@ -31,8 +31,8 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.lang.reflect.Method;
@@ -47,7 +47,7 @@ import java.util.concurrent.Callable;
@RequiredArgsConstructor
public final class InstanceMethodAdviceExecutor implements AdviceExecutor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(InstanceMethodAdviceExecutor.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(InstanceMethodAdviceExecutor.class);
private final Map<String, Collection<InstanceMethodAdvice>> advices;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
index 35f51cff893..53b543abae4 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/executor/type/StaticMethodAdviceExecutor.java
@@ -29,8 +29,8 @@ import net.bytebuddy.implementation.bind.annotation.SuperCall;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice;
import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.lang.reflect.Method;
@@ -45,7 +45,7 @@ import java.util.concurrent.Callable;
@RequiredArgsConstructor
public final class StaticMethodAdviceExecutor implements AdviceExecutor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(StaticMethodAdviceExecutor.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(StaticMethodAdviceExecutor.class);
private final Map<String, Collection<StaticMethodAdvice>> advices;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentLoggingListener.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentLoggingListener.java
index 809d17f0945..634a6430c1b 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentLoggingListener.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/AgentLoggingListener.java
@@ -21,8 +21,8 @@ import net.bytebuddy.agent.builder.AgentBuilder.Listener;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.utility.JavaModule;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
/**
* Agent logging listener.
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
@SuppressWarnings("NullableProblems")
public final class AgentLoggingListener implements Listener {
- private static final Logger LOGGER =
LoggerFactory.getLogger(AgentLoggingListener.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(AgentLoggingListener.class);
@Override
public void onDiscovery(final String typeName, final ClassLoader
classLoader, final JavaModule module, final boolean loaded) {
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
index a6c9e4de7f7..d7d78f8e0f0 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/builder/interceptor/impl/MethodAdvisorBuilderInterceptor.java
@@ -22,8 +22,8 @@ import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType.Builder;
import
org.apache.shardingsphere.agent.core.builder.interceptor.AgentBuilderInterceptor;
import org.apache.shardingsphere.agent.core.classloader.ClassLoaderContext;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import
org.apache.shardingsphere.agent.core.advisor.config.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutor;
import
org.apache.shardingsphere.agent.core.advisor.executor.AdviceExecutorFactory;
@@ -35,7 +35,7 @@ import java.util.Optional;
*/
public final class MethodAdvisorBuilderInterceptor implements
AgentBuilderInterceptor {
- private static final Logger LOGGER =
LoggerFactory.getLogger(MethodAdvisorBuilderInterceptor.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(MethodAdvisorBuilderInterceptor.class);
private final TypeDescription typePointcut;
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/AgentLoggerFactory.java
similarity index 88%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/AgentLoggerFactory.java
index eab485002e9..bd089937bea 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/LoggerFactory.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/log/AgentLoggerFactory.java
@@ -41,7 +41,7 @@ import java.util.jar.JarFile;
/**
* Agent logger factory.
*/
-public final class LoggerFactory {
+public final class AgentLoggerFactory {
private static AgentClassLoader classLoader;
@@ -58,12 +58,17 @@ public final class LoggerFactory {
return new Logger(method.invoke(null, clazz));
}
- @SneakyThrows({URISyntaxException.class, IOException.class})
private static AgentClassLoader getClassLoader() {
if (null != classLoader) {
return classLoader;
}
- CodeSource codeSource =
LoggerFactory.class.getProtectionDomain().getCodeSource();
+ classLoader = getLoggerClassLoader();
+ return classLoader;
+ }
+
+ @SneakyThrows({URISyntaxException.class, IOException.class})
+ private static AgentClassLoader getLoggerClassLoader() {
+ CodeSource codeSource =
AgentLoggerFactory.class.getProtectionDomain().getCodeSource();
File agentFle = new File(codeSource.getLocation().toURI());
if (agentFle.isFile() && agentFle.getName().endsWith(".jar")) {
Collection<File> jarFiles = new LinkedList<>(getJarFiles(new
File(String.join(File.separator, AgentPath.getRootPath().getPath(), "lib"))));
@@ -72,11 +77,9 @@ public final class LoggerFactory {
pluginJars.add(new PluginJar(new JarFile(each, true), each));
}
File resourcePath = new File(String.join(File.separator,
AgentPath.getRootPath().getPath(), "conf"));
- classLoader = new
AgentClassLoader(LoggerFactory.class.getClassLoader().getParent(), pluginJars,
Collections.singleton(resourcePath));
- } else {
- classLoader = new
AgentClassLoader(LoggerFactory.class.getClassLoader(), Collections.emptyList());
+ return new
AgentClassLoader(AgentLoggerFactory.class.getClassLoader().getParent(),
pluginJars, Collections.singleton(resourcePath));
}
- return classLoader;
+ return new AgentClassLoader(AgentLoggerFactory.class.getClassLoader(),
Collections.emptyList());
}
@SneakyThrows(IOException.class)
@@ -162,14 +165,14 @@ public final class LoggerFactory {
@SneakyThrows(ReflectiveOperationException.class)
private void invokeMethod(final String methodName, final String msg) {
- Class<?> actualLogger =
LoggerFactory.getClassLoader().loadClass("org.slf4j.Logger");
+ Class<?> actualLogger =
AgentLoggerFactory.getClassLoader().loadClass("org.slf4j.Logger");
Method method = actualLogger.getMethod(methodName, String.class);
method.invoke(logger, msg);
}
@SneakyThrows(ReflectiveOperationException.class)
private void invokeMethod(final String methodName, final String msg,
final Object... arguments) {
- Class<?> actualLogger =
LoggerFactory.getClassLoader().loadClass("org.slf4j.Logger");
+ Class<?> actualLogger =
AgentLoggerFactory.getClassLoader().loadClass("org.slf4j.Logger");
Method method = actualLogger.getMethod(methodName, String.class,
Object[].class);
method.invoke(logger, msg, arguments);
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
index f22e92d7eaa..0692fe12f3d 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.agent.core.plugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.api.PluginConfiguration;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.jar.PluginJar;
import org.apache.shardingsphere.agent.core.spi.AgentServiceLoader;
import org.apache.shardingsphere.agent.spi.PluginLifecycleService;
@@ -40,7 +40,7 @@ public final class PluginLifecycleServiceManager {
private static final AtomicBoolean STARTED_FLAG = new AtomicBoolean(false);
- private static final Logger LOGGER =
LoggerFactory.getLogger(PluginLifecycleServiceManager.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(PluginLifecycleServiceManager.class);
/**
* Initialize all plugins.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoader.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoader.java
index 9b66c08cfba..9444ad64d02 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoader.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoader.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.agent.core.plugin.jar;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory;
-import org.apache.shardingsphere.agent.core.log.LoggerFactory.Logger;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory;
+import org.apache.shardingsphere.agent.core.log.AgentLoggerFactory.Logger;
import java.io.File;
import java.io.IOException;
@@ -32,7 +32,6 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Collection;
import java.util.LinkedList;
-import java.util.List;
import java.util.jar.JarFile;
/**
@@ -41,7 +40,7 @@ import java.util.jar.JarFile;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class PluginJarLoader {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PluginJarLoader.class);
+ private static final Logger LOGGER =
AgentLoggerFactory.getLogger(PluginJarLoader.class);
/**
* Load plugin jars.
@@ -51,8 +50,7 @@ public final class PluginJarLoader {
* @throws IOException IO exception
*/
public static Collection<PluginJar> load(final File agentRootPath) throws
IOException {
- List<File> jarFiles = new LinkedList<>();
- jarFiles.addAll(getJarFiles(new File(String.join(File.separator,
agentRootPath.getPath(), "plugins"))));
+ Collection<File> jarFiles = getJarFiles(new
File(String.join(File.separator, agentRootPath.getPath(), "plugins")));
Collection<PluginJar> result = new LinkedList<>();
for (File each : jarFiles) {
result.add(new PluginJar(new JarFile(each, true), each));
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureCollectorFactory.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureMetricsCollectorFactory.java
similarity index 94%
rename from
agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureCollectorFactory.java
rename to
agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureMetricsCollectorFactory.java
index fa8d7a1ed76..1db42c3787b 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureCollectorFactory.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/collector/FixtureMetricsCollectorFactory.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsColl
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
-public final class FixtureCollectorFactory implements MetricsCollectorFactory {
+public final class FixtureMetricsCollectorFactory implements
MetricsCollectorFactory {
@Override
public MetricsCollector create(final MetricConfiguration metricConfig) {
diff --git
a/agent/plugins/metrics/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
b/agent/plugins/metrics/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
index 2fbb22b9d77..a400035e99e 100644
---
a/agent/plugins/metrics/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
+++
b/agent/plugins/metrics/core/src/test/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.FixtureCollectorFactory
+org.apache.shardingsphere.agent.plugin.metrics.core.fixture.collector.FixtureMetricsCollectorFactory
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactory.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactory.java
similarity index 73%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactory.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactory.java
index 08c4b62b3d3..8917bcafc88 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactory.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactory.java
@@ -20,30 +20,30 @@ package
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusCounterCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusGaugeCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusGaugeMetricFamilyCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusHistogramCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusSummaryCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsCounterCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsGaugeCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsGaugeMetricFamilyCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsHistogramCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsSummaryCollector;
/**
* Prometheus metrics collector factory.
*/
-public final class PrometheusCollectorFactory implements
MetricsCollectorFactory {
+public final class PrometheusMetricsCollectorFactory implements
MetricsCollectorFactory {
@Override
public MetricsCollector create(final MetricConfiguration metricConfig) {
switch (metricConfig.getType()) {
case COUNTER:
- return new PrometheusCounterCollector(metricConfig);
+ return new PrometheusMetricsCounterCollector(metricConfig);
case GAUGE:
- return new PrometheusGaugeCollector(metricConfig);
+ return new PrometheusMetricsGaugeCollector(metricConfig);
case HISTOGRAM:
- return new PrometheusHistogramCollector(metricConfig);
+ return new PrometheusMetricsHistogramCollector(metricConfig);
case SUMMARY:
- return new PrometheusSummaryCollector(metricConfig);
+ return new PrometheusMetricsSummaryCollector(metricConfig);
case GAUGE_METRIC_FAMILY:
- return new PrometheusGaugeMetricFamilyCollector(metricConfig);
+ return new
PrometheusMetricsGaugeMetricFamilyCollector(metricConfig);
default:
throw new UnsupportedOperationException(String.format("Can not
support type `%s`.", metricConfig.getType()));
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollector.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollector.java
similarity index 87%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollector.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollector.java
index d94e335846b..201cf825112 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollector.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollector.java
@@ -22,13 +22,13 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfigur
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.CounterMetricsCollector;
/**
- * Prometheus counter collector.
+ * Prometheus metrics counter collector.
*/
-public final class PrometheusCounterCollector implements
CounterMetricsCollector {
+public final class PrometheusMetricsCounterCollector implements
CounterMetricsCollector {
private final Counter counter;
- public PrometheusCounterCollector(final MetricConfiguration config) {
+ public PrometheusMetricsCounterCollector(final MetricConfiguration config)
{
counter =
Counter.build().name(config.getId()).help(config.getHelp()).labelNames(config.getLabels().toArray(new
String[0])).register();
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollector.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollector.java
similarity index 89%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollector.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollector.java
index 2ccf7690658..0af84ba9d67 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollector.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollector.java
@@ -22,13 +22,13 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfigur
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.GaugeMetricsCollector;
/**
- * Prometheus gauge collector.
+ * Prometheus metrics gauge collector.
*/
-public final class PrometheusGaugeCollector implements GaugeMetricsCollector {
+public final class PrometheusMetricsGaugeCollector implements
GaugeMetricsCollector {
private final Gauge gauge;
- public PrometheusGaugeCollector(final MetricConfiguration config) {
+ public PrometheusMetricsGaugeCollector(final MetricConfiguration config) {
gauge =
Gauge.build().name(config.getId()).help(config.getHelp()).labelNames(config.getLabels().toArray(new
String[0])).register();
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollector.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollector.java
similarity index 86%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollector.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollector.java
index 6f0de294673..f0ad25cc1a9 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollector.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollector.java
@@ -24,13 +24,13 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfigur
import java.util.List;
/**
- * Prometheus gauge metric family collector.
+ * Prometheus metrics gauge metric family collector.
*/
-public final class PrometheusGaugeMetricFamilyCollector implements
GaugeMetricFamilyMetricsCollector {
+public final class PrometheusMetricsGaugeMetricFamilyCollector implements
GaugeMetricFamilyMetricsCollector {
private final GaugeMetricFamily gaugeMetricFamily;
- public PrometheusGaugeMetricFamilyCollector(final MetricConfiguration
config) {
+ public PrometheusMetricsGaugeMetricFamilyCollector(final
MetricConfiguration config) {
gaugeMetricFamily = new GaugeMetricFamily(config.getId(),
config.getHelp(), config.getLabels());
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollector.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollector.java
similarity index 92%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollector.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollector.java
index ab76607b4a2..8e78b828a50 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollector.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollector.java
@@ -25,13 +25,13 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.Histog
import java.util.Map;
/**
- * Prometheus histogram collector.
+ * Prometheus metrics histogram collector.
*/
-public final class PrometheusHistogramCollector implements
HistogramMetricsCollector {
+public final class PrometheusMetricsHistogramCollector implements
HistogramMetricsCollector {
private final Histogram histogram;
- public PrometheusHistogramCollector(final MetricConfiguration config) {
+ public PrometheusMetricsHistogramCollector(final MetricConfiguration
config) {
Builder builder =
Histogram.build().name(config.getId()).help(config.getHelp()).labelNames(config.getLabels().toArray(new
String[0]));
appendProperties(builder, config.getProps());
histogram = builder.register();
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryCollector.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsSummaryCollector.java
similarity index 86%
rename from
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryCollector.java
rename to
agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsSummaryCollector.java
index 3ae1b0bed26..8de6f578b61 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryCollector.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsSummaryCollector.java
@@ -22,13 +22,13 @@ import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfigur
import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.SummaryMetricsCollector;
/**
- * Prometheus summary collector.
+ * Prometheus metrics summary collector.
*/
-public final class PrometheusSummaryCollector implements
SummaryMetricsCollector {
+public final class PrometheusMetricsSummaryCollector implements
SummaryMetricsCollector {
private final Summary summary;
- public PrometheusSummaryCollector(final MetricConfiguration config) {
+ public PrometheusMetricsSummaryCollector(final MetricConfiguration config)
{
summary =
Summary.build().name(config.getId()).help(config.getHelp()).labelNames(config.getLabels().toArray(new
String[0])).register();
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
index 1898764beb8..bad3f15f09d 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
+++
b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.plugin.metrics.core.collector.MetricsCollectorFactory
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.PrometheusCollectorFactory
+org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.PrometheusMetricsCollectorFactory
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactoryTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactoryTest.java
similarity index 73%
rename from
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactoryTest.java
rename to
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactoryTest.java
index e5d1ce86be3..87b3e622d8e 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusCollectorFactoryTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/PrometheusMetricsCollectorFactoryTest.java
@@ -19,11 +19,11 @@ package
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricCollectorType;
import
org.apache.shardingsphere.agent.plugin.metrics.core.config.MetricConfiguration;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusCounterCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusGaugeCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusGaugeMetricFamilyCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusHistogramCollector;
-import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusSummaryCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsCounterCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsGaugeCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsGaugeMetricFamilyCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsHistogramCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.type.PrometheusMetricsSummaryCollector;
import org.junit.Test;
import java.util.Collections;
@@ -31,35 +31,35 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class PrometheusCollectorFactoryTest {
+public final class PrometheusMetricsCollectorFactoryTest {
@Test
public void assertCreateCounterCollector() {
MetricConfiguration config = new MetricConfiguration("test_counter",
MetricCollectorType.COUNTER, null, Collections.emptyList(),
Collections.emptyMap());
- assertThat(new PrometheusCollectorFactory().create(config),
instanceOf(PrometheusCounterCollector.class));
+ assertThat(new PrometheusMetricsCollectorFactory().create(config),
instanceOf(PrometheusMetricsCounterCollector.class));
}
@Test
public void assertCreateGaugeCollector() {
MetricConfiguration config = new MetricConfiguration("test_gauge",
MetricCollectorType.GAUGE, null, Collections.emptyList(),
Collections.emptyMap());
- assertThat(new PrometheusCollectorFactory().create(config),
instanceOf(PrometheusGaugeCollector.class));
+ assertThat(new PrometheusMetricsCollectorFactory().create(config),
instanceOf(PrometheusMetricsGaugeCollector.class));
}
@Test
public void assertCreateHistogramCollector() {
MetricConfiguration config = new MetricConfiguration("test_histogram",
MetricCollectorType.HISTOGRAM, null, Collections.emptyList(),
Collections.emptyMap());
- assertThat(new PrometheusCollectorFactory().create(config),
instanceOf(PrometheusHistogramCollector.class));
+ assertThat(new PrometheusMetricsCollectorFactory().create(config),
instanceOf(PrometheusMetricsHistogramCollector.class));
}
@Test
public void assertCreateSummaryCollector() {
MetricConfiguration config = new MetricConfiguration("test_summary",
MetricCollectorType.SUMMARY, null, Collections.emptyList(),
Collections.emptyMap());
- assertThat(new PrometheusCollectorFactory().create(config),
instanceOf(PrometheusSummaryCollector.class));
+ assertThat(new PrometheusMetricsCollectorFactory().create(config),
instanceOf(PrometheusMetricsSummaryCollector.class));
}
@Test
public void assertCreateGaugeMetricFamilyCollector() {
MetricConfiguration config = new MetricConfiguration("test_summary",
MetricCollectorType.GAUGE_METRIC_FAMILY, null, Collections.emptyList(),
Collections.emptyMap());
- assertThat(new PrometheusCollectorFactory().create(config),
instanceOf(PrometheusGaugeMetricFamilyCollector.class));
+ assertThat(new PrometheusMetricsCollectorFactory().create(config),
instanceOf(PrometheusMetricsGaugeMetricFamilyCollector.class));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollectorTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollectorTest.java
similarity index 85%
rename from
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollectorTest.java
rename to
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollectorTest.java
index 8aaf356b2a8..c6866aee5f3 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusCounterCollectorTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsCounterCollectorTest.java
@@ -28,14 +28,14 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class PrometheusCounterCollectorTest {
+public final class PrometheusMetricsCounterCollectorTest {
@Test
public void assertCreate() throws ReflectiveOperationException {
- PrometheusCounterCollector collector = new
PrometheusCounterCollector(new MetricConfiguration("foo_counter",
+ PrometheusMetricsCounterCollector collector = new
PrometheusMetricsCounterCollector(new MetricConfiguration("foo_counter",
MetricCollectorType.COUNTER, "foo_help",
Collections.emptyList(), Collections.emptyMap()));
collector.inc();
- Counter counter = (Counter)
Plugins.getMemberAccessor().get(PrometheusCounterCollector.class.getDeclaredField("counter"),
collector);
+ Counter counter = (Counter)
Plugins.getMemberAccessor().get(PrometheusMetricsCounterCollector.class.getDeclaredField("counter"),
collector);
assertThat(counter.get(), is(1d));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollectorTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollectorTest.java
similarity index 86%
rename from
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollectorTest.java
rename to
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollectorTest.java
index 387006a17c7..f95aa4e2942 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeCollectorTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeCollectorTest.java
@@ -28,14 +28,14 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class PrometheusGaugeCollectorTest {
+public final class PrometheusMetricsGaugeCollectorTest {
@Test
public void assertCreate() throws ReflectiveOperationException {
- PrometheusGaugeCollector collector = new PrometheusGaugeCollector(new
MetricConfiguration("foo_gauge",
+ PrometheusMetricsGaugeCollector collector = new
PrometheusMetricsGaugeCollector(new MetricConfiguration("foo_gauge",
MetricCollectorType.GAUGE, "foo_help",
Collections.emptyList(), Collections.emptyMap()));
collector.inc();
- Gauge gauge = (Gauge)
Plugins.getMemberAccessor().get(PrometheusGaugeCollector.class.getDeclaredField("gauge"),
collector);
+ Gauge gauge = (Gauge)
Plugins.getMemberAccessor().get(PrometheusMetricsGaugeCollector.class.getDeclaredField("gauge"),
collector);
assertThat(gauge.get(), is(1d));
collector.dec();
assertThat(gauge.get(), is(0d));
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollectorTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollectorTest.java
similarity index 79%
rename from
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollectorTest.java
rename to
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollectorTest.java
index e36e67874e7..e3c36d2bfc4 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusGaugeMetricFamilyCollectorTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsGaugeMetricFamilyCollectorTest.java
@@ -28,13 +28,13 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class PrometheusGaugeMetricFamilyCollectorTest {
+public final class PrometheusMetricsGaugeMetricFamilyCollectorTest {
@Test
public void assertCreate() throws ReflectiveOperationException {
- PrometheusGaugeMetricFamilyCollector collector = new
PrometheusGaugeMetricFamilyCollector(new
MetricConfiguration("foo_gauge_metric_family",
+ PrometheusMetricsGaugeMetricFamilyCollector collector = new
PrometheusMetricsGaugeMetricFamilyCollector(new
MetricConfiguration("foo_gauge_metric_family",
MetricCollectorType.GAUGE_METRIC_FAMILY, "foo_help",
Collections.emptyList(), Collections.emptyMap()));
collector.addMetric(Collections.emptyList(), 1d);
-
assertThat(Plugins.getMemberAccessor().get(PrometheusGaugeMetricFamilyCollector.class.getDeclaredField("gaugeMetricFamily"),
collector), instanceOf(GaugeMetricFamily.class));
+
assertThat(Plugins.getMemberAccessor().get(PrometheusMetricsGaugeMetricFamilyCollector.class.getDeclaredField("gaugeMetricFamily"),
collector), instanceOf(GaugeMetricFamily.class));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollectorTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollectorTest.java
similarity index 85%
rename from
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollectorTest.java
rename to
agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollectorTest.java
index 39210bc987f..cccf89886d0 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusHistogramCollectorTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusMetricsHistogramCollectorTest.java
@@ -28,14 +28,14 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public final class PrometheusHistogramCollectorTest {
+public final class PrometheusMetricsHistogramCollectorTest {
@Test
public void assertCreate() throws ReflectiveOperationException {
- PrometheusHistogramCollector collector = new
PrometheusHistogramCollector(new MetricConfiguration("foo_histogram",
+ PrometheusMetricsHistogramCollector collector = new
PrometheusMetricsHistogramCollector(new MetricConfiguration("foo_histogram",
MetricCollectorType.HISTOGRAM, "foo_help",
Collections.emptyList(), Collections.emptyMap()));
collector.observe(1);
- Histogram histogram = (Histogram)
Plugins.getMemberAccessor().get(PrometheusHistogramCollector.class.getDeclaredField("histogram"),
collector);
+ Histogram histogram = (Histogram)
Plugins.getMemberAccessor().get(PrometheusMetricsHistogramCollector.class.getDeclaredField("histogram"),
collector);
assertThat(histogram.collect().size(), is(1));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryWrapperTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryWrapperTest.java
index 4a46bec487c..593f83820d5 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryWrapperTest.java
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/type/PrometheusSummaryWrapperTest.java
@@ -32,10 +32,10 @@ public final class PrometheusSummaryWrapperTest {
@Test
public void assertCreate() throws ReflectiveOperationException {
- PrometheusSummaryCollector collector = new
PrometheusSummaryCollector(new MetricConfiguration("foo_summary",
+ PrometheusMetricsSummaryCollector collector = new
PrometheusMetricsSummaryCollector(new MetricConfiguration("foo_summary",
MetricCollectorType.SUMMARY, "foo_help",
Collections.emptyList(), Collections.emptyMap()));
collector.observe(1);
- Summary summary = (Summary)
Plugins.getMemberAccessor().get(PrometheusSummaryCollector.class.getDeclaredField("summary"),
collector);
+ Summary summary = (Summary)
Plugins.getMemberAccessor().get(PrometheusMetricsSummaryCollector.class.getDeclaredField("summary"),
collector);
assertThat(summary.collect().size(), is(1));
}
}
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/exoprter/PrometheusMetricsExporterTest.java
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/exoprter/PrometheusMetricsExporterTest.java
new file mode 100644
index 00000000000..c9ac4145bad
--- /dev/null
+++
b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/exoprter/PrometheusMetricsExporterTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.shardingsphere.agent.plugin.metrics.prometheus.exoprter;
+
+import
org.apache.shardingsphere.agent.plugin.metrics.core.collector.type.GaugeMetricFamilyMetricsCollector;
+import
org.apache.shardingsphere.agent.plugin.metrics.core.exporter.MetricsExporter;
+import org.junit.Test;
+
+import java.util.Optional;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public final class PrometheusMetricsExporterTest {
+
+ @Test
+ public void assertCollectWithAbsentMetricsExporter() {
+ MetricsExporter exporter = mock(MetricsExporter.class);
+ when(exporter.export("Prometheus")).thenReturn(Optional.empty());
+ assertTrue(new
PrometheusMetricsExporter(exporter).collect().isEmpty());
+ }
+
+ @Test
+ public void assertCollectWithPresentMetricsExporter() {
+ MetricsExporter exporter = mock(MetricsExporter.class);
+
when(exporter.export("Prometheus")).thenReturn(Optional.of(mock(GaugeMetricFamilyMetricsCollector.class)));
+ assertThat(new PrometheusMetricsExporter(exporter).collect().size(),
is(1));
+ }
+}
