misc(coordinator): move kamon.init() to top

filodb · Sep 12, 2020 · 5104243 · 5104243
1 parent d0232bc
commit 5104243
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/coordinator/src/main/scala/filodb.coordinator/FilodbCluster.scala b/coordinator/src/main/scala/filodb.coordinator/FilodbCluster.scala
@@ -238,12 +238,14 @@ final class FilodbCluster(val system: ExtendedActorSystem, overrideConfig: Confi
 
 }
 
+private[filodb] trait KamonInit {
+  Kamon.init()
+}
+
 /** Mixin for easy usage of the FiloDBCluster Extension.
   * Used by all `ClusterRole` nodes starting an ActorSystem and FiloDB Cluster nodes.
   */
-private[filodb] trait FilodbClusterNode extends NodeConfiguration with StrictLogging {
-  Kamon.init()
-
+private[filodb] trait FilodbClusterNode extends NodeConfiguration with StrictLogging with KamonInit {
   def role: ClusterRole
 
   /** Override to pass in additional module config. */

diff --git a/coordinator/src/test/scala/filodb.coordinator/FilodbClusterNodeSpec.scala b/coordinator/src/test/scala/filodb.coordinator/FilodbClusterNodeSpec.scala
@@ -34,7 +34,7 @@ trait SocketChecker {
   }
 }
 
-trait FilodbClusterNodeSpec extends AbstractSpec with FilodbClusterNode with ScalaFutures {
+trait FilodbClusterNodeSpec extends AbstractSpec with ScalaFutures with FilodbClusterNode {
   val port = 22552 + util.Random.nextInt(200)
 
   // Ensure that CoordinatedShutdown does not shutdown the whole test JVM, otherwise Travis CI/CD fails