diff --git a/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala b/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala index 57dcbe501c6dd..0b3a981158a37 100644 --- a/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala +++ b/core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit import scala.collection.mutable -import com.codahale.metrics.{Metric, MetricRegistry} +import com.codahale.metrics._ import org.eclipse.jetty.servlet.ServletContextHandler import org.apache.spark.{SecurityManager, SparkConf} @@ -70,14 +70,14 @@ import org.apache.spark.util.Utils private[spark] class MetricsSystem private ( val instance: String, conf: SparkConf, - securityMgr: SecurityManager) + securityMgr: SecurityManager, + registry: MetricRegistry) extends Logging { private[this] val metricsConfig = new MetricsConfig(conf) private val sinks = new mutable.ArrayBuffer[Sink] - private val sources = new mutable.ArrayBuffer[Source] - private val registry = new MetricRegistry() + private val sourceToListeners = new mutable.HashMap[Source, MetricRegistryListener] private var running: Boolean = false @@ -111,6 +111,7 @@ private[spark] class MetricsSystem private ( if (running) { sinks.foreach(_.stop) registry.removeMatching((_: String, _: Metric) => true) + sourceToListeners.keySet.foreach(removeSource) } else { logWarning("Stopping a MetricsSystem that is not running") } @@ -155,23 +156,29 @@ private[spark] class MetricsSystem private ( } else { defaultName } } + def getSources: Seq[Source] = + sourceToListeners.keySet.to[collection.immutable.Seq] + + def getSinks: Seq[Sink] = sinks.to[collection.immutable.Seq] + def getSourcesByName(sourceName: String): Seq[Source] = - sources.filter(_.sourceName == sourceName) + sourceToListeners.keySet.filter(_.sourceName == sourceName).toSeq def registerSource(source: Source): Unit = { - sources += source try { - val regName = buildRegistryName(source) - registry.register(regName, source.metricRegistry) + val listener = new MetricsSystemListener(buildRegistryName(source)) + source.metricRegistry.addListener(listener) + sourceToListeners += source -> listener } catch { case e: IllegalArgumentException => logInfo("Metrics already registered", e) } } def removeSource(source: Source): Unit = { - sources -= source val regName = buildRegistryName(source) registry.removeMatching((name: String, _: Metric) => name.startsWith(regName)) + sourceToListeners.get(source).foreach(source.metricRegistry.removeListener) + sourceToListeners.remove(source) } private def registerSources(): Unit = { @@ -225,6 +232,41 @@ private[spark] class MetricsSystem private ( } } } + + private[spark] class MetricsSystemListener(prefix: String) + extends MetricRegistryListener { + def metricName(name: String): String = MetricRegistry.name(prefix, name) + + override def onHistogramAdded(name: String, histogram: Histogram): Unit = + registry.register(metricName(name), histogram) + + override def onCounterAdded(name: String, counter: Counter): Unit = + registry.register(metricName(name), counter) + + override def onHistogramRemoved(name: String): Unit = + registry.remove(metricName(name)) + + override def onGaugeRemoved(name: String): Unit = + registry.remove(metricName(name)) + + override def onMeterRemoved(name: String): Unit = + registry.remove(metricName(name)) + + override def onTimerAdded(name: String, timer: Timer): Unit = + registry.register(metricName(name), timer) + + override def onCounterRemoved(name: String): Unit = + registry.remove(metricName(name)) + + override def onGaugeAdded(name: String, gauge: Gauge[_]): Unit = + registry.register(metricName(name), gauge) + + override def onTimerRemoved(name: String): Unit = + registry.remove(metricName(name)) + + override def onMeterAdded(name: String, meter: Meter): Unit = + registry.register(metricName(name), meter) + } } private[spark] object MetricsSystem { @@ -244,7 +286,15 @@ private[spark] object MetricsSystem { def createMetricsSystem( instance: String, conf: SparkConf, securityMgr: SecurityManager): MetricsSystem = { - new MetricsSystem(instance, conf, securityMgr) + new MetricsSystem(instance, conf, securityMgr, new MetricRegistry()) + } + + def createMetricsSystem( + instance: String, + conf: SparkConf, + securityMgr: SecurityManager, + registry: MetricRegistry): MetricsSystem = { + new MetricsSystem(instance, conf, securityMgr, registry) } } diff --git a/core/src/test/scala/org/apache/spark/metrics/MetricsSystemSuite.scala b/core/src/test/scala/org/apache/spark/metrics/MetricsSystemSuite.scala index 70b6c9a112142..d7d01bdd8c738 100644 --- a/core/src/test/scala/org/apache/spark/metrics/MetricsSystemSuite.scala +++ b/core/src/test/scala/org/apache/spark/metrics/MetricsSystemSuite.scala @@ -17,9 +17,7 @@ package org.apache.spark.metrics -import scala.collection.mutable.ArrayBuffer - -import com.codahale.metrics.MetricRegistry +import com.codahale.metrics.{Gauge, MetricRegistry} import org.scalatest.{BeforeAndAfter, PrivateMethodTester} import org.apache.spark.{SecurityManager, SparkConf, SparkFunSuite} @@ -42,27 +40,23 @@ class MetricsSystemSuite extends SparkFunSuite with BeforeAndAfter with PrivateM test("MetricsSystem with default config") { val metricsSystem = MetricsSystem.createMetricsSystem("default", conf, securityMgr) metricsSystem.start() - val sources = PrivateMethod[ArrayBuffer[Source]](Symbol("sources")) - val sinks = PrivateMethod[ArrayBuffer[Sink]](Symbol("sinks")) - assert(metricsSystem.invokePrivate(sources()).length === StaticSources.allSources.length) - assert(metricsSystem.invokePrivate(sinks()).length === 0) + assert(metricsSystem.getSources.length === StaticSources.allSources.length) + assert(metricsSystem.getSinks.length === 0) assert(metricsSystem.getServletHandlers.nonEmpty) } test("MetricsSystem with sources add") { val metricsSystem = MetricsSystem.createMetricsSystem("test", conf, securityMgr) metricsSystem.start() - val sources = PrivateMethod[ArrayBuffer[Source]](Symbol("sources")) - val sinks = PrivateMethod[ArrayBuffer[Sink]](Symbol("sinks")) - assert(metricsSystem.invokePrivate(sources()).length === StaticSources.allSources.length) - assert(metricsSystem.invokePrivate(sinks()).length === 1) + assert(metricsSystem.getSources.length === StaticSources.allSources.length) + assert(metricsSystem.getSinks.length === 1) assert(metricsSystem.getServletHandlers.nonEmpty) val source = new MasterSource(null) metricsSystem.registerSource(source) - assert(metricsSystem.invokePrivate(sources()).length === StaticSources.allSources.length + 1) + assert(metricsSystem.getSources.length === StaticSources.allSources.length + 1) } test("MetricsSystem with Driver instance") { @@ -269,4 +263,24 @@ class MetricsSystemSuite extends SparkFunSuite with BeforeAndAfter with PrivateM assert(metricName === source.sourceName) } + test("MetricsSystem registers dynamically added metrics") { + val registry = new MetricRegistry() + val source = new Source { + override val sourceName = "dummySource" + override val metricRegistry = new MetricRegistry() + } + + val instanceName = "testInstance" + val metricsSystem = MetricsSystem.createMetricsSystem( + instanceName, conf, securityMgr, registry) + metricsSystem.registerSource(source) + assert(!registry.getNames.contains("dummySource.newMetric"), "Metric shouldn't be registered") + + source.metricRegistry.register("newMetric", new Gauge[Integer] { + override def getValue: Integer = 1 + }) + assert(registry.getNames.contains("dummySource.newMetric"), + "Metric should have been registered") + } + } diff --git a/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala index 48d278dd1c7b8..c3cc8816d858a 100644 --- a/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala +++ b/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala @@ -374,13 +374,13 @@ class StreamingContextSuite addInputStream(ssc).register() ssc.start() - val sources = StreamingContextSuite.getSources(ssc.env.metricsSystem) + val sources = ssc.env.metricsSystem.getSources val streamingSource = StreamingContextSuite.getStreamingSource(ssc) assert(sources.contains(streamingSource)) assert(ssc.getState() === StreamingContextState.ACTIVE) ssc.stop() - val sourcesAfterStop = StreamingContextSuite.getSources(ssc.env.metricsSystem) + val sourcesAfterStop = ssc.env.metricsSystem.getSources val streamingSourceAfterStop = StreamingContextSuite.getStreamingSource(ssc) assert(ssc.getState() === StreamingContextState.STOPPED) assert(!sourcesAfterStop.contains(streamingSourceAfterStop)) @@ -1026,10 +1026,6 @@ package object testPackage extends Assertions { * This includes methods to access private methods and fields in StreamingContext and MetricsSystem */ private object StreamingContextSuite extends PrivateMethodTester { - private val _sources = PrivateMethod[ArrayBuffer[Source]](Symbol("sources")) - private def getSources(metricsSystem: MetricsSystem): ArrayBuffer[Source] = { - metricsSystem.invokePrivate(_sources()) - } private val _streamingSource = PrivateMethod[StreamingSource](Symbol("streamingSource")) private def getStreamingSource(streamingContext: StreamingContext): StreamingSource = { streamingContext.invokePrivate(_streamingSource())