digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-17 15:57:21 +03:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary dependency (#17016)

Browse Source
This commit is contained in:
Stefano Baghino 2023-06-19 12:24:33 +02:00 committed by GitHub
parent 669485827d
commit 479655a1f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs-scala/contextualized-logging/BUILD.bazel
View File

@ -21,10 +21,8 @@ da_scala_library(
"//visibility:public",
],
deps = [
"//libs-scala/grpc-utils",
"//libs-scala/logging-entries",
"@maven//:com_fasterxml_jackson_core_jackson_core",
"@maven//:io_grpc_grpc_api",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_slf4j_slf4j_api",
],

45
libs-scala/contextualized-logging/src/main/scala/com/digitalasset/logging/ContextualizedLogger.scala
View File

@ -5,14 +5,9 @@ package com.daml.logging
import akka.NotUsed
import akka.stream.scaladsl.Flow
import com.daml.grpc.GrpcException
import com.daml.logging.entries.LoggingEntries
import io.grpc.Status
import org.slf4j.{Logger, LoggerFactory}
import scala.collection.concurrent.TrieMap
import scala.util.{Failure, Try}
import scala.util.control.NonFatal
object ContextualizedLogger {
@ -44,35 +39,6 @@ final class ContextualizedLogger private (val withoutContext: Logger) {
val warn = new LeveledLogger.Warn(withoutContext)
val error = new LeveledLogger.Error(withoutContext)
private def internalOrUnknown(code: Status.Code): Boolean =
code == Status.Code.INTERNAL || code == Status.Code.UNKNOWN
private def logError(t: Throwable)(implicit loggingContext: LoggingContext): Unit =
error("Unhandled internal error", t)
def logErrorsOnCall[Out](implicit
loggingContext: LoggingContext
): PartialFunction[Try[Out], Unit] = {
case Failure(e @ GrpcException(s, _)) =>
if (internalOrUnknown(s.getCode)) {
logError(e)
}
case Failure(NonFatal(e)) =>
logError(e)
}
def logErrorsOnStream[Out](implicit loggingContext: LoggingContext): Flow[Out, Out, NotUsed] =
Flow[Out].mapError {
case e @ GrpcException(s, _) =>
if (internalOrUnknown(s.getCode)) {
logError(e)
}
e
case NonFatal(e) =>
logError(e)
e
}
def debugStream[Out](
toLoggable: Out => String
)(implicit loggingContext: LoggingContext): Flow[Out, Out, NotUsed] =
@ -81,15 +47,4 @@ final class ContextualizedLogger private (val withoutContext: Logger) {
item
}
def enrichedDebugStream[Out](
msg: String,
withContext: Out => LoggingEntries,
)(implicit loggingContext: LoggingContext): Flow[Out, Out, NotUsed] =
Flow[Out].map { item =>
LoggingContext.withEnrichedLoggingContextFrom(withContext(item)) { implicit loggingContext =>
debug(msg)
item
}
}
}