Merge pull request #368 from lichess-org/remove-kanela

Remove kanela
lichess-org · Nov 26, 2024 · b1bddcb · b1bddcb
2 parents 473858a + f08b573
commit b1bddcb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/app/src/main/scala/KamonInitiator.scala b/app/src/main/scala/KamonInitiator.scala
@@ -9,4 +9,4 @@ trait KamonInitiator:
 object KamonInitiator:
   def apply(): KamonInitiator = new:
     def init(config: KamonConfig): IO[Unit] =
-      IO.blocking(kamon.Kamon.init()).whenA(config.enabled)
+      IO.blocking(kamon.Kamon.initWithoutAttaching()).whenA(config.enabled)
diff --git a/build.sbt b/build.sbt
@@ -55,12 +55,11 @@ lazy val app = project
       http4sClient,
       catsEffectTestKit
     ),
-    javaAgents += kamonAgent,
     Docker / packageName      := "lichess-org/lila-fishnet",
     Docker / maintainer       := "lichess.org",
     Docker / dockerRepository := Some("ghcr.io")
   )
-  .enablePlugins(JavaAppPackaging, JavaAgent, DockerPlugin)
+  .enablePlugins(JavaAppPackaging, DockerPlugin)
 
 lazy val root = project
   .in(file("."))

diff --git a/deploy.sh b/deploy.sh
@@ -25,7 +25,7 @@ RSYNC_OPTIONS=" \
   --exclude '.git/'"
 
 stage="app/target/universal/stage"
-include="$stage/bin $stage/kanela-agent $stage/lib"
+include="$stage/bin $stage/lib"
 rsync_command="rsync $RSYNC_OPTIONS $include $REMOTE:$REMOTE_DIR"
 echo "$rsync_command"
 $rsync_command

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -8,8 +8,7 @@ object Dependencies {
     val circe      = "0.14.10"
     val http4s     = "0.23.29"
     val ciris      = "3.6.0"
-    val kamon      = "2.5.11"
-    val kamonAgent = "1.0.18"
+    val kamon      = "2.7.5"
     val chess      = "16.3.3"
     val catsEffect = "3.5.6"
   }
@@ -36,7 +35,6 @@ object Dependencies {
   val kamonCore          = "io.kamon" %% "kamon-core"           % V.kamon
   val kamonInflux        = "io.kamon" %% "kamon-influxdb"       % V.kamon
   val kamonSystemMetrics = "io.kamon" %% "kamon-system-metrics" % V.kamon
-  val kamonAgent         = "io.kamon"  % "kanela-agent"         % V.kamonAgent
 
   val http4sDsl    = http4s("dsl")
   val http4sServer = http4s("ember-server")

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,4 @@
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
-addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % "0.1.8")
-addSbtPlugin("io.kamon"       % "sbt-kanela-runner"   % "2.1.0")
 addSbtPlugin("org.scalameta"  % "sbt-scalafmt"        % "2.5.2")
 addSbtPlugin("org.typelevel"  % "sbt-tpolecat"        % "0.5.2")
 addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix"        % "0.13.0")