You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2016/07/15 14:06:29 UTC

flink git commit: [FLINK-4184] [metrics] Replace invalid characters in ScheduledDropwizardReporter

Repository: flink
Updated Branches:
  refs/heads/master 2218cb4c1 -> 70094a181


[FLINK-4184] [metrics] Replace invalid characters in ScheduledDropwizardReporter

The GraphiteReporter and GangliaReporter report metric names which can contain invalid
characters. These characters include quotes and dots. In order to properly report metrics
to these systems, the afore-mentioned characters have to be replaced in metric names.

The PR also removes quotes from the garbage collector metric name.

The PR sets the default value for TTL in the GangliaReporter to 1, because -1 causes the
reporter to fail.

Introduce CharacterFilter to filter invalid characters from the metric name out

The character filter is applied to all components of the fully qualified metric name.
The ScheduledDropwizardReporter and AbstractReporter implement this interface to generate
compatible metric names.

Correct AbstractMetricGroup.getMetricIdentifier; Add test cases to check that reporters filter out invalid characters

This closes #2220.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/70094a18
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/70094a18
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/70094a18

Branch: refs/heads/master
Commit: 70094a1818b532f4e0ff31f5debc550ed4336286
Parents: 2218cb4
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Jul 8 16:41:39 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Jul 15 16:03:53 2016 +0200

----------------------------------------------------------------------
 .../apache/flink/metrics/CharacterFilter.java   |  36 ++++++
 .../metrics/groups/AbstractMetricGroup.java     |  26 +++-
 .../flink/metrics/groups/scope/ScopeFormat.java |  31 ++++-
 .../metrics/reporter/AbstractReporter.java      |  15 +--
 .../apache/flink/metrics/util/TestReporter.java |   5 +
 .../dropwizard/ScheduledDropwizardReporter.java |  46 ++++++-
 .../ScheduledDropwizardReporterTest.java        | 124 +++++++++++++++++++
 .../flink/metrics/ganglia/GangliaReporter.java  |   2 +-
 .../flink/metrics/statsd/StatsDReporter.java    |  54 ++++----
 .../metrics/statsd/StatsDReporterTest.java      |  85 ++++++++++++-
 .../flink/runtime/jobmanager/JobManager.scala   |   2 +-
 .../flink/runtime/taskmanager/TaskManager.scala |   2 +-
 12 files changed, 373 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-core/src/main/java/org/apache/flink/metrics/CharacterFilter.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/metrics/CharacterFilter.java b/flink-core/src/main/java/org/apache/flink/metrics/CharacterFilter.java
new file mode 100644
index 0000000..1e9fbc4
--- /dev/null
+++ b/flink-core/src/main/java/org/apache/flink/metrics/CharacterFilter.java
@@ -0,0 +1,36 @@
+/*
+ * 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.flink.metrics;
+
+/**
+ * Interface for a character filter function. The filter function is given a string which the filter
+ * can transform. The returned string is the transformation result.
+ */
+public interface CharacterFilter {
+
+	/**
+	 * Filter the given string and generate a resulting string from it.
+	 *
+	 * For example, one implementation could filter out invalid characters from the input string.
+	 *
+	 * @param input Input string
+	 * @return Filtered result string
+	 */
+	String filterCharacters(String input);
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-core/src/main/java/org/apache/flink/metrics/groups/AbstractMetricGroup.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/metrics/groups/AbstractMetricGroup.java b/flink-core/src/main/java/org/apache/flink/metrics/groups/AbstractMetricGroup.java
index 4daead3..abac667 100644
--- a/flink-core/src/main/java/org/apache/flink/metrics/groups/AbstractMetricGroup.java
+++ b/flink-core/src/main/java/org/apache/flink/metrics/groups/AbstractMetricGroup.java
@@ -19,6 +19,7 @@
 package org.apache.flink.metrics.groups;
 
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.metrics.CharacterFilter;
 import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.Histogram;
@@ -100,10 +101,31 @@ public abstract class AbstractMetricGroup implements MetricGroup {
 	 * @return fully qualified metric name
      */
 	public String getMetricIdentifier(String metricName) {
+		return getMetricIdentifier(metricName, null);
+	}
+
+	/**
+	 * Returns the fully qualified metric name, for example
+	 * {@code "host-7.taskmanager-2.window_word_count.my-mapper.metricName"}
+	 *
+	 * @param metricName metric name
+	 * @param filter character filter which is applied to the scope components if not null.
+	 * @return fully qualified metric name
+	 */
+	public String getMetricIdentifier(String metricName, CharacterFilter filter) {
 		if (scopeString == null) {
-			scopeString = ScopeFormat.concat(registry.getDelimiter(), scopeComponents);
+			if (filter != null) {
+				scopeString = ScopeFormat.concat(filter, registry.getDelimiter(), scopeComponents);
+			} else {
+				scopeString = ScopeFormat.concat(registry.getDelimiter(), scopeComponents);
+			}
+		}
+
+		if (filter != null) {
+			return scopeString + registry.getDelimiter() + filter.filterCharacters(metricName);
+		} else {
+			return scopeString + registry.getDelimiter() + metricName;
 		}
-		return scopeString + registry.getDelimiter() + metricName;
 	}
 	
 	// ------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-core/src/main/java/org/apache/flink/metrics/groups/scope/ScopeFormat.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/metrics/groups/scope/ScopeFormat.java b/flink-core/src/main/java/org/apache/flink/metrics/groups/scope/ScopeFormat.java
index 9471a07..9297332 100644
--- a/flink-core/src/main/java/org/apache/flink/metrics/groups/scope/ScopeFormat.java
+++ b/flink-core/src/main/java/org/apache/flink/metrics/groups/scope/ScopeFormat.java
@@ -19,6 +19,7 @@
 package org.apache.flink.metrics.groups.scope;
 
 import org.apache.flink.api.common.JobID;
+import org.apache.flink.metrics.CharacterFilter;
 import org.apache.flink.metrics.groups.JobManagerMetricGroup;
 import org.apache.flink.metrics.groups.JobMetricGroup;
 import org.apache.flink.metrics.groups.TaskManagerJobMetricGroup;
@@ -45,6 +46,13 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
  */
 public abstract class ScopeFormat {
 
+	private static CharacterFilter defaultFilter = new CharacterFilter() {
+		@Override
+		public String filterCharacters(String input) {
+			return input;
+		}
+	};
+
 	// ------------------------------------------------------------------------
 	//  Scope Format Special Characters
 	// ------------------------------------------------------------------------
@@ -428,15 +436,32 @@ public abstract class ScopeFormat {
 	}
 
 	public static String concat(String... components) {
-		return concat('.', components);
+		return concat(defaultFilter, '.', components);
+	}
+
+	public static String concat(CharacterFilter filter, String... components) {
+		return concat(filter, '.', components);
 	}
 
 	public static String concat(Character delimiter, String... components) {
+		return concat(defaultFilter, delimiter, components);
+	}
+
+	/**
+	 * Concatenates the given component names separated by the delimiter character. Additionally
+	 * the character filter is applied to all component names.
+	 *
+	 * @param filter Character filter to be applied to the component names
+	 * @param delimiter Delimiter to separate component names
+	 * @param components Array of component names
+	 * @return The concatenated component name
+	 */
+	public static String concat(CharacterFilter filter, Character delimiter, String... components) {
 		StringBuilder sb = new StringBuilder();
-		sb.append(components[0]);
+		sb.append(filter.filterCharacters(components[0]));
 		for (int x = 1; x < components.length; x++) {
 			sb.append(delimiter);
-			sb.append(components[x]);
+			sb.append(filter.filterCharacters(components[x]));
 		}
 		return sb.toString();
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java b/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
index a37b29a..f96901b 100644
--- a/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
+++ b/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
@@ -19,6 +19,7 @@
 package org.apache.flink.metrics.reporter;
 
 import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.metrics.CharacterFilter;
 import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.Histogram;
@@ -34,7 +35,7 @@ import java.util.Map;
  * Base interface for custom metric reporters.
  */
 @PublicEvolving
-public abstract class AbstractReporter implements MetricReporter {
+public abstract class AbstractReporter implements MetricReporter, CharacterFilter {
 	protected final Logger log = LoggerFactory.getLogger(getClass());
 
 	protected final Map<Gauge<?>, String> gauges = new HashMap<>();
@@ -43,7 +44,7 @@ public abstract class AbstractReporter implements MetricReporter {
 
 	@Override
 	public void notifyOfAddedMetric(Metric metric, String metricName, AbstractMetricGroup group) {
-		final String name = replaceInvalidChars(group.getMetricIdentifier(metricName));
+		final String name = group.getMetricIdentifier(metricName, this);
 
 		synchronized (this) {
 			if (metric instanceof Counter) {
@@ -74,14 +75,4 @@ public abstract class AbstractReporter implements MetricReporter {
 			}
 		}
 	}
-
-	/**
-	 * Can be overridden by sub-classes to replace invalid characters in metric name.
-	 *
-	 * @param metricName Name of the metric
-	 * @return The metric name to register the metric under
-	 */
-	protected String replaceInvalidChars(String metricName) {
-		return metricName;
-	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-core/src/test/java/org/apache/flink/metrics/util/TestReporter.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/metrics/util/TestReporter.java b/flink-core/src/test/java/org/apache/flink/metrics/util/TestReporter.java
index 0c139f0..3f8909d 100644
--- a/flink-core/src/test/java/org/apache/flink/metrics/util/TestReporter.java
+++ b/flink-core/src/test/java/org/apache/flink/metrics/util/TestReporter.java
@@ -36,4 +36,9 @@ public class TestReporter extends AbstractReporter {
 
 	@Override
 	public void notifyOfRemovedMetric(Metric metric, String metricName, AbstractMetricGroup group) {}
+
+	@Override
+	public String filterCharacters(String input) {
+		return input;
+	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-metrics/flink-metrics-dropwizard/src/main/java/org/apache/flink/dropwizard/ScheduledDropwizardReporter.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/main/java/org/apache/flink/dropwizard/ScheduledDropwizardReporter.java b/flink-metrics/flink-metrics-dropwizard/src/main/java/org/apache/flink/dropwizard/ScheduledDropwizardReporter.java
index f886130..568bda2 100644
--- a/flink-metrics/flink-metrics-dropwizard/src/main/java/org/apache/flink/dropwizard/ScheduledDropwizardReporter.java
+++ b/flink-metrics/flink-metrics-dropwizard/src/main/java/org/apache/flink/dropwizard/ScheduledDropwizardReporter.java
@@ -28,6 +28,7 @@ import org.apache.flink.dropwizard.metrics.FlinkCounterWrapper;
 import org.apache.flink.dropwizard.metrics.DropwizardHistogramWrapper;
 import org.apache.flink.dropwizard.metrics.FlinkGaugeWrapper;
 import org.apache.flink.dropwizard.metrics.FlinkHistogramWrapper;
+import org.apache.flink.metrics.CharacterFilter;
 import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.Histogram;
@@ -47,7 +48,7 @@ import java.util.SortedMap;
  * Dropwizard {@link com.codahale.metrics.Reporter}.
  */
 @PublicEvolving
-public abstract class ScheduledDropwizardReporter implements MetricReporter, Scheduled, Reporter {
+public abstract class ScheduledDropwizardReporter implements MetricReporter, Scheduled, Reporter, CharacterFilter {
 
 	protected final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -74,6 +75,15 @@ public abstract class ScheduledDropwizardReporter implements MetricReporter, Sch
 	}
 
 	// ------------------------------------------------------------------------
+	//  Getters
+	// ------------------------------------------------------------------------
+
+	// used for testing purposes
+	Map<Counter, String> getCounters() {
+		return counters;
+	}
+
+	// ------------------------------------------------------------------------
 	//  life cycle
 	// ------------------------------------------------------------------------
 
@@ -93,7 +103,7 @@ public abstract class ScheduledDropwizardReporter implements MetricReporter, Sch
 
 	@Override
 	public void notifyOfAddedMetric(Metric metric, String metricName, AbstractMetricGroup group) {
-		final String fullName = group.getMetricIdentifier(metricName);
+		final String fullName = group.getMetricIdentifier(metricName, this);
 
 		synchronized (this) {
 			if (metric instanceof Counter) {
@@ -140,6 +150,38 @@ public abstract class ScheduledDropwizardReporter implements MetricReporter, Sch
 		}
 	}
 
+	@Override
+	public String filterCharacters(String metricName) {
+		char[] chars = null;
+		final int strLen = metricName.length();
+		int pos = 0;
+
+		for (int i = 0; i < strLen; i++) {
+			final char c = metricName.charAt(i);
+			switch (c) {
+				case '.':
+					if (chars == null) {
+						chars = metricName.toCharArray();
+					}
+					chars[pos++] = '-';
+					break;
+				case '"':
+					if (chars == null) {
+						chars = metricName.toCharArray();
+					}
+					break;
+
+				default:
+					if (chars != null) {
+						chars[pos] = c;
+					}
+					pos++;
+			}
+		}
+
+		return chars == null ? metricName : new String(chars, 0, pos);
+	}
+
 	// ------------------------------------------------------------------------
 	//  scheduled reporting
 	// ------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
new file mode 100644
index 0000000..4b19b50
--- /dev/null
+++ b/flink-metrics/flink-metrics-dropwizard/src/test/java/org/apache/flink/dropwizard/ScheduledDropwizardReporterTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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.flink.dropwizard;
+
+import com.codahale.metrics.ScheduledReporter;
+import org.apache.flink.api.common.JobID;
+import org.apache.flink.configuration.ConfigConstants;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.metrics.Counter;
+import org.apache.flink.metrics.MetricRegistry;
+import org.apache.flink.metrics.SimpleCounter;
+import org.apache.flink.metrics.groups.TaskManagerJobMetricGroup;
+import org.apache.flink.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.metrics.groups.TaskMetricGroup;
+import org.apache.flink.metrics.reporter.MetricReporter;
+import org.apache.flink.util.AbstractID;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ScheduledDropwizardReporterTest {
+
+	@Test
+	public void testInvalidCharacterReplacement() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+		ScheduledDropwizardReporter reporter = new ScheduledDropwizardReporter() {
+			@Override
+			public ScheduledReporter getReporter(Configuration config) {
+				return null;
+			}
+		};
+
+		assertEquals("abc", reporter.filterCharacters("abc"));
+		assertEquals("a--b-c-", reporter.filterCharacters("a..b.c."));
+		assertEquals("ab-c", reporter.filterCharacters("a\"b.c"));
+	}
+
+	/**
+	 * Tests that the registered metrics' names don't contain invalid characters.
+	 */
+	@Test
+	public void testAddingMetrics() throws NoSuchFieldException, IllegalAccessException {
+		Configuration configuration = new Configuration();
+		String taskName = "test\"Ta\"..sk";
+		String jobName = "testJ\"ob:-!ax..?";
+		String hostname = "loc<>al\"::host\".:";
+		String taskManagerId = "tas:kMana::ger";
+		String counterName = "testCounter";
+
+		configuration.setString(ConfigConstants.METRICS_REPORTER_CLASS, "org.apache.flink.dropwizard.ScheduledDropwizardReporterTest$TestingScheduledDropwizardReporter");
+		configuration.setString(ConfigConstants.METRICS_SCOPE_NAMING_TASK, "<host>.<tm_id>.<job_name>");
+		configuration.setString(ConfigConstants.METRICS_SCOPE_DELIMITER, "_");
+
+		MetricRegistry metricRegistry = new MetricRegistry(configuration);
+
+		char delimiter = metricRegistry.getDelimiter();
+
+		TaskManagerMetricGroup tmMetricGroup = new TaskManagerMetricGroup(metricRegistry, hostname, taskManagerId);
+		TaskManagerJobMetricGroup tmJobMetricGroup = new TaskManagerJobMetricGroup(metricRegistry, tmMetricGroup, new JobID(), jobName);
+		TaskMetricGroup taskMetricGroup = new TaskMetricGroup(metricRegistry, tmJobMetricGroup, new AbstractID(), new AbstractID(), taskName, 0, 0);
+
+		SimpleCounter myCounter = new SimpleCounter();
+
+		taskMetricGroup.counter(counterName, myCounter);
+
+		Field reporterField = MetricRegistry.class.getDeclaredField("reporter");
+		reporterField.setAccessible(true);
+
+		MetricReporter metricReporter = (MetricReporter) reporterField.get(metricRegistry);
+
+		assertTrue("Reporter should be of type ScheduledDropwizardReporter", metricReporter instanceof ScheduledDropwizardReporter);
+
+		TestingScheduledDropwizardReporter reporter = (TestingScheduledDropwizardReporter) metricReporter;
+
+		Map<Counter, String> counters = reporter.getCounters();
+
+		assertTrue(counters.containsKey(myCounter));
+
+		String expectedCounterName = reporter.filterCharacters(hostname)
+			+ delimiter
+			+ reporter.filterCharacters(taskManagerId)
+			+ delimiter
+			+ reporter.filterCharacters(jobName)
+			+ delimiter
+			+ reporter.filterCharacters(counterName);
+
+		assertEquals(expectedCounterName, counters.get(myCounter));
+
+		metricRegistry.shutdown();
+	}
+
+	public static class TestingScheduledDropwizardReporter extends ScheduledDropwizardReporter {
+
+		@Override
+		public ScheduledReporter getReporter(Configuration config) {
+			return null;
+		}
+
+		@Override
+		public void close() {
+			// don't do anything
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-metrics/flink-metrics-ganglia/src/main/java/org/apache/flink/metrics/ganglia/GangliaReporter.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-ganglia/src/main/java/org/apache/flink/metrics/ganglia/GangliaReporter.java b/flink-metrics/flink-metrics-ganglia/src/main/java/org/apache/flink/metrics/ganglia/GangliaReporter.java
index adf9394..f30c9f4 100644
--- a/flink-metrics/flink-metrics-ganglia/src/main/java/org/apache/flink/metrics/ganglia/GangliaReporter.java
+++ b/flink-metrics/flink-metrics-ganglia/src/main/java/org/apache/flink/metrics/ganglia/GangliaReporter.java
@@ -47,7 +47,7 @@ public class GangliaReporter extends ScheduledDropwizardReporter {
 				throw new IllegalArgumentException("Invalid host/port configuration. Host: " + host + " Port: " + port);
 			}
 			String addressingMode = config.getString(ARG_MODE_ADDRESSING, "MULTICAST");
-			int ttl = config.getInteger(ARG_TTL, -1);
+			int ttl = config.getInteger(ARG_TTL, 1);
 			GMetric gMetric = new GMetric(host, port, GMetric.UDPAddressingMode.valueOf(addressingMode), ttl);
 
 			String prefix = config.getString(ARG_PREFIX, null);

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-metrics/flink-metrics-statsd/src/main/java/org/apache/flink/metrics/statsd/StatsDReporter.java
----------------------------------------------------------------------
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 70dfcb4..e0c6dc7 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
@@ -125,33 +125,6 @@ public class StatsDReporter extends AbstractReporter implements Scheduled {
 		}
 	}
 
-	@Override
-	protected String replaceInvalidChars(String metricName) {
-		char[] chars = null;
-		final int strLen = metricName.length();
-		int pos = 0;
-
-		for (int i = 0; i < strLen; i++) {
-			final char c = metricName.charAt(i);
-			switch (c) {
-				case ':':
-					if (chars == null) {
-						chars = metricName.toCharArray();
-					}
-					chars[pos++] = '-';
-					break;
-
-				default:
-					if (chars != null) {
-						chars[pos] = c;
-					}
-					pos++;
-			}
-		}
-
-		return chars == null ? metricName : new String(chars, 0, pos);
-	}
-
 	// ------------------------------------------------------------------------
 	
 	private void reportCounter(final String name, final Counter counter) {
@@ -210,4 +183,31 @@ public class StatsDReporter extends AbstractReporter implements Scheduled {
 			LOG.error("unable to send packet to statsd at '{}:{}'", address.getHostName(), address.getPort());
 		}
 	}
+
+	@Override
+	public String filterCharacters(String input) {
+		char[] chars = null;
+		final int strLen = input.length();
+		int pos = 0;
+
+		for (int i = 0; i < strLen; i++) {
+			final char c = input.charAt(i);
+			switch (c) {
+				case ':':
+					if (chars == null) {
+						chars = input.toCharArray();
+					}
+					chars[pos++] = '-';
+					break;
+
+				default:
+					if (chars != null) {
+						chars[pos] = c;
+					}
+					pos++;
+			}
+		}
+
+		return chars == null ? input : new String(chars, 0, pos);
+	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
index df2725a..37a3477 100644
--- a/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
+++ b/flink-metrics/flink-metrics-statsd/src/test/java/org/apache/flink/metrics/statsd/StatsDReporterTest.java
@@ -18,27 +18,36 @@
 
 package org.apache.flink.metrics.statsd;
 
+import org.apache.flink.api.common.JobID;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Histogram;
 import org.apache.flink.metrics.HistogramStatistics;
 import org.apache.flink.metrics.MetricRegistry;
+import org.apache.flink.metrics.SimpleCounter;
+import org.apache.flink.metrics.groups.TaskManagerJobMetricGroup;
 import org.apache.flink.metrics.groups.TaskManagerMetricGroup;
+import org.apache.flink.metrics.groups.TaskMetricGroup;
+import org.apache.flink.metrics.reporter.MetricReporter;
+import org.apache.flink.util.AbstractID;
 import org.apache.flink.util.TestLogger;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.SocketException;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeoutException;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class StatsDReporterTest extends TestLogger {
 
@@ -46,13 +55,63 @@ public class StatsDReporterTest extends TestLogger {
 	public void testReplaceInvalidChars() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
 		StatsDReporter reporter = new StatsDReporter();
 
-		Class<? extends StatsDReporter> clazz = reporter.getClass();
+		assertEquals("", reporter.filterCharacters(""));
+		assertEquals("abc", reporter.filterCharacters("abc"));
+		assertEquals("a-b--", reporter.filterCharacters("a:b::"));
+	}
+
+	/**
+	 * Tests that the registered metrics' names don't contain invalid characters.
+	 */
+	@Test
+	public void testAddingMetrics() throws NoSuchFieldException, IllegalAccessException {
+		Configuration configuration = new Configuration();
+		String taskName = "testTask";
+		String jobName = "testJob:-!ax..?";
+		String hostname = "local::host:";
+		String taskManagerId = "tas:kMana::ger";
+		String counterName = "testCounter";
+
+		configuration.setString(ConfigConstants.METRICS_REPORTER_CLASS, "org.apache.flink.metrics.statsd.StatsDReporterTest$TestingStatsDReporter");
+		configuration.setString(ConfigConstants.METRICS_SCOPE_NAMING_TASK, "<host>.<tm_id>.<job_name>");
+		configuration.setString(ConfigConstants.METRICS_SCOPE_DELIMITER, "_");
+
+		MetricRegistry metricRegistry = new MetricRegistry(configuration);
+
+		char delimiter = metricRegistry.getDelimiter();
+
+		TaskManagerMetricGroup tmMetricGroup = new TaskManagerMetricGroup(metricRegistry, hostname, taskManagerId);
+		TaskManagerJobMetricGroup tmJobMetricGroup = new TaskManagerJobMetricGroup(metricRegistry, tmMetricGroup, new JobID(), jobName);
+		TaskMetricGroup taskMetricGroup = new TaskMetricGroup(metricRegistry, tmJobMetricGroup, new AbstractID(), new AbstractID(), taskName, 0, 0);
+
+		SimpleCounter myCounter = new SimpleCounter();
+
+		taskMetricGroup.counter(counterName, myCounter);
+
+		Field reporterField = MetricRegistry.class.getDeclaredField("reporter");
+		reporterField.setAccessible(true);
+
+		MetricReporter metricReporter = (MetricReporter) reporterField.get(metricRegistry);
 
-		Method m = clazz.getDeclaredMethod("replaceInvalidChars", String.class);
+		assertTrue("Reporter should be of type StatsDReporter", metricReporter instanceof StatsDReporter);
 
-		assertEquals("", m.invoke(reporter, ""));
-		assertEquals("abc", m.invoke(reporter, "abc"));
-		assertEquals("a-b--", m.invoke(reporter, "a:b::"));
+		TestingStatsDReporter reporter = (TestingStatsDReporter) metricReporter;
+
+		Map<Counter, String> counters = reporter.getCounters();
+
+		assertTrue(counters.containsKey(myCounter));
+
+		String expectedCounterName = reporter.filterCharacters(hostname)
+			+ delimiter
+			+ reporter.filterCharacters(taskManagerId)
+			+ delimiter
+			+ reporter.filterCharacters(jobName)
+			+ delimiter
+			+ reporter.filterCharacters(counterName);
+
+		assertEquals(expectedCounterName, counters.get(myCounter));
+
+		metricRegistry.shutdown();
 	}
 
 	/**
@@ -127,6 +186,20 @@ public class StatsDReporterTest extends TestLogger {
 		}
 	}
 
+	/**
+	 * Testing StatsDReporter which disables the socket creation
+	 */
+	public static class TestingStatsDReporter extends StatsDReporter {
+		@Override
+		public void open(Configuration configuration) {
+			// disable the socket creation
+		}
+
+		public Map<Counter, String> getCounters() {
+			return counters;
+		}
+	}
+
 	public static class TestingHistogram implements Histogram {
 
 		@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index fac2e42..fc066b1 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -1812,7 +1812,7 @@ class JobManager(
     val garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans
 
     for (garbageCollector <- garbageCollectors.asScala) {
-      val gcGroup = metrics.addGroup("\"" + garbageCollector.getName + "\"")
+      val gcGroup = metrics.addGroup(garbageCollector.getName)
       gcGroup.gauge[Long, Gauge[Long]]("Count", new Gauge[Long] {
         override def getValue: Long = garbageCollector.getCollectionCount
       })

http://git-wip-us.apache.org/repos/asf/flink/blob/70094a18/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 2e2e6bc..0ff929c 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -2305,7 +2305,7 @@ object TaskManager {
     val garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans
 
     for (garbageCollector <- garbageCollectors.asScala) {
-      val gcGroup = metrics.addGroup("\"" + garbageCollector.getName + "\"")
+      val gcGroup = metrics.addGroup(garbageCollector.getName)
       gcGroup.gauge[Long, FlinkGauge[Long]]("Count", new FlinkGauge[Long] {
         override def getValue: Long = garbageCollector.getCollectionCount
       })