Merge pull request #972 from SimunKaracic/update-kanela-agent

Update kanela agent
kamon-io · Mar 30, 2021 · 7339c32 · 7339c32
2 parents e4244bd + 7ef1830
commit 7339c32
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -620,7 +620,7 @@ val `kamon-bundle` = (project in file("bundle/kamon-bundle"))
   .enablePlugins(AssemblyPlugin)
   .settings(
     moduleName := "kamon-bundle",
-    kanelaAgentVersion := "1.0.7",
+    kanelaAgentVersion := "1.0.9",
     buildInfoPackage := "kamon.bundle",
     buildInfoKeys := Seq[BuildInfoKey](kanelaAgentJarName),
     kanelaAgentJar := update.value.matching(Modules.exactFilter(kanelaAgent)).head,

diff --git a/instrumentation/kamon-akka/src/common/resources/reference.conf b/instrumentation/kamon-akka/src/common/resources/reference.conf
@@ -98,7 +98,7 @@ kamon.instrumentation.akka {
     # Decides which routers should have metric tracking enabled.
     #
     routers {
-      includes = [ ]
+      includes = [ "**" ]
       excludes = [ ]
     }
 

diff --git a/instrumentation/kamon-logback/src/main/resources/reference.conf b/instrumentation/kamon-logback/src/main/resources/reference.conf
@@ -36,8 +36,8 @@ kamon.instrumentation.logback {
 kanela.modules {
   logback {
     # Controls kanela loading order
-    # a setting of 0 ensures that it's loaded as soon as possible
-    order = 0
+    # a setting of 1 ensures that it's loaded as soon as possible
+    order = 2
     name = "Logback Instrumentation"
     description = "Provides context propagation to the MDC and on AsyncAppenders"
 

diff --git a/instrumentation/kamon-scala-future/src/main/resources/reference.conf b/instrumentation/kamon-scala-future/src/main/resources/reference.conf
@@ -24,6 +24,7 @@ kanela.modules {
 
   scala-future {
     name = "Scala Future Intrumentation"
+    order = 1
     description = "Provides automatic context propagation to the thread executing a Scala Future's body and callbacks"
     instrumentations = [
       "kamon.instrumentation.futures.scala.FutureChainingInstrumentation"
@@ -34,4 +35,4 @@ kanela.modules {
       "scala.util.*",
     ]
   }
-}
+}
diff --git a/project/Build.scala b/project/Build.scala
@@ -27,7 +27,7 @@ object BaseProject extends AutoPlugin {
     /** Marker configuration for dependencies that will be shaded into their module's jar.  */
     lazy val Shaded = config("shaded").hide
 
-    val kanelaAgent       = "io.kamon"              %  "kanela-agent"    % "1.0.7"
+    val kanelaAgent       = "io.kamon"              %  "kanela-agent"    % "1.0.9"
     val slf4jApi          = "org.slf4j"             %  "slf4j-api"       % "1.7.25"
     val slf4jnop          = "org.slf4j"             %  "slf4j-nop"       % "1.7.24"
     val logbackClassic    = "ch.qos.logback"        %  "logback-classic" % "1.2.3"