= core: kamon akka instrumentation name space

suppress javac warnings
move javac settings

10 files changed, 23 insertions, 19 deletions

diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
index 3a029ace..8c7eb235 100644
--- a/kamon-core/src/main/resources/META-INF/aop.xml
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -6,24 +6,24 @@
     <aspect name="kamon.instrumentation.AspectJWeaverMissingWarning"/>
 
     <!-- Actors -->
-    <aspect name="akka.instrumentation.TraceContextIntoRepointableActorRefMixin"/>
-    <aspect name="akka.instrumentation.TraceContextIntoSystemMessageMixin"/>
-    <aspect name="akka.instrumentation.ActorSystemMessageInstrumentation"/>
-    <aspect name="akka.instrumentation.TraceContextIntoEnvelopeMixin"/>
-    <aspect name="akka.instrumentation.ActorCellMetricsIntoActorCellMixin"/>
-    <aspect name="akka.instrumentation.ActorCellInstrumentation"/>
-    <aspect name="akka.instrumentation.ActorLoggingInstrumentation"/>
+    <aspect name="akka.kamon.instrumentation.TraceContextIntoRepointableActorRefMixin"/>
+    <aspect name="akka.kamon.instrumentation.TraceContextIntoSystemMessageMixin"/>
+    <aspect name="akka.kamon.instrumentation.ActorSystemMessageInstrumentation"/>
+    <aspect name="akka.kamon.instrumentation.TraceContextIntoEnvelopeMixin"/>
+    <aspect name="akka.kamon.instrumentation.ActorCellMetricsIntoActorCellMixin"/>
+    <aspect name="akka.kamon.instrumentation.ActorCellInstrumentation"/>
+    <aspect name="akka.kamon.instrumentation.ActorLoggingInstrumentation"/>
 
     <!-- Dispatchers -->
-    <aspect name="akka.instrumentation.DispatcherInstrumentation"/>
-    <aspect name="akka.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/>
+    <aspect name="akka.kamon.instrumentation.DispatcherInstrumentation"/>
+    <aspect name="akka.kamon.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/>
 
     <!-- Futures -->
     <aspect name="kamon.instrumentation.scala.FutureInstrumentation"/>
     <aspect name="kamon.instrumentation.scalaz.FutureInstrumentation"/>
 
     <!-- Patterns -->
-    <aspect name="akka.instrumentation.AskPatternInstrumentation"/>
+    <aspect name="akka.kamon.instrumentation.AskPatternInstrumentation"/>
   </aspects>
 
   <weaver>
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
index 90928ba0..a340566d 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package akka.instrumentation
+package akka.kamon.instrumentation
 
 import akka.actor._
 import akka.dispatch.{ Envelope, MessageDispatcher }
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
index 82b8304d..6b90a81e 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package akka.instrumentation
+package akka.kamon.instrumentation
 
 import kamon.trace.{ TraceContextAware, TraceRecorder }
 import org.aspectj.lang.ProceedingJoinPoint
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala
index 7845e90d..48016876 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package akka.instrumentation
+package akka.kamon.instrumentation
 
 import akka.dispatch.sysmsg.EarliestFirstSystemMessageList
 import kamon.trace.{ TraceContextAware, TraceRecorder }
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala
index 3bf13ce2..ebc204a5 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package akka.instrumentation
+package akka.kamon.instrumentation
 
 import akka.actor.ActorRefProvider
 import akka.event.Logging.Warning
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
index 8b3af3d6..4b1bbc4d 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
@@ -14,14 +14,14 @@
  * =========================================================================================
  */
 
-package akka.instrumentation
+package akka.kamon.instrumentation
 
 import java.lang.reflect.Method
 import java.util.concurrent.ThreadPoolExecutor
 
 import akka.actor.{ ActorSystemImpl, Cancellable }
 import akka.dispatch.{ Dispatcher, Dispatchers, ExecutorServiceDelegate, MessageDispatcher }
-import akka.instrumentation.DispatcherMetricsCollector.DispatcherMetricsMeasurement
+import akka.kamon.instrumentation.DispatcherMetricsCollector.DispatcherMetricsMeasurement
 import kamon.Kamon
 import kamon.metric.DispatcherMetrics.DispatcherMetricRecorder
 import kamon.metric.{ DispatcherMetrics, Metrics }
diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
index d279423b..97bcb0cf 100644
--- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
@@ -17,7 +17,7 @@ package kamon.metric
 
 import java.nio.LongBuffer
 
-import akka.instrumentation.ActorCellMetrics
+import akka.kamon.instrumentation.ActorCellMetrics
 import kamon.Kamon
 import kamon.metric.ActorMetricsTestActor._
 import kamon.metric.instrument.Histogram.MutableRecord
diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
index 7d7494eb..1164b811 100644
--- a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
+++ b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
@@ -85,8 +85,10 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil
         path("site") {
           traceName("FinalGetSite-3") {
             complete {
-              for (f1 <- pipeline(Get("http://127.0.0.1:9090/ok"));
-                   f2 <- pipeline(Get("http://www.google.com/search?q=mkyong"))) yield "Ok Double Future"
+              for (
+                f1 ← pipeline(Get("http://127.0.0.1:9090/ok"));
+                f2 ← pipeline(Get("http://www.google.com/search?q=mkyong"))
+              ) yield "Ok Double Future"
             }
           }
         } ~
diff --git a/project/Projects.scala b/project/Projects.scala
index 213c96df..9c9d6735 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -20,6 +20,7 @@ object Projects extends Build {
     .settings(formatSettings: _*)
     .settings(aspectJSettings: _*)
     .settings(
+      javacOptions  in Compile ++= Seq("-XDignore.symbol.file"),
       mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value,
       mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value,
       libraryDependencies ++=
diff --git a/project/Settings.scala b/project/Settings.scala
index 306c88a4..9f9fc594 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -16,6 +16,7 @@ object Settings {
     resolvers    ++= Dependencies.resolutionRepos,
     fork in run   := true,
     javacOptions  := Seq(
+      "-Xlint:-options",
       "-source", "1.6", "-target", "1.6"
     ),
     scalacOptions := Seq(