aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2015-04-28 00:49:39 -0300
committerDiego <diegolparra@gmail.com>2015-04-28 00:49:39 -0300
commitbcc1713a6306642931a8116dd6693289458d9681 (patch)
treed7cd431425a3341f3f6db9038d12ee8210d8d55c
parent72c869cc23dcf7639ab455fe0a6874cea8a9c121 (diff)
downloadKamon-bcc1713a6306642931a8116dd6693289458d9681.tar.gz
Kamon-bcc1713a6306642931a8116dd6693289458d9681.tar.bz2
Kamon-bcc1713a6306642931a8116dd6693289458d9681.zip
! log-reporter: remove report-system-metrics flag and subscribe by default to syste-metric category
-rw-r--r--kamon-log-reporter/src/main/resources/reference.conf5
-rw-r--r--kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala7
2 files changed, 1 insertions, 11 deletions
diff --git a/kamon-log-reporter/src/main/resources/reference.conf b/kamon-log-reporter/src/main/resources/reference.conf
index 080d8a76..5394193e 100644
--- a/kamon-log-reporter/src/main/resources/reference.conf
+++ b/kamon-log-reporter/src/main/resources/reference.conf
@@ -3,11 +3,6 @@
# ========================================== #
kamon {
- log-reporter {
- # Decide whether the log reporter should log system metrics, if available.
- report-system-metrics = false
- }
-
modules {
kamon-log-reporter {
auto-start = yes
diff --git a/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala b/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala
index 27424e39..12dc22ed 100644
--- a/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala
+++ b/kamon-log-reporter/src/main/scala/kamon/logreporter/LogReporter.scala
@@ -42,12 +42,7 @@ class LogReporterExtension(system: ExtendedActorSystem) extends Kamon.Extension
Kamon.metrics.subscribe("histogram", "**", subscriber, permanently = true)
Kamon.metrics.subscribe("min-max-counter", "**", subscriber, permanently = true)
Kamon.metrics.subscribe("gauge", "**", subscriber, permanently = true)
-
- val includeSystemMetrics = logReporterConfig.getBoolean("report-system-metrics")
- if (includeSystemMetrics) {
- Kamon.metrics.subscribe("system-metric", "**", subscriber, permanently = true)
- }
-
+ Kamon.metrics.subscribe("system-metric", "**", subscriber, permanently = true)
}
class LogReporterSubscriber extends Actor with ActorLogging {