Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import io.micrometer.core.instrument.MeterRegistry
import org.http4s.HttpRoutes
import org.http4s.server.middleware.Metrics

class MicrometerHttp4sServerMetricsModule[F[_]: Sync](val serverMetrics: HttpRoutes[F] => HttpRoutes[F], val routeMetrics: RouteMetrics[F])
class MicrometerHttp4sServerMetricsModule[F[_]](val serverMetrics: HttpRoutes[F] => HttpRoutes[F], val routeMetrics: RouteMetrics[F])

object MicrometerHttp4sServerMetricsModule {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object CircuitBreakerModule {
}

/** Wraps [[monix.catnap.CircuitBreaker]] and adds monitoring metrics (e.g. number of rejected tasks). */
def withMetrics[F[_]: Sync](circuitBreakerMetrics: CircuitBreakerMetrics[F], circuitBreaker: CircuitBreaker[F]): CircuitBreaker[F] = {
def withMetrics[F[_]](circuitBreakerMetrics: CircuitBreakerMetrics[F], circuitBreaker: CircuitBreaker[F]): CircuitBreaker[F] = {
circuitBreaker
.doOnRejectedTask(circuitBreakerMetrics.increaseRejected)
.doOnClosed(circuitBreakerMetrics.setState(Closed))
Expand Down
7 changes: 3 additions & 4 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import com.typesafe.sbt.site.SitePlugin.autoImport._
import com.typesafe.tools.mima.plugin.MimaKeys._
import mdoc.MdocPlugin.autoImport._
import microsites.CdnDirectives
import microsites.MicrositesPlugin.autoImport._
Expand All @@ -23,7 +22,7 @@ object BuildSettings {
description := "Functional programming toolkit for building server applications in Scala.",
licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE")),
developers := List(Developer("jakubjanecek", "Jakub Janecek", "janecek@avast.com", url("https://www.avast.com"))),
scalaVersion := "2.13.3",
scalaVersion := "2.13.5",
crossScalaVersions := List(scalaVersion.value, "2.12.13"),
fork := true,
libraryDependencies ++= Seq(
Expand All @@ -41,10 +40,10 @@ object BuildSettings {
Dependencies.scalafixScaluzzi,
Dependencies.scalafixOrganizeImports
),
scalacOptions ++= Seq(
scalacOptions ++= List(
"-Ywarn-unused", // necessary for Scalafix RemoveUnused rule (not present in sbt-tpolecat for 2.13)
"-P:silencer:checkUnused"
),
) ++ (if (scalaVersion.value.startsWith("2.13")) List("-Wmacros:after") else List.empty),
Test / publishArtifact := false
)

Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ object Dependencies {
val micrometerJmx = "1.6.4"
val micrometerStatsD = "1.6.4"
val monix = "3.3.0"
val silencer = "1.7.1"
val silencer = "1.7.3"

}

Expand Down