aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-10-28 13:40:17 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-10-28 13:40:17 +0100
commit546f460d9a682e27d1ad97de1dae1ce3a681c0f6 (patch)
treeb2c06572fae0f6cdba9bd9c84347bd144cc01084 /project
parentf3eefdb687358401965fdd793c3a68507e27aa12 (diff)
parentee009e02a20a94ee6011cf5ddf537722c173e44f (diff)
downloadKamon-546f460d9a682e27d1ad97de1dae1ce3a681c0f6.tar.gz
Kamon-546f460d9a682e27d1ad97de1dae1ce3a681c0f6.tar.bz2
Kamon-546f460d9a682e27d1ad97de1dae1ce3a681c0f6.zip
Merge pull request #269 from cheekychops/logger
= newrelic: Associate logged errors with correct transaction
Diffstat (limited to 'project')
-rw-r--r--project/Dependencies.scala2
-rw-r--r--project/Projects.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a10b3bb2..3b9b7980 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -35,7 +35,7 @@ object Dependencies {
val scalatest = "org.scalatest" %% "scalatest" % "2.2.1"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
val aspectJ = "org.aspectj" % "aspectjweaver" % aspectjVersion
- val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.11.0"
+ val newrelic = "com.newrelic.agent.java" % "newrelic-agent" % "3.11.0"
val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.1.7"
val sprayCan = "io.spray" %% "spray-can" % sprayVersion
val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion
diff --git a/project/Projects.scala b/project/Projects.scala
index 612e832e..7f4558c4 100644
--- a/project/Projects.scala
+++ b/project/Projects.scala
@@ -100,7 +100,7 @@ object Projects extends Build {
.settings(
libraryDependencies ++=
compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, akkaSlf4j) ++
- provided(aspectJ) ++
+ provided(aspectJ, newrelic) ++
test(scalatest, akkaTestKit, sprayTestkit, slf4Api, akkaSlf4j))
@@ -214,7 +214,7 @@ object Projects extends Build {
.settings(formatSettings: _*)
.settings(
libraryDependencies ++=
- compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, akkaSlf4j) ++
+ compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, akkaSlf4j) ++
test(scalatest, akkaTestKit, slf4Api, slf4nop))
lazy val kamonJMXReporter = Project("kamon-jmx", file("kamon-jmx"))