Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove kanela #368

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Remove kanela #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7589d
Remove kanela agent
lenguyenthanh Nov 26, 2024
f08b573
Bump kamon to 2.7.5
lenguyenthanh Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/scala/KamonInitiator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 1 addition & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("."))
Expand Down
2 changes: 1 addition & 1 deletion deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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")
Expand Down
2 changes: 0 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down