This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new e9eb96f [FLINK-21772][metrics][slf4j] Remove flink-runtime dependency
e9eb96f is described below
commit e9eb96f0115da42d4cead0f660778f57c772f8dc
Author: Chesnay Schepler <[email protected]>
AuthorDate: Sat Mar 13 14:59:28 2021 +0100
[FLINK-21772][metrics][slf4j] Remove flink-runtime dependency
---
flink-metrics/flink-metrics-slf4j/pom.xml | 15 ----
.../flink/metrics/slf4j/Slf4jReporterTest.java | 100 +++++----------------
2 files changed, 24 insertions(+), 91 deletions(-)
diff --git a/flink-metrics/flink-metrics-slf4j/pom.xml
b/flink-metrics/flink-metrics-slf4j/pom.xml
index c8eec33..144822d 100644
--- a/flink-metrics/flink-metrics-slf4j/pom.xml
+++ b/flink-metrics/flink-metrics-slf4j/pom.xml
@@ -66,21 +66,6 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
-
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils-junit</artifactId>
</dependency>
diff --git
a/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
b/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
index 50f378e..136bf02 100644
---
a/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
+++
b/flink-metrics/flink-metrics-slf4j/src/test/java/org/apache/flink/metrics/slf4j/Slf4jReporterTest.java
@@ -18,50 +18,36 @@
package org.apache.flink.metrics.slf4j;
-import org.apache.flink.api.common.JobID;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.MetricOptions;
import org.apache.flink.metrics.Gauge;
import org.apache.flink.metrics.Histogram;
import org.apache.flink.metrics.Meter;
import org.apache.flink.metrics.MeterView;
+import org.apache.flink.metrics.MetricConfig;
+import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.metrics.SimpleCounter;
import org.apache.flink.metrics.util.TestHistogram;
-import org.apache.flink.runtime.executiongraph.ExecutionAttemptID;
-import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.metrics.MetricRegistryImpl;
-import org.apache.flink.runtime.metrics.MetricRegistryTestUtils;
-import org.apache.flink.runtime.metrics.ReporterSetup;
-import org.apache.flink.runtime.metrics.groups.TaskManagerMetricGroup;
-import org.apache.flink.runtime.metrics.groups.TaskMetricGroup;
+import org.apache.flink.metrics.util.TestMetricGroup;
import org.apache.flink.testutils.logging.TestLoggerResource;
import org.apache.flink.util.TestLogger;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.event.Level;
-import java.util.Collections;
-
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
/** Test for {@link Slf4jReporter}. */
public class Slf4jReporterTest extends TestLogger {
- private static final String HOST_NAME = "localhost";
- private static final String TASK_MANAGER_ID = "tm01";
- private static final String JOB_NAME = "jn01";
- private static final String TASK_NAME = "tn01";
- private static MetricRegistryImpl registry;
+ private static final String SCOPE = "scope";
private static char delimiter;
- private static TaskMetricGroup taskMetricGroup;
+
+ private static MetricGroup metricGroup;
private static Slf4jReporter reporter;
@Rule
@@ -70,32 +56,14 @@ public class Slf4jReporterTest extends TestLogger {
@BeforeClass
public static void setUp() {
- Configuration configuration = new Configuration();
- configuration.setString(MetricOptions.SCOPE_NAMING_TASK,
"<host>.<tm_id>.<job_name>");
-
- registry =
- new MetricRegistryImpl(
-
MetricRegistryTestUtils.fromConfiguration(configuration),
- Collections.singletonList(
- ReporterSetup.forReporter("slf4j", new
Slf4jReporter())));
- delimiter = registry.getDelimiter();
-
- taskMetricGroup =
- new TaskManagerMetricGroup(registry, HOST_NAME,
TASK_MANAGER_ID)
- .addTaskForJob(
- new JobID(),
- JOB_NAME,
- new JobVertexID(),
- new ExecutionAttemptID(),
- TASK_NAME,
- 0,
- 0);
- reporter = (Slf4jReporter) registry.getReporters().get(0);
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- registry.shutdown().get();
+ delimiter = '.';
+
+ metricGroup =
+ TestMetricGroup.newBuilder()
+ .setMetricIdentifierFunction((s, characterFilter) ->
SCOPE + delimiter + s)
+ .build();
+ reporter = new Slf4jReporter();
+ reporter.open(new MetricConfig());
}
@Test
@@ -103,16 +71,12 @@ public class Slf4jReporterTest extends TestLogger {
String counterName = "simpleCounter";
SimpleCounter counter = new SimpleCounter();
- taskMetricGroup.counter(counterName, counter);
+ reporter.notifyOfAddedMetric(counter, counterName, metricGroup);
assertTrue(reporter.getCounters().containsKey(counter));
String expectedCounterReport =
- reporter.filterCharacters(HOST_NAME)
- + delimiter
- + reporter.filterCharacters(TASK_MANAGER_ID)
- + delimiter
- + reporter.filterCharacters(JOB_NAME)
+ reporter.filterCharacters(SCOPE)
+ delimiter
+ reporter.filterCharacters(counterName)
+ ": 0";
@@ -126,20 +90,12 @@ public class Slf4jReporterTest extends TestLogger {
public void testAddGauge() throws Exception {
String gaugeName = "gauge";
- int gaugesBefore = reporter.getGauges().size();
- taskMetricGroup.gauge(gaugeName, null);
- assertThat(reporter.getGauges().size(), is(gaugesBefore));
-
Gauge<Long> gauge = () -> null;
- taskMetricGroup.gauge(gaugeName, gauge);
+ reporter.notifyOfAddedMetric(gauge, gaugeName, metricGroup);
assertTrue(reporter.getGauges().containsKey(gauge));
String expectedGaugeReport =
- reporter.filterCharacters(HOST_NAME)
- + delimiter
- + reporter.filterCharacters(TASK_MANAGER_ID)
- + delimiter
- + reporter.filterCharacters(JOB_NAME)
+ reporter.filterCharacters(SCOPE)
+ delimiter
+ reporter.filterCharacters(gaugeName)
+ ": null";
@@ -152,15 +108,12 @@ public class Slf4jReporterTest extends TestLogger {
public void testAddMeter() throws Exception {
String meterName = "meter";
- Meter meter = taskMetricGroup.meter(meterName, new MeterView(5));
+ Meter meter = new MeterView(5);
+ reporter.notifyOfAddedMetric(meter, meterName, metricGroup);
assertTrue(reporter.getMeters().containsKey(meter));
String expectedMeterReport =
- reporter.filterCharacters(HOST_NAME)
- + delimiter
- + reporter.filterCharacters(TASK_MANAGER_ID)
- + delimiter
- + reporter.filterCharacters(JOB_NAME)
+ reporter.filterCharacters(SCOPE)
+ delimiter
+ reporter.filterCharacters(meterName)
+ ": 0.0";
@@ -173,15 +126,12 @@ public class Slf4jReporterTest extends TestLogger {
public void testAddHistogram() throws Exception {
String histogramName = "histogram";
- Histogram histogram = taskMetricGroup.histogram(histogramName, new
TestHistogram());
+ Histogram histogram = new TestHistogram();
+ reporter.notifyOfAddedMetric(histogram, histogramName, metricGroup);
assertTrue(reporter.getHistograms().containsKey(histogram));
String expectedHistogramName =
- reporter.filterCharacters(HOST_NAME)
- + delimiter
- + reporter.filterCharacters(TASK_MANAGER_ID)
- + delimiter
- + reporter.filterCharacters(JOB_NAME)
+ reporter.filterCharacters(SCOPE)
+ delimiter
+ reporter.filterCharacters(histogramName);
@@ -192,8 +142,6 @@ public class Slf4jReporterTest extends TestLogger {
@Test
public void testFilterCharacters() throws Exception {
- Slf4jReporter reporter = new Slf4jReporter();
-
assertThat(reporter.filterCharacters(""), equalTo(""));
assertThat(reporter.filterCharacters("abc"), equalTo("abc"));
assertThat(reporter.filterCharacters("a:b$%^::"), equalTo("a:b$%^::"));
