Skip to content

[SPARK-21195][CORE] Dynamically register metrics from sources as they are reported #47352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robert3005 wants to merge 3 commits into from
Closed

[SPARK-21195][CORE] Dynamically register metrics from sources as they are reported #47352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4f6ee2
Dynamically register metrics from sources as they are reported
Jun 22, 2017
4d7f91f
code review
robert3005 Sep 17, 2024
67b5285
fewer changes
robert3005 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ import org.apache.spark.util.Utils
* [options] represent the specific property of this source or sink.
*/
private[spark] class MetricsSystem private (
val instance: String, conf: SparkConf) extends Logging {
val instance: String,
conf: SparkConf,
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 var running: Boolean = false

Expand Down Expand Up @@ -257,8 +259,11 @@ private[spark] object MetricsSystem {
}
}

def createMetricsSystem(instance: String, conf: SparkConf): MetricsSystem = {
new MetricsSystem(instance, conf)
def createMetricsSystem(
instance: String,
conf: SparkConf,
registry: MetricRegistry = new MetricRegistry): MetricsSystem = {
new MetricsSystem(instance, conf, registry)
}
}

Expand Down
24 changes: 23 additions & 1 deletion core/src/test/scala/org/apache/spark/metrics/MetricsSystemSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import java.util.Properties

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}
Expand Down Expand Up @@ -281,6 +281,28 @@ class MetricsSystemSuite extends SparkFunSuite with BeforeAndAfter with PrivateM

assert(metricsSystem.invokePrivate(sinks()).length === 1)
}

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, 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")
}
}

class ThreeParameterConstructorSink(
Expand Down