aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/metric
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/scala/kamon/metric
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/scala/kamon/metric')
-rw-r--r--kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala28
1 files changed, 2 insertions, 26 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala
index 0b7fc7f2..c14d4e16 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala
@@ -18,8 +18,9 @@ package kamon.metric
import akka.actor
import kamon.metric.SubscriptionsDispatcher.{ Unsubscribe, Subscribe }
-import kamon.{ ModuleSupervisor, Kamon }
+import kamon.Kamon
import kamon.metric.instrument.{ InstrumentFactory, CollectionContext }
+import kamon.supervisor.ModuleSupervisor
import scala.collection.concurrent.TrieMap
import akka.actor._
@@ -127,30 +128,5 @@ class MetricsExtensionImpl(system: ExtendedActorSystem) extends MetricsExtension
builder.result()
}
-
- /* def printInitializationMessage(eventStream: EventStream, disableWeaverMissingError: Boolean): Unit = {
- if (!disableWeaverMissingError) {
- val weaverMissingMessage =
- """
- |
- | ___ _ ___ _ _ ___ ___ _ _
- | / _ \ | | |_ | | | | | | \/ |(_) (_)
- |/ /_\ \ ___ _ __ ___ ___ | |_ | | | | | | ___ __ _ __ __ ___ _ __ | . . | _ ___ ___ _ _ __ __ _
- || _ |/ __|| '_ \ / _ \ / __|| __| | | | |/\| | / _ \ / _` |\ \ / // _ \| '__| | |\/| || |/ __|/ __|| || '_ \ / _` |
- || | | |\__ \| |_) || __/| (__ | |_ /\__/ / \ /\ /| __/| (_| | \ V /| __/| | | | | || |\__ \\__ \| || | | || (_| |
- |\_| |_/|___/| .__/ \___| \___| \__|\____/ \/ \/ \___| \__,_| \_/ \___||_| \_| |_/|_||___/|___/|_||_| |_| \__, |
- | | | __/ |
- | |_| |___/
- |
- | It seems like your application wasn't started with the -javaagent:/path-to-aspectj-weaver.jar option. Without that Kamon might
- | not work properly, if you need help on setting up the weaver go to http://kamon.io/introduction/get-started/ for more info. If
- | you are sure that you don't need the weaver (e.g. you are only using KamonStandalone) then you can disable this error message
- | by changing the kamon.metrics.disable-aspectj-weaver-missing-error setting in your configuration file.
- |
- """.stripMargin
-
- eventStream.publish(Error("MetricsExtension", classOf[MetricsExtension], weaverMissingMessage))
- }
- }*/
}