remake of trace context and allow different tracing levels

2 files changed, 4 insertions, 4 deletions

diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
index 668e29f7..5f736a90 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
@@ -18,7 +18,7 @@ package kamon.newrelic
 import akka.actor._
 import scala.collection.mutable
 import kamon.Kamon
-import kamon.trace.{ UowTrace, Trace }
+import kamon.trace.{ UowTrace }
 import kamon.newrelic.NewRelicMetric.{ MetricBatch, FlushMetrics }
 import scala.concurrent.duration._
 
@@ -33,7 +33,7 @@ class NewRelicExtension(system: ExtendedActorSystem) extends Kamon.Extension {
 class NewRelicManager extends Actor with ActorLogging {
   log.info("Registering the Kamon(NewRelic) extension")
 
-  Kamon(Trace)(context.system).api ! Trace.Register
+  //Kamon(Trace)(context.system).api ! Trace.Register
 
   val webTransactionMetrics = context.actorOf(Props[WebTransactionMetrics], "web-transaction-metrics")
   val agent = context.actorOf(Props[Agent], "agent")
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
index f3a08755..9f458bb5 100644
--- a/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
+++ b/kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
@@ -19,7 +19,7 @@ import akka.actor.Actor
 import akka.event.Logging.Error
 import akka.event.Logging.{ LoggerInitialized, InitializeLogger }
 import com.newrelic.api.agent.NewRelic
-import kamon.trace.ContextAware
+import kamon.trace.TraceContextAware
 
 class NewRelicErrorLogger extends Actor {
   def receive = {
@@ -30,7 +30,7 @@ class NewRelicErrorLogger extends Actor {
 
   def notifyError(error: Error): Unit = {
     val params = new java.util.HashMap[String, String]()
-    val ctx = error.asInstanceOf[ContextAware].traceContext
+    val ctx = error.asInstanceOf[TraceContextAware].traceContext
 
     for (c ← ctx) {
       params.put("TraceToken", c.token)