Skip to content

Minor cleanup of metrics.Source #1943

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
rxin wants to merge 1 commit into from
Closed

Minor cleanup of metrics.Source #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/master/ApplicationSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import com.codahale.metrics.{Gauge, MetricRegistry}
import org.apache.spark.metrics.source.Source

class ApplicationSource(val application: ApplicationInfo) extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "%s.%s.%s".format("application", application.desc.name,
override val metricRegistry = new MetricRegistry()
override val sourceName = "%s.%s.%s".format("application", application.desc.name,
System.currentTimeMillis())

metricRegistry.register(MetricRegistry.name("status"), new Gauge[String] {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/master/MasterSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import com.codahale.metrics.{Gauge, MetricRegistry}
import org.apache.spark.metrics.source.Source

private[spark] class MasterSource(val master: Master) extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "master"
override val metricRegistry = new MetricRegistry()
override val sourceName = "master"

// Gauge for worker numbers in cluster
metricRegistry.register(MetricRegistry.name("workers"), new Gauge[Int] {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/worker/WorkerSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import com.codahale.metrics.{Gauge, MetricRegistry}
import org.apache.spark.metrics.source.Source

private[spark] class WorkerSource(val worker: Worker) extends Source {
val sourceName = "worker"
val metricRegistry = new MetricRegistry()
override val sourceName = "worker"
override val metricRegistry = new MetricRegistry()

metricRegistry.register(MetricRegistry.name("executors"), new Gauge[Int] {
override def getValue: Int = worker.executors.size
Expand Down
5 changes: 3 additions & 2 deletions core/src/main/scala/org/apache/spark/executor/ExecutorSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ private[spark] class ExecutorSource(val executor: Executor, executorId: String)
})
}

val metricRegistry = new MetricRegistry()
override val metricRegistry = new MetricRegistry()

// TODO: It would be nice to pass the application name here
val sourceName = "executor.%s".format(executorId)
override val sourceName = "executor.%s".format(executorId)

// Gauge for executor thread pool's actively executing task counts
metricRegistry.register(MetricRegistry.name("threadpool", "activeTasks"), new Gauge[Int] {
Expand Down
11 changes: 4 additions & 7 deletions core/src/main/scala/org/apache/spark/metrics/source/JvmSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ import com.codahale.metrics.MetricRegistry
import com.codahale.metrics.jvm.{GarbageCollectorMetricSet, MemoryUsageGaugeSet}

private[spark] class JvmSource extends Source {
val sourceName = "jvm"
val metricRegistry = new MetricRegistry()
override val sourceName = "jvm"
override val metricRegistry = new MetricRegistry()

val gcMetricSet = new GarbageCollectorMetricSet
val memGaugeSet = new MemoryUsageGaugeSet

metricRegistry.registerAll(gcMetricSet)
metricRegistry.registerAll(memGaugeSet)
metricRegistry.registerAll(new GarbageCollectorMetricSet)
metricRegistry.registerAll(new MemoryUsageGaugeSet)
}
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/scheduler/DAGSchedulerSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import org.apache.spark.metrics.source.Source

private[spark] class DAGSchedulerSource(val dagScheduler: DAGScheduler, sc: SparkContext)
extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "%s.DAGScheduler".format(sc.appName)
override val metricRegistry = new MetricRegistry()
override val sourceName = "%s.DAGScheduler".format(sc.appName)

metricRegistry.register(MetricRegistry.name("stage", "failedStages"), new Gauge[Int] {
override def getValue: Int = dagScheduler.failedStages.size
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import org.apache.spark.metrics.source.Source

private[spark] class BlockManagerSource(val blockManager: BlockManager, sc: SparkContext)
extends Source {
val metricRegistry = new MetricRegistry()
val sourceName = "%s.BlockManager".format(sc.appName)
override val metricRegistry = new MetricRegistry()
override val sourceName = "%s.BlockManager".format(sc.appName)

metricRegistry.register(MetricRegistry.name("memory", "maxMem_MB"), new Gauge[Long] {
override def getValue: Long = {
Expand Down
6 changes: 3 additions & 3 deletions streaming/src/main/scala/org/apache/spark/streaming/StreamingSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import org.apache.spark.metrics.source.Source
import org.apache.spark.streaming.ui.StreamingJobProgressListener

private[streaming] class StreamingSource(ssc: StreamingContext) extends Source {
val metricRegistry = new MetricRegistry
val sourceName = "%s.StreamingMetrics".format(ssc.sparkContext.appName)
override val metricRegistry = new MetricRegistry
override val sourceName = "%s.StreamingMetrics".format(ssc.sparkContext.appName)

val streamingListener = ssc.uiTab.listener
private val streamingListener = ssc.uiTab.listener

private def registerGauge[T](name: String, f: StreamingJobProgressListener => T,
defaultValue: T) {
Expand Down