diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-31 01:05:30 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-01-31 01:05:30 +0100 |
| commit | b2915946d7a112214d75b87bc9ab77b73f72f363 (patch) | |
| tree | 755d0419cb55a462e9c4a5f486ead17f6fb56572 /kamon-system-metrics/src | |
| parent | b02f2c07bad4abdb128f5249b4e1a9eabfde4ce9 (diff) | |
| parent | aa1980de105ce128ba75099815f97de3d0d4b552 (diff) | |
| download | Kamon-b2915946d7a112214d75b87bc9ab77b73f72f363.tar.gz Kamon-b2915946d7a112214d75b87bc9ab77b73f72f363.tar.bz2 Kamon-b2915946d7a112214d75b87bc9ab77b73f72f363.zip | |
Merge pull request #152 from kamon-io/automatic-loading-of-extensions#137
+ all: use ModuleSupervisor to init all auto-start modules, fix #137
Diffstat (limited to 'kamon-system-metrics/src')
| -rw-r--r-- | kamon-system-metrics/src/main/resources/reference.conf | 8 | ||||
| -rw-r--r-- | kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/kamon-system-metrics/src/main/resources/reference.conf b/kamon-system-metrics/src/main/resources/reference.conf index 7f65e477..57b34195 100644 --- a/kamon-system-metrics/src/main/resources/reference.conf +++ b/kamon-system-metrics/src/main/resources/reference.conf @@ -178,4 +178,12 @@ kamon { } } + + modules { + kamon-system-metrics { + auto-start = yes + requires-aspectj = no + extension-id = "kamon.system.SystemMetrics" + } + } }
\ No newline at end of file diff --git a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala index df120611..8a27dd03 100644 --- a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala +++ b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsExtension.scala @@ -18,9 +18,10 @@ package kamon.system import java.io.File import akka.actor._ import akka.event.Logging +import kamon.supervisor.ModuleSupervisor import kamon.system.custom.{ ContextSwitchesUpdater, ContextSwitchesMetrics } import kamon.system.jmx._ -import kamon.{ ModuleSupervisor, Kamon } +import kamon.Kamon import kamon.metric._ import kamon.sigar.SigarProvisioner import kamon.system.sigar.SigarMetricsUpdater |