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

Add strict evaluation option #738

Merged
merged 3 commits into from
Apr 16, 2023
Merged

Add strict evaluation option #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a6bb28
Add strict evaluation option
ant8e Mar 24, 2023
373a213
Separate lazy and strict implementation
ant8e Mar 26, 2023
8bf2527
Show all log levels enabled in strict implementation & fix typo
ant8e Mar 27, 2023
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
20 changes: 13 additions & 7 deletions noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,19 @@ import cats.Applicative
object NoOpFactory extends LoggerFactoryGenCompanion {
def apply[F[_]: Applicative]: LoggerFactory[F] = impl[F]

def impl[F[_]](implicit F: Applicative[F]): LoggerFactory[F] = new LoggerFactory[F] {
override def getLoggerFromName(name: String): SelfAwareStructuredLogger[F] = {
val _ = name
NoOpLogger.impl[F]
def strictEvalArgs[F[_]: Applicative]: LoggerFactory[F] = impl_[F](evaluateArgs = true)
ant8e marked this conversation as resolved.
Show resolved Hide resolved

def impl[F[_]](implicit F: Applicative[F]): LoggerFactory[F] = impl_[F](evaluateArgs = false)

private def impl_[F[_]](evaluateArgs: Boolean)(implicit F: Applicative[F]): LoggerFactory[F] =
new LoggerFactory[F] {
override def getLoggerFromName(name: String): SelfAwareStructuredLogger[F] = {
val _ = name
NoOpLogger.impl_[F](evaluateArgs)
}

override def fromName(name: String): F[SelfAwareStructuredLogger[F]] =
F.pure(getLoggerFromName(name))
}

override def fromName(name: String): F[SelfAwareStructuredLogger[F]] =
F.pure(getLoggerFromName(name))
}
}
53 changes: 52 additions & 1 deletion noop/shared/src/main/scala/org/typelevel/log4cats/noop/NoOpLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,20 @@ import org.typelevel.log4cats.SelfAwareStructuredLogger

object NoOpLogger {
def apply[F[_]: Applicative]: SelfAwareStructuredLogger[F] = impl[F]
def impl[F[_]: Applicative]: SelfAwareStructuredLogger[F] = new SelfAwareStructuredLogger[F] {

def strictEvalArgs[F[_]: Applicative]: SelfAwareStructuredLogger[F] =
impl_[F](evaluateArgs = true)

def impl[F[_]: Applicative] = impl_[F](evaluateArgs = false)

private[noop] def impl_[F[_]: Applicative](evaluateArgs: Boolean): SelfAwareStructuredLogger[F] =
if (evaluateArgs) strictImpl else lazyImpl

private def lazyImpl[F[_]: Applicative] = new SelfAwareStructuredLogger[F] {

val no: F[Boolean] = Applicative[F].pure(false)
val unit: F[Unit] = Applicative[F].pure(())

@inline override def isTraceEnabled: F[Boolean] = no
@inline override def isDebugEnabled: F[Boolean] = no
@inline override def isInfoEnabled: F[Boolean] = no
Expand Down Expand Up @@ -56,4 +66,45 @@ object NoOpLogger {
@inline override def error(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
unit
}

private def strictImpl[F[_]: Applicative] = new SelfAwareStructuredLogger[F] {

val yes: F[Boolean] = Applicative[F].pure(true)
def void(arg: => Any): F[Unit] = Applicative[F].pure {
val _ = arg
()
}

@inline override def isTraceEnabled: F[Boolean] = yes
@inline override def isDebugEnabled: F[Boolean] = yes
@inline override def isInfoEnabled: F[Boolean] = yes
@inline override def isWarnEnabled: F[Boolean] = yes
@inline override def isErrorEnabled: F[Boolean] = yes
@inline override def trace(t: Throwable)(msg: => String): F[Unit] = void(t)
@inline override def trace(msg: => String): F[Unit] = void(msg)
@inline override def trace(ctx: Map[String, String])(msg: => String): F[Unit] = void(msg)
@inline override def debug(t: Throwable)(msg: => String): F[Unit] = void(msg)
@inline override def debug(msg: => String): F[Unit] = void(msg)
@inline override def debug(ctx: Map[String, String])(msg: => String): F[Unit] = void(msg)
@inline override def info(t: Throwable)(msg: => String): F[Unit] = void(msg)
@inline override def info(msg: => String): F[Unit] = void(msg)
@inline override def info(ctx: Map[String, String])(msg: => String): F[Unit] = void(msg)
@inline override def warn(t: Throwable)(msg: => String): F[Unit] = void(msg)
@inline override def warn(msg: => String): F[Unit] = void(msg)
@inline override def warn(ctx: Map[String, String])(msg: => String): F[Unit] = void(msg)
@inline override def error(t: Throwable)(msg: => String): F[Unit] = void(msg)
@inline override def error(msg: => String): F[Unit] = void(msg)
@inline override def error(ctx: Map[String, String])(msg: => String): F[Unit] = void(msg)
@inline override def trace(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
void(msg)
@inline override def debug(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
void(msg)
@inline override def info(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
void(msg)
@inline override def warn(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
void(msg)
@inline override def error(ctx: Map[String, String], t: Throwable)(msg: => String): F[Unit] =
void(msg)
}

}