aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/resources
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-01-30 03:25:54 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-01-30 03:25:54 +0100
commit30a91e935445d764d58d9e329236e9696264eeff (patch)
tree4f2765bbc7be1cb75b623bd688eb9a5cc187275c /kamon-core/src/main/resources
parent1cfe038ff70cc459515d2ee6eb3ae216c823ec47 (diff)
downloadKamon-30a91e935445d764d58d9e329236e9696264eeff.tar.gz
Kamon-30a91e935445d764d58d9e329236e9696264eeff.tar.bz2
Kamon-30a91e935445d764d58d9e329236e9696264eeff.zip
+ all: use ModuleSupervisor init all auto-start modules.
The new ModuleSupervisor implementation will make use of special configuration keys under the `kamon.modules` section to detect all the available modules in the classpath and do two things with that info: 1. Log the AspectJ Weaver missing error if any of the available modules requires AspectJ. 2. Start all available modules that are marked with the auto-start setting.
Diffstat (limited to 'kamon-core/src/main/resources')
-rw-r--r--kamon-core/src/main/resources/META-INF/aop.xml4
-rw-r--r--kamon-core/src/main/resources/reference.conf8
2 files changed, 10 insertions, 2 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
index 854e9437..2ffb8b09 100644
--- a/kamon-core/src/main/resources/META-INF/aop.xml
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -3,8 +3,8 @@
<aspectj>
<aspects>
- <!-- Disable AspectJ Weaver not present error -->
- <aspect name="kamon.instrumentation.AspectJWeaverMissingWarning"/>
+ <!-- Notify that AspectJ is present -->
+ <aspect name="kamon.supervisor.AspectJPresent"/>
</aspects>
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index dabeda69..746652eb 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -166,4 +166,12 @@ kamon {
parallelism-max = 10
}
}
+
+
+ disable-aspectj-missing-warning = false
+
+ modules {
+ # Just a place holder to ensure that the key is always available. Non-core Kamon modules should provide their
+ # settings in a module-info section.
+ }
} \ No newline at end of file