From 200d0c144454664c978eca8547d80b4f6c558731 Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Tue, 12 Apr 2022 15:51:44 +0200 Subject: [PATCH] [FLINK-27206][metrics] Remove reflection annotations from reporters --- .../docs/deployment/metric_reporters.md | 6 +- .../docs/deployment/metric_reporters.md | 6 +- .../PrometheusReporterEndToEndITCase.java | 74 ++++--------------- .../metrics/datadog/DatadogHttpReporter.java | 3 - .../datadog/DatadogHttpReporterFactory.java | 3 - .../metrics/graphite/GraphiteReporter.java | 3 - .../graphite/GraphiteReporterFactory.java | 3 - .../metrics/influxdb/InfluxdbReporter.java | 3 - .../influxdb/InfluxdbReporterFactory.java | 3 - .../apache/flink/metrics/jmx/JMXReporter.java | 2 - .../flink/metrics/jmx/JMXReporterFactory.java | 2 - .../PrometheusPushGatewayReporter.java | 4 - .../PrometheusPushGatewayReporterFactory.java | 3 - .../prometheus/PrometheusReporter.java | 3 - .../prometheus/PrometheusReporterFactory.java | 3 - .../flink/metrics/slf4j/Slf4jReporter.java | 2 - .../metrics/slf4j/Slf4jReporterFactory.java | 3 - .../flink/metrics/statsd/StatsDReporter.java | 2 - .../metrics/statsd/StatsDReporterFactory.java | 3 - 19 files changed, 20 insertions(+), 111 deletions(-) diff --git a/docs/content.zh/docs/deployment/metric_reporters.md b/docs/content.zh/docs/deployment/metric_reporters.md index d65970bc13ef0..8fcf2dc9520d0 100644 --- a/docs/content.zh/docs/deployment/metric_reporters.md +++ b/docs/content.zh/docs/deployment/metric_reporters.md @@ -49,7 +49,7 @@ metrics.reporter.my_jmx_reporter.port: 9020-9040 metrics.reporter.my_jmx_reporter.scope.variables.excludes: job_id;task_attempt_num metrics.reporter.my_jmx_reporter.scope.variables.additional: cluster_name:my_test_cluster,tag_name:tag_value -metrics.reporter.my_other_reporter.class: org.apache.flink.metrics.graphite.GraphiteReporter +metrics.reporter.my_other_reporter.factory.class: org.apache.flink.metrics.graphite.GraphiteReporterFactory metrics.reporter.my_other_reporter.host: 192.168.1.1 metrics.reporter.my_other_reporter.port: 10000 ``` @@ -180,7 +180,7 @@ Parameters: Example configuration: ```yaml -metrics.reporter.prom.class: org.apache.flink.metrics.prometheus.PrometheusReporter +metrics.reporter.prom.factory.class: org.apache.flink.metrics.prometheus.PrometheusReporterFactory ``` Flink metric types are mapped to Prometheus metric types as follows: @@ -206,7 +206,7 @@ Parameters: Example configuration: ```yaml -metrics.reporter.promgateway.class: org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporter +metrics.reporter.promgateway.factory.class: org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporterFactory metrics.reporter.promgateway.hostUrl: http://localhost:9091 metrics.reporter.promgateway.jobName: myJob metrics.reporter.promgateway.randomJobNameSuffix: true diff --git a/docs/content/docs/deployment/metric_reporters.md b/docs/content/docs/deployment/metric_reporters.md index 0f2eb25097006..fb7ece29c4b8b 100644 --- a/docs/content/docs/deployment/metric_reporters.md +++ b/docs/content/docs/deployment/metric_reporters.md @@ -49,7 +49,7 @@ metrics.reporter.my_jmx_reporter.port: 9020-9040 metrics.reporter.my_jmx_reporter.scope.variables.excludes: job_id;task_attempt_num metrics.reporter.my_jmx_reporter.scope.variables.additional: cluster_name:my_test_cluster,tag_name:tag_value -metrics.reporter.my_other_reporter.class: org.apache.flink.metrics.graphite.GraphiteReporter +metrics.reporter.my_other_reporter.factory.class: org.apache.flink.metrics.graphite.GraphiteReporterFactory metrics.reporter.my_other_reporter.host: 192.168.1.1 metrics.reporter.my_other_reporter.port: 10000 ``` @@ -180,7 +180,7 @@ Parameters: Example configuration: ```yaml -metrics.reporter.prom.class: org.apache.flink.metrics.prometheus.PrometheusReporter +metrics.reporter.prom.factory.class: org.apache.flink.metrics.prometheus.PrometheusReporterFactory ``` Flink metric types are mapped to Prometheus metric types as follows: @@ -206,7 +206,7 @@ Parameters: Example configuration: ```yaml -metrics.reporter.promgateway.class: org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporter +metrics.reporter.promgateway.factory.class: org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporterFactory metrics.reporter.promgateway.hostUrl: http://localhost:9091 metrics.reporter.promgateway.jobName: myJob metrics.reporter.promgateway.randomJobNameSuffix: true diff --git a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java index 0b08ac9737bce..f3397977ab298 100644 --- a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java +++ b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/src/test/java/org/apache/flink/metrics/prometheus/tests/PrometheusReporterEndToEndITCase.java @@ -21,7 +21,6 @@ import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MetricOptions; -import org.apache.flink.metrics.prometheus.PrometheusReporter; import org.apache.flink.metrics.prometheus.PrometheusReporterFactory; import org.apache.flink.tests.util.AutoClosableProcess; import org.apache.flink.tests.util.CommandLineWrapper; @@ -60,8 +59,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static org.apache.flink.metrics.prometheus.tests.PrometheusReporterEndToEndITCase.TestParams.InstantiationType.FACTORY; -import static org.apache.flink.metrics.prometheus.tests.PrometheusReporterEndToEndITCase.TestParams.InstantiationType.REFLECTION; import static org.apache.flink.tests.util.AutoClosableProcess.runBlocking; import static org.apache.flink.tests.util.AutoClosableProcess.runNonBlocking; @@ -131,32 +128,14 @@ public static Collection testParameters() { builder.moveJar( PROMETHEUS_JAR_PREFIX, JarLocation.PLUGINS, - JarLocation.LIB), - REFLECTION), - TestParams.from( - "Jar in 'lib'", - builder -> - builder.moveJar( - PROMETHEUS_JAR_PREFIX, - JarLocation.PLUGINS, - JarLocation.LIB), - FACTORY), - TestParams.from("Jar in 'plugins'", builder -> {}, REFLECTION), - TestParams.from("Jar in 'plugins'", builder -> {}, FACTORY), + JarLocation.LIB)), + TestParams.from("Jar in 'plugins'", builder -> {}), TestParams.from( "Jar in 'lib' and 'plugins'", builder -> { builder.copyJar( PROMETHEUS_JAR_PREFIX, JarLocation.PLUGINS, JarLocation.LIB); - }, - REFLECTION), - TestParams.from( - "Jar in 'lib' and 'plugins'", - builder -> { - builder.copyJar( - PROMETHEUS_JAR_PREFIX, JarLocation.PLUGINS, JarLocation.LIB); - }, - FACTORY)); + })); } @Rule public final FlinkResource dist; @@ -164,7 +143,7 @@ public static Collection testParameters() { public PrometheusReporterEndToEndITCase(TestParams params) { final FlinkResourceSetup.FlinkResourceSetupBuilder builder = FlinkResourceSetup.builder(); params.getBuilderSetup().accept(builder); - builder.addConfiguration(getFlinkConfig(params.getInstantiationType())); + builder.addConfiguration(getFlinkConfig()); dist = new LocalStandaloneFlinkResourceFactory().create(builder.build()); } @@ -172,24 +151,14 @@ public PrometheusReporterEndToEndITCase(TestParams params) { @Rule public final DownloadCache downloadCache = DownloadCache.get(); - private static Configuration getFlinkConfig(TestParams.InstantiationType instantiationType) { + private static Configuration getFlinkConfig() { final Configuration config = new Configuration(); - switch (instantiationType) { - case FACTORY: - config.setString( - ConfigConstants.METRICS_REPORTER_PREFIX - + "prom." - + MetricOptions.REPORTER_FACTORY_CLASS.key(), - PrometheusReporterFactory.class.getName()); - break; - case REFLECTION: - config.setString( - ConfigConstants.METRICS_REPORTER_PREFIX - + "prom." - + MetricOptions.REPORTER_CLASS.key(), - PrometheusReporter.class.getCanonicalName()); - } + config.setString( + ConfigConstants.METRICS_REPORTER_PREFIX + + "prom." + + MetricOptions.REPORTER_FACTORY_CLASS.key(), + PrometheusReporterFactory.class.getName()); config.setString(ConfigConstants.METRICS_REPORTER_PREFIX + "prom.port", "9000-9100"); return config; @@ -324,42 +293,27 @@ private static void checkMetricAvailability(final OkHttpClient client, final Str static class TestParams { private final String jarLocationDescription; private final Consumer builderSetup; - private final InstantiationType instantiationType; private TestParams( String jarLocationDescription, - Consumer builderSetup, - InstantiationType instantiationType) { + Consumer builderSetup) { this.jarLocationDescription = jarLocationDescription; this.builderSetup = builderSetup; - this.instantiationType = instantiationType; } public static TestParams from( String jarLocationDesription, - Consumer builderSetup, - InstantiationType instantiationType) { - return new TestParams(jarLocationDesription, builderSetup, instantiationType); + Consumer builderSetup) { + return new TestParams(jarLocationDesription, builderSetup); } public Consumer getBuilderSetup() { return builderSetup; } - public InstantiationType getInstantiationType() { - return instantiationType; - } - @Override public String toString() { - return jarLocationDescription - + ", instantiated via " - + instantiationType.name().toLowerCase(); - } - - public enum InstantiationType { - REFLECTION, - FACTORY + return jarLocationDescription; } } } diff --git a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporter.java b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporter.java index c7cab1d2497a0..0b138d85648b0 100644 --- a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporter.java +++ b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporter.java @@ -25,7 +25,6 @@ import org.apache.flink.metrics.Metric; import org.apache.flink.metrics.MetricConfig; import org.apache.flink.metrics.MetricGroup; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.Scheduled; @@ -44,8 +43,6 @@ * *

Variables in metrics scope will be sent to Datadog as tags. */ -@InstantiateViaFactory( - factoryClassName = "org.apache.flink.metrics.datadog.DatadogHttpReporterFactory") public class DatadogHttpReporter implements MetricReporter, Scheduled { private static final Logger LOGGER = LoggerFactory.getLogger(DatadogHttpReporter.class); private static final String HOST_VARIABLE = ""; diff --git a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporterFactory.java b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporterFactory.java index a64d7c45acef3..e291e064f8292 100644 --- a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporterFactory.java +++ b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpReporterFactory.java @@ -18,15 +18,12 @@ package org.apache.flink.metrics.datadog; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.MetricReporterFactory; import java.util.Properties; /** {@link MetricReporterFactory} for {@link DatadogHttpReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.datadog.DatadogHttpReporter") public class DatadogHttpReporterFactory implements MetricReporterFactory { @Override diff --git a/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporter.java b/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporter.java index ebf2b871c2dc4..99a8c30296bff 100644 --- a/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporter.java +++ b/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporter.java @@ -21,7 +21,6 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.dropwizard.ScheduledDropwizardReporter; import org.apache.flink.metrics.MetricConfig; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import com.codahale.metrics.ScheduledReporter; import com.codahale.metrics.graphite.Graphite; @@ -34,8 +33,6 @@ * allows using it as a Flink reporter. */ @PublicEvolving -@InstantiateViaFactory( - factoryClassName = "org.apache.flink.metrics.graphite.GraphiteReporterFactory") public class GraphiteReporter extends ScheduledDropwizardReporter { public static final String ARG_PROTOCOL = "protocol"; diff --git a/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporterFactory.java b/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporterFactory.java index 196a5059b2c1b..b33d500082e24 100644 --- a/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporterFactory.java +++ b/flink-metrics/flink-metrics-graphite/src/main/java/org/apache/flink/metrics/graphite/GraphiteReporterFactory.java @@ -18,15 +18,12 @@ package org.apache.flink.metrics.graphite; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.MetricReporterFactory; import java.util.Properties; /** {@link MetricReporterFactory} for {@link GraphiteReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.graphite.GraphiteReporter") public class GraphiteReporterFactory implements MetricReporterFactory { @Override diff --git a/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporter.java b/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporter.java index e00fb02dd9ab6..d80b3c316ee02 100644 --- a/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporter.java +++ b/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporter.java @@ -24,7 +24,6 @@ import org.apache.flink.metrics.Meter; import org.apache.flink.metrics.Metric; import org.apache.flink.metrics.MetricConfig; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.Scheduled; import org.apache.flink.util.NetUtils; @@ -57,8 +56,6 @@ import static org.apache.flink.metrics.influxdb.InfluxdbReporterOptions.getString; /** {@link MetricReporter} that exports {@link Metric Metrics} via InfluxDB. */ -@InstantiateViaFactory( - factoryClassName = "org.apache.flink.metrics.influxdb.InfluxdbReporterFactory") public class InfluxdbReporter extends AbstractReporter implements Scheduled { private String database; diff --git a/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporterFactory.java b/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporterFactory.java index 2417c6d501f21..f04e20eac6989 100644 --- a/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporterFactory.java +++ b/flink-metrics/flink-metrics-influxdb/src/main/java/org/apache/flink/metrics/influxdb/InfluxdbReporterFactory.java @@ -18,15 +18,12 @@ package org.apache.flink.metrics.influxdb; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.MetricReporterFactory; import java.util.Properties; /** {@link MetricReporterFactory} for {@link InfluxdbReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.influxdb.InfluxdbReporter") public class InfluxdbReporterFactory implements MetricReporterFactory { @Override diff --git a/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporter.java b/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporter.java index 1c311f77edbc4..7ac27130abc72 100644 --- a/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporter.java +++ b/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporter.java @@ -29,7 +29,6 @@ import org.apache.flink.metrics.Metric; import org.apache.flink.metrics.MetricConfig; import org.apache.flink.metrics.MetricGroup; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.slf4j.Logger; @@ -55,7 +54,6 @@ *

Largely based on the JmxReporter class of the dropwizard metrics library * https://github.com/dropwizard/metrics/blob/master/metrics-core/src/main/java/io/dropwizard/metrics/JmxReporter.java */ -@InstantiateViaFactory(factoryClassName = "org.apache.flink.metrics.jmx.JMXReporterFactory") public class JMXReporter implements MetricReporter { static final String JMX_DOMAIN_PREFIX = "org.apache.flink."; diff --git a/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporterFactory.java b/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporterFactory.java index 37fc73cc32eea..9289819540ab6 100644 --- a/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporterFactory.java +++ b/flink-metrics/flink-metrics-jmx/src/main/java/org/apache/flink/metrics/jmx/JMXReporterFactory.java @@ -17,13 +17,11 @@ package org.apache.flink.metrics.jmx; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporterFactory; import java.util.Properties; /** {@link MetricReporterFactory} for {@link JMXReporter}. */ -@InterceptInstantiationViaReflection(reporterClassName = "org.apache.flink.metrics.jmx.JMXReporter") public class JMXReporterFactory implements MetricReporterFactory { static final String ARG_PORT = "port"; diff --git a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporter.java b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporter.java index 51465ffc30072..3a2e6782de6f3 100644 --- a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporter.java +++ b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporter.java @@ -21,7 +21,6 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.metrics.Metric; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.Scheduled; import org.apache.flink.util.Preconditions; @@ -37,9 +36,6 @@ * {@link MetricReporter} that exports {@link Metric Metrics} via Prometheus {@link PushGateway}. */ @PublicEvolving -@InstantiateViaFactory( - factoryClassName = - "org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporterFactory") public class PrometheusPushGatewayReporter extends AbstractPrometheusReporter implements Scheduled { private final PushGateway pushGateway; diff --git a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporterFactory.java b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporterFactory.java index 12a21fee611f5..ab920cee8d221 100644 --- a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporterFactory.java +++ b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusPushGatewayReporterFactory.java @@ -19,7 +19,6 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.metrics.MetricConfig; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporterFactory; import org.apache.flink.util.AbstractID; import org.apache.flink.util.StringUtils; @@ -43,8 +42,6 @@ import static org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporterOptions.RANDOM_JOB_NAME_SUFFIX; /** {@link MetricReporterFactory} for {@link PrometheusPushGatewayReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.prometheus.PrometheusPushGatewayReporter") public class PrometheusPushGatewayReporterFactory implements MetricReporterFactory { private static final Logger LOG = diff --git a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporter.java b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporter.java index 77ca2b87bfec5..2547a3057c8a2 100644 --- a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporter.java +++ b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporter.java @@ -21,7 +21,6 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.metrics.Metric; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.util.Preconditions; @@ -32,8 +31,6 @@ /** {@link MetricReporter} that exports {@link Metric Metrics} via Prometheus. */ @PublicEvolving -@InstantiateViaFactory( - factoryClassName = "org.apache.flink.metrics.prometheus.PrometheusReporterFactory") public class PrometheusReporter extends AbstractPrometheusReporter { private HTTPServer httpServer; diff --git a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporterFactory.java b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporterFactory.java index 56c1dd83208c4..58e03685eb03b 100644 --- a/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporterFactory.java +++ b/flink-metrics/flink-metrics-prometheus/src/main/java/org/apache/flink/metrics/prometheus/PrometheusReporterFactory.java @@ -18,7 +18,6 @@ package org.apache.flink.metrics.prometheus; import org.apache.flink.metrics.MetricConfig; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporterFactory; import org.apache.flink.util.NetUtils; @@ -26,8 +25,6 @@ import java.util.Properties; /** {@link MetricReporterFactory} for {@link PrometheusReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.prometheus.PrometheusReporter") public class PrometheusReporterFactory implements MetricReporterFactory { static final String ARG_PORT = "port"; diff --git a/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporter.java b/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporter.java index e5b6c6fa4f808..0ad8604f0f291 100644 --- a/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporter.java +++ b/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporter.java @@ -27,7 +27,6 @@ import org.apache.flink.metrics.Metric; import org.apache.flink.metrics.MetricConfig; import org.apache.flink.metrics.reporter.AbstractReporter; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.Scheduled; @@ -39,7 +38,6 @@ import java.util.NoSuchElementException; /** {@link MetricReporter} that exports {@link Metric Metrics} via SLF4J {@link Logger}. */ -@InstantiateViaFactory(factoryClassName = "org.apache.flink.metrics.slf4j.Slf4jReporterFactory") public class Slf4jReporter extends AbstractReporter implements Scheduled { private static final Logger LOG = LoggerFactory.getLogger(Slf4jReporter.class); private static final String lineSeparator = System.lineSeparator(); diff --git a/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporterFactory.java b/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporterFactory.java index 2096f0bc473bd..f691ec0461adb 100644 --- a/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporterFactory.java +++ b/flink-metrics/flink-metrics-slf4j/src/main/java/org/apache/flink/metrics/slf4j/Slf4jReporterFactory.java @@ -17,15 +17,12 @@ package org.apache.flink.metrics.slf4j; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.MetricReporterFactory; import java.util.Properties; /** {@link MetricReporterFactory} for {@link Slf4jReporter}. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.slf4j.Slf4jReporter") public class Slf4jReporterFactory implements MetricReporterFactory { @Override diff --git a/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporter.java b/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporter.java index 05195f7a2334d..efcadac05844d 100644 --- a/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporter.java +++ b/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporter.java @@ -26,7 +26,6 @@ import org.apache.flink.metrics.Meter; import org.apache.flink.metrics.MetricConfig; import org.apache.flink.metrics.reporter.AbstractReporter; -import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.Scheduled; import org.slf4j.Logger; @@ -50,7 +49,6 @@ *

Ported since it was not present in maven central. */ @PublicEvolving -@InstantiateViaFactory(factoryClassName = "org.apache.flink.metrics.statsd.StatsDReporterFactory") public class StatsDReporter extends AbstractReporter implements Scheduled { private static final Logger LOG = LoggerFactory.getLogger(StatsDReporter.class); diff --git a/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporterFactory.java b/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporterFactory.java index 47cb120370e73..913a109de9a00 100644 --- a/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporterFactory.java +++ b/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporterFactory.java @@ -18,7 +18,6 @@ package org.apache.flink.metrics.statsd; -import org.apache.flink.metrics.reporter.InterceptInstantiationViaReflection; import org.apache.flink.metrics.reporter.MetricReporter; import org.apache.flink.metrics.reporter.MetricReporterFactory; @@ -27,8 +26,6 @@ /** * A {@link MetricReporterFactory} implementation that creates a {@link StatsDReporter} instance. */ -@InterceptInstantiationViaReflection( - reporterClassName = "org.apache.flink.metrics.statsd.StatsDReporter") public class StatsDReporterFactory implements MetricReporterFactory { @Override