diff --git a/conf/application.conf b/app/src/main/resources/application.conf similarity index 76% rename from conf/application.conf rename to app/src/main/resources/application.conf index 0db9a32..004ccce 100644 --- a/conf/application.conf +++ b/app/src/main/resources/application.conf @@ -1,12 +1,12 @@ -http.port = 9665 -redis.uri = "redis://127.0.0.1" - kamon { enabled = false environment.service = "lila-fishnet" metric.tick-interval = 60 seconds influxdb { - hostname = "" + authentication { + token = "NCnPKbCqXinm46K86lVfIhwXD1_BaJaRaftNeqNWB6-34X2YUMNbZT6DnT3RtJgnFoaY7lyRrO_NGJFAteRP2g==" + } + hostname = "127.0.0.1" port = 8086 database = "kamon" percentiles = [50.0, 75.0, 90.0, 95.0, 99.0, 99.9] diff --git a/app/src/main/scala/App.scala b/app/src/main/scala/App.scala index 7676f46..21d54a9 100644 --- a/app/src/main/scala/App.scala +++ b/app/src/main/scala/App.scala @@ -16,6 +16,7 @@ object App extends IOApp.Simple: def app: Resource[IO, Unit] = for + _ <- Resource.eval(KamonInitiator.apply.init) config <- Resource.eval(Config.load) _ <- Resource.eval(Logger[IO].info(s"Starting lila-fishnet with config: $config")) res <- AppResources.instance(config.redis) diff --git a/app/src/main/scala/http/Kamon.scala b/app/src/main/scala/http/Kamon.scala new file mode 100644 index 0000000..77ea9b1 --- /dev/null +++ b/app/src/main/scala/http/Kamon.scala @@ -0,0 +1,11 @@ +package lila.fishnet + +import cats.effect.IO +import kamon.Kamon + +trait KamonInitiator: + def init: IO[Unit] + +object KamonInitiator: + def apply: KamonInitiator = new KamonInitiator: + def init: IO[Unit] = IO(Kamon.init()) diff --git a/build.sbt b/build.sbt index 1bb9414..5dc37cb 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,6 @@ lazy val app = project kamonCore, kamonInflux, kamonSystemMetrics, - // kamonHttp4s, log4Cats, logback, redis, diff --git a/conf/logback.xml b/conf/logback.xml deleted file mode 100644 index b8b5f27..0000000 --- a/conf/logback.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - logs/application.log - - %date [%level] from %logger in %thread - %message%n%xException - - - - - - %coloredLevel %logger{15} - %message%n%xException{10} - - - - - - - - - - - - - - - - - - - diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1093890..518207f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val http4s = "0.23.23" val ciris = "3.4.0" val kamon = "2.5.11" - val kamonHttp4s = "2.6.6" + val kamonHttp4s = "2.6.1" val chess = "15.6.11" val munit = "1.0.0-M8" } @@ -39,7 +39,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 kamonHttp4s = "io.kamon" %% "kamon-http4s" % V.kamonHttp4s val http4sDsl = http4s("dsl") val http4sServer = http4s("ember-server") diff --git a/project/plugins.sbt b/project/plugins.sbt index 07654b1..c6cc4e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,3 +2,4 @@ addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.19.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("nl.gn0s1s" % "sbt-dotenv" % "3.0.0") +addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.14")