diff --git a/ledger/error/src/main/scala/com/daml/error/ContextualizedErrorLogger.scala b/ledger/error/src/main/scala/com/daml/error/ContextualizedErrorLogger.scala index 431aae15a6..655700745b 100644 --- a/ledger/error/src/main/scala/com/daml/error/ContextualizedErrorLogger.scala +++ b/ledger/error/src/main/scala/com/daml/error/ContextualizedErrorLogger.scala @@ -24,11 +24,12 @@ trait ContextualizedErrorLogger { object DamlContextualizedErrorLogger { - def forTesting(clazz: Class[_]) = new DamlContextualizedErrorLogger( - ContextualizedLogger.get(clazz), - LoggingContext.ForTesting, - None, - ) + def forTesting(clazz: Class[_], correlationId: Option[String] = None) = + new DamlContextualizedErrorLogger( + ContextualizedLogger.get(clazz), + LoggingContext.ForTesting, + correlationId, + ) } /** Implementation of [[ContextualizedErrorLogger]] leveraging the //libs-scala/contextualized-logging diff --git a/ledger/error/src/test/suite/scala/com/daml/error/ErrorCodeSpec.scala b/ledger/error/src/test/suite/scala/com/daml/error/ErrorCodeSpec.scala index c3a0de7998..dfeecb07d8 100644 --- a/ledger/error/src/test/suite/scala/com/daml/error/ErrorCodeSpec.scala +++ b/ledger/error/src/test/suite/scala/com/daml/error/ErrorCodeSpec.scala @@ -8,7 +8,6 @@ import com.daml.error.ErrorCategory.TransientServerFailure import com.daml.error.utils.ErrorDetails import com.daml.error.utils.testpackage.SeriousError import com.daml.error.utils.testpackage.subpackage.MildErrorsParent.MildErrors.NotSoSeriousError -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.daml.platform.testing.LogCollector.ExpectedLogEntry import com.daml.platform.testing.{LogCollector, LogCollectorAssertions} import io.grpc.StatusRuntimeException @@ -23,11 +22,9 @@ class ErrorCodeSpec with LogCollectorAssertions with ErrorAssertionsWithLogCollectorAssertions { - implicit private val testLoggingContext: LoggingContext = LoggingContext.ForTesting - private val logger = ContextualizedLogger.get(getClass) private val contextualizedErrorLoggerF = (correlationId: Option[String]) => - new DamlContextualizedErrorLogger(logger, testLoggingContext, correlationId) + DamlContextualizedErrorLogger.forTesting(getClass, correlationId) private val className = classOf[ErrorCode].getSimpleName diff --git a/ledger/error/src/test/utils/scala/com/daml/error/utils/testpackage/subpackage/MildErrorsParent.scala b/ledger/error/src/test/utils/scala/com/daml/error/utils/testpackage/subpackage/MildErrorsParent.scala index 5d4af71426..6fbd397637 100644 --- a/ledger/error/src/test/utils/scala/com/daml/error/utils/testpackage/subpackage/MildErrorsParent.scala +++ b/ledger/error/src/test/utils/scala/com/daml/error/utils/testpackage/subpackage/MildErrorsParent.scala @@ -4,7 +4,6 @@ package com.daml.error.utils.testpackage.subpackage import com.daml.error._ -import com.daml.logging.LoggingContext @Explanation("Mild error parent explanation") object MildErrorsParent extends ErrorGroup()(ErrorClass.root()) { @@ -24,8 +23,7 @@ object MildErrorsParent extends ErrorGroup()(ErrorClass.root()) { someErrArg: String, override val context: Map[String, String], override val definiteAnswerO: Option[Boolean] = Some(true), - )(implicit val loggingContext: LoggingContext) - extends BaseError { + ) extends BaseError { override def code: ErrorCode = NotSoSeriousError.code diff --git a/ledger/ledger-api-client/src/test/suite/scala/com/digitalasset/ledger/client/services/commands/tracker/CompletionResponseTest.scala b/ledger/ledger-api-client/src/test/suite/scala/com/digitalasset/ledger/client/services/commands/tracker/CompletionResponseTest.scala index 3291fdc085..1969f7624e 100644 --- a/ledger/ledger-api-client/src/test/suite/scala/com/digitalasset/ledger/client/services/commands/tracker/CompletionResponseTest.scala +++ b/ledger/ledger-api-client/src/test/suite/scala/com/digitalasset/ledger/client/services/commands/tracker/CompletionResponseTest.scala @@ -8,7 +8,6 @@ import com.daml.grpc.GrpcStatus import com.daml.ledger.api.v1.completion.Completion import com.daml.ledger.client.services.commands.tracker.CompletionResponse._ import com.daml.ledger.grpc.GrpcStatuses -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.google.protobuf.any.Any import com.google.rpc.error_details.{ErrorInfo, RequestInfo} import com.google.rpc.status.Status @@ -72,11 +71,8 @@ class CompletionResponseTest extends AnyWordSpec with Matchers { } "convert to exception" should { - val logger: ContextualizedLogger = ContextualizedLogger.get(getClass) - - implicit val loggingContext: LoggingContext = LoggingContext.ForTesting implicit val contextualizedErrorLogger: ContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, loggingContext, None) + DamlContextualizedErrorLogger.forTesting(getClass) "convert queue completion failure" in { val exception = diff --git a/ledger/ledger-api-common/src/test/suite/scala/com/digitalasset/platform/server/api/validation/ErrorFactoriesSpec.scala b/ledger/ledger-api-common/src/test/suite/scala/com/digitalasset/platform/server/api/validation/ErrorFactoriesSpec.scala index be9543c9d8..1bab24ad0f 100644 --- a/ledger/ledger-api-common/src/test/suite/scala/com/digitalasset/platform/server/api/validation/ErrorFactoriesSpec.scala +++ b/ledger/ledger-api-common/src/test/suite/scala/com/digitalasset/platform/server/api/validation/ErrorFactoriesSpec.scala @@ -19,7 +19,6 @@ import com.daml.error.{ import com.daml.ledger.api.domain.LedgerId import com.daml.ledger.offset.Offset import com.daml.lf.data.Ref -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.daml.platform.server.api.validation.ErrorFactories._ import com.daml.platform.testing.LogCollector.ExpectedLogEntry import com.daml.platform.testing.{LogCollector, LogCollectorAssertions} @@ -47,14 +46,11 @@ class ErrorFactoriesSpec with LogCollectorAssertions with ErrorAssertionsWithLogCollectorAssertions { - private val logger = ContextualizedLogger.get(getClass) - private val loggingContext = LoggingContext.ForTesting - private val originalCorrelationId = "cor-id-12345679" private val truncatedCorrelationId = "cor-id-1" private implicit val contextualizedErrorLogger: ContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, loggingContext, Some(originalCorrelationId)) + DamlContextualizedErrorLogger.forTesting(getClass, Some(originalCorrelationId)) private val expectedCorrelationIdRequestInfo = ErrorDetails.RequestInfoDetail(originalCorrelationId) diff --git a/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/GrpcServerSpec.scala b/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/GrpcServerSpec.scala index 945f9a4a43..455512e0d1 100644 --- a/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/GrpcServerSpec.scala +++ b/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/GrpcServerSpec.scala @@ -12,7 +12,6 @@ import com.daml.grpc.sampleservice.implementations.HelloServiceReferenceImplemen import com.daml.ledger.client.GrpcChannel import com.daml.ledger.client.configuration.LedgerClientChannelConfiguration import com.daml.ledger.resources.{ResourceOwner, TestResourceContext} -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.daml.metrics.Metrics import com.daml.platform.apiserver.GrpcServerSpec._ import com.daml.platform.hello.{HelloRequest, HelloResponse, HelloServiceGrpc} @@ -90,14 +89,12 @@ final class GrpcServerSpec extends AsyncWordSpec with Matchers with TestResource object GrpcServerSpec { - private val logger = ContextualizedLogger.get(getClass) - private val maxInboundMessageSize = 4 * 1024 * 1024 /* copied from the Sandbox configuration */ class TestedHelloService extends HelloServiceReferenceImplementation { override def fails(request: HelloRequest): Future[HelloResponse] = { val errorLogger = - new DamlContextualizedErrorLogger(logger, LoggingContext.newLoggingContext(identity), None) + DamlContextualizedErrorLogger.forTesting(getClass) Future.failed( LedgerApiErrors.RequestValidation.InvalidArgument .Reject(request.payload.toStringUtf8)(errorLogger) diff --git a/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/error/ErrorInterceptorSpec.scala b/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/error/ErrorInterceptorSpec.scala index 5f441118c9..f50b571e97 100644 --- a/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/error/ErrorInterceptorSpec.scala +++ b/ledger/participant-integration-api/src/test/suite/scala/platform/apiserver/error/ErrorInterceptorSpec.scala @@ -23,7 +23,6 @@ import com.daml.grpc.adapter.server.akka.ServerAdapter import com.daml.grpc.sampleservice.HelloServiceResponding import com.daml.ledger.api.testing.utils.AkkaBeforeAndAfterAll import com.daml.ledger.resources.{Resource, ResourceContext, ResourceOwner, TestResourceContext} -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.daml.platform.apiserver.services.GrpcClientResource import com.daml.platform.hello.HelloServiceGrpc.HelloService import com.daml.platform.hello.{HelloRequest, HelloResponse, HelloServiceGrpc} @@ -252,11 +251,8 @@ object ErrorInterceptorSpec { trait HelloService_Base extends BindableService { self: HelloService => - private val logger = ContextualizedLogger.get(getClass) - private val emptyLoggingContext = LoggingContext.newLoggingContext(identity) - implicit protected val damlLogger: DamlContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, emptyLoggingContext, None) + DamlContextualizedErrorLogger.forTesting(getClass) override def bindService(): ServerServiceDefinition = HelloServiceGrpc.bindService(this, scala.concurrent.ExecutionContext.Implicits.global) diff --git a/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/ConversionsSpec.scala b/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/ConversionsSpec.scala index 5666125158..84867ba93e 100644 --- a/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/ConversionsSpec.scala +++ b/ledger/participant-state/kvutils/src/test/suite/scala/com/daml/ledger/participant/state/kvutils/ConversionsSpec.scala @@ -31,7 +31,6 @@ import com.daml.lf.kv.contracts.RawContractInstance import com.daml.lf.transaction.{BlindingInfo, NodeId, TransactionOuterClass, TransactionVersion} import com.daml.lf.value.Value.ContractId import com.daml.lf.value.ValueOuterClass -import com.daml.logging.{ContextualizedLogger, LoggingContext} import com.google.rpc.error_details.{ErrorInfo, ResourceInfo} import io.grpc.Status.Code import org.scalatest.OptionValues @@ -46,10 +45,8 @@ import scala.jdk.CollectionConverters._ @nowarn("msg=deprecated") class ConversionsSpec extends AnyWordSpec with Matchers with OptionValues { - implicit private val testLoggingContext: LoggingContext = LoggingContext.ForTesting - private val logger = ContextualizedLogger.get(getClass) implicit private val errorLoggingContext: DamlContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, testLoggingContext, None) + DamlContextualizedErrorLogger.forTesting(getClass) "Conversions" should { "correctly and deterministically encode Blindinginfo" in { diff --git a/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/ConflictCheckWithCommittedSpec.scala b/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/ConflictCheckWithCommittedSpec.scala index 05d3d0da1b..669b3f8878 100644 --- a/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/ConflictCheckWithCommittedSpec.scala +++ b/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/ConflictCheckWithCommittedSpec.scala @@ -21,7 +21,7 @@ import com.daml.lf.transaction.test.TransactionBuilder import com.daml.lf.transaction.{BlindingInfo, GlobalKey, Transaction} import com.daml.lf.value.Value import com.daml.lf.value.Value.ContractId -import com.daml.logging.{ContextualizedLogger, LoggingContext} +import com.daml.logging.LoggingContext import com.daml.metrics.Metrics import org.mockito.{ArgumentMatchersSugar, MockitoSugar} import org.scalatest.FixtureContext @@ -147,12 +147,10 @@ class ConflictCheckWithCommittedSpec } private class TestContext extends FixtureContext { - implicit val logger: ContextualizedLogger = - ContextualizedLogger.get(getClass) implicit val loggingContext: LoggingContext = LoggingContext.ForTesting implicit val contextualizedErrorLogger: ContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, loggingContext, None) + DamlContextualizedErrorLogger.forTesting(getClass) val indexServiceMock: IndexService = mock[IndexService] diff --git a/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/PrepareSubmissionSpec.scala b/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/PrepareSubmissionSpec.scala index ef9a5a5ec7..2889ddc4aa 100644 --- a/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/PrepareSubmissionSpec.scala +++ b/ledger/sandbox-on-x/src/test/suite/scala/com/daml/ledger/sandbox/bridge/validate/PrepareSubmissionSpec.scala @@ -21,7 +21,7 @@ import com.daml.lf.transaction.test.TransactionBuilder import com.daml.lf.transaction.{GlobalKey, SubmittedTransaction} import com.daml.lf.value.Value import com.daml.lf.value.Value.{ContractId, ValueNil} -import com.daml.logging.{ContextualizedLogger, LoggingContext} +import com.daml.logging.LoggingContext import com.daml.metrics.Metrics import org.mockito.MockitoSugar.mock import org.scalatest.flatspec.AsyncFlatSpec @@ -31,9 +31,8 @@ import java.time.Duration class PrepareSubmissionSpec extends AsyncFlatSpec with Matchers { private implicit val loggingContext: LoggingContext = LoggingContext.ForTesting - private val logger = ContextualizedLogger.get(getClass) private implicit val errorLogger: ContextualizedErrorLogger = - new DamlContextualizedErrorLogger(logger, loggingContext, None) + DamlContextualizedErrorLogger.forTesting(getClass) private val prepareSubmission = new PrepareSubmissionImpl( new BridgeMetrics(new Metrics(new MetricRegistry))