From 136fb4f454bfacc98f0d0ea8a82fbd1d35338715 Mon Sep 17 00:00:00 2001
From: Ivan Topolnak <ivantopo@gmail.com>
Date: Thu, 7 Nov 2013 18:41:33 -0300
Subject: halfway to our own NewRelic Agent

---
 kamon-core/src/main/resources/META-INF/aop.xml     | 34 ++++++++++++++++++++
 .../META-INF/aop_remove_when_possible.xml          | 37 ----------------------
 2 files changed, 34 insertions(+), 37 deletions(-)
 create mode 100644 kamon-core/src/main/resources/META-INF/aop.xml
 delete mode 100644 kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml

(limited to 'kamon-core/src/main/resources/META-INF')

diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
new file mode 100644
index 00000000..3532b19b
--- /dev/null
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -0,0 +1,34 @@
+<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
+
+<aspectj>
+    <weaver options="-verbose -showWeaveInfo">
+       <!--<dump within="*" beforeandafter="true"/>-->
+    </weaver>
+
+    <aspects>
+
+        <aspect name="kamon.trace.instrumentation.EnvelopeTracingContext"/>
+        <aspect name="kamon.trace.instrumentation.ActorCellInvokeInstrumentation"/>
+        <aspect name="kamon.trace.instrumentation.RunnableTracing" />
+        <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/>
+        <aspect name="kamon.trace.instrumentation.ActorLoggingInstrumentation"/>
+
+        <!--<aspect name="kamon.instrumentation.MessageQueueInstrumentation" />-->
+        <!--<aspect name="kamon.instrumentation.InceptionAspect"/>-->
+        <!-- ExecutorService Instrumentation for Akka. -->
+<!--        <aspect name="kamon.instrumentation.ExecutorServiceFactoryProviderInstrumentation"/>
+        <aspect name="kamon.instrumentation.NamedExecutorServiceFactoryDelegateInstrumentation"/>-->
+        <!--<aspect name ="kamon.instrumentation.ForkJoinPoolInstrumentation"/>-->
+
+
+        <include within="*"/>
+        <exclude within="javax..*"/>
+        <exclude within="com.newrelic..*"/>
+        <exclude within="org.aspectj..*"/>
+        <exclude within="scala..*"/>
+        <exclude within="scalaz..*"/>
+        <exclude within="scalad..*"/>
+        <exclude within="play..*"/>
+    </aspects>
+
+</aspectj>
diff --git a/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml b/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml
deleted file mode 100644
index 207bf1b9..00000000
--- a/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
-
-<aspectj>
-    <weaver options="-verbose -showWeaveInfo">
-       <!--<dump within="*" beforeandafter="true"/>-->
-    </weaver>
-
-    <aspects>
-
-        <aspect name="kamon.trace.instrumentation.EnvelopeTracingContext"/>
-        <aspect name="kamon.trace.instrumentation.ActorCellInvokeInstrumentation"/>
-        <aspect name="kamon.trace.instrumentation.RunnableTracing" />
-        <aspect name="kamon.instrumentation.SprayRequestContextTracing"/>
-        <aspect name="kamon.instrumentation.SprayOpenRequestContextTracing"/>
-        <aspect name = "kamon.instrumentation.SprayServerInstrumentation"/>
-        <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/>
-        <aspect name="kamon.trace.instrumentation.ActorLoggingInstrumentation"/>
-
-        <!--<aspect name="kamon.instrumentation.MessageQueueInstrumentation" />-->
-        <!--<aspect name="kamon.instrumentation.InceptionAspect"/>-->
-        <!-- ExecutorService Instrumentation for Akka. -->
-<!--        <aspect name="kamon.instrumentation.ExecutorServiceFactoryProviderInstrumentation"/>
-        <aspect name="kamon.instrumentation.NamedExecutorServiceFactoryDelegateInstrumentation"/>-->
-        <!--<aspect name ="kamon.instrumentation.ForkJoinPoolInstrumentation"/>-->
-
-
-        <include within="*"/>
-        <exclude within="javax..*"/>
-        <exclude within="com.newrelic..*"/>
-        <exclude within="org.aspectj..*"/>
-        <exclude within="scala..*"/>
-        <exclude within="scalaz..*"/>
-        <exclude within="scalad..*"/>
-        <exclude within="play..*"/>
-    </aspects>
-
-</aspectj>
-- 
cgit v1.2.3