digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

contextualized-logging: Move to its own Bazel package. (#4138)

Browse Source 
I want to use this in _ledger/ledger-on-sql_, which doesn't depend
directly on Sandbox.

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Samir Talwar 2020-01-21 14:25:06 +01:00 committed by GitHub
parent ca3da8ac7c
commit e2a5b26475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 130 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ledger/api-server-damlonx/reference-v2/BUILD.bazel
View File

@ -45,6 +45,7 @@ da_scala_binary(
"//ledger/participant-state",
"//ledger/participant-state/kvutils",
"//ledger/sandbox",
"//libs-scala/contextualized-logging",
"//libs-scala/resources",
"//libs-scala/resources-akka",
"@maven//:com_github_scopt_scopt_2_12",
@ -77,6 +78,7 @@ da_scala_test(
"//ledger/participant-state/kvutils:kvutils-tests-lib",
"//ledger/sandbox",
"//ledger/test-common",
"//libs-scala/contextualized-logging",
"//libs-scala/resources",
"//libs-scala/timer-utils",
"@maven//:ch_qos_logback_logback_classic",

4
ledger/api-server-damlonx/reference-v2/src/main/scala/com/daml/ledger/api/server/damlonx/reference/v2/ReferenceServer.scala
View File

@ -13,10 +13,10 @@ import com.daml.ledger.participant.state.v1.{ReadService, SubmissionId, WriteSer
import com.digitalasset.daml.lf.archive.DarReader
import com.digitalasset.daml_lf_dev.DamlLf.Archive
import com.digitalasset.ledger.api.auth.{AuthService, AuthServiceWildcard}
import com.digitalasset.logging.LoggingContext
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.apiserver.{ApiServerConfig, StandaloneApiServer}
import com.digitalasset.platform.indexer.{IndexerConfig, StandaloneIndexerServer}
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import com.digitalasset.resources.akka.AkkaResourceOwner
import com.digitalasset.resources.{Resource, ResourceOwner}
import org.slf4j.LoggerFactory

4
ledger/api-server-damlonx/reference-v2/src/test/suite/scala/com/daml/ledger/api/server/damlonx/reference/v2/IndexerIT.scala
View File

@ -15,16 +15,16 @@ import com.daml.ledger.participant.state.v1.Update.Heartbeat
import com.daml.ledger.participant.state.v1._
import com.digitalasset.daml.lf.data.Ref
import com.digitalasset.daml.lf.data.Ref.LedgerString
import com.digitalasset.logging.LoggingContext
import com.digitalasset.platform.indexer.{
IndexerConfig,
IndexerStartupMode,
RecoveringIndexer,
StandaloneIndexerServer
}
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.resources.Resource
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.{JdbcLedgerDao, LedgerDao}
import com.digitalasset.platform.testing.LogCollector
import com.digitalasset.resources.Resource
import com.digitalasset.timer.RetryStrategy
import org.mockito.ArgumentMatchers
import org.mockito.Mockito._

1
ledger/participant-state/kvutils/app/BUILD.bazel
View File

@ -34,6 +34,7 @@ da_scala_library(
"//ledger/participant-state",
"//ledger/participant-state/kvutils",
"//ledger/sandbox",
"//libs-scala/contextualized-logging",
"//libs-scala/resources",
"//libs-scala/resources-akka",
"@maven//:com_github_scopt_scopt_2_12",

4
ledger/participant-state/kvutils/app/src/main/scala/com/daml/ledger/participant/state/kvutils/app/Runner.scala
View File

@ -14,17 +14,17 @@ import com.digitalasset.api.util.TimeProvider
import com.digitalasset.daml.lf.archive.DarReader
import com.digitalasset.daml_lf_dev.DamlLf.Archive
import com.digitalasset.ledger.api.auth.{AuthService, AuthServiceWildcard}
import com.digitalasset.logging.LoggingContext
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.apiserver.{ApiServerConfig, StandaloneApiServer}
import com.digitalasset.platform.indexer.{
IndexerConfig,
IndexerStartupMode,
StandaloneIndexerServer
}
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.resources.akka.AkkaResourceOwner
import com.digitalasset.resources.{Resource, ResourceOwner}
import org.slf4j.LoggerFactory
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import scala.concurrent.duration.DurationInt
import scala.concurrent.{Await, ExecutionContext}

15
ledger/sandbox/BUILD.bazel
View File

@ -54,8 +54,8 @@ da_scala_library(
"//ledger/ledger-api-health",
"//ledger/participant-state",
"//ledger/participant-state-index",
"//libs-scala/contextualized-logging",
"//libs-scala/direct-execution-context",
"//libs-scala/grpc-utils",
"//libs-scala/resources",
"//libs-scala/resources-akka",
"@maven//:ch_qos_logback_logback_classic",
@ -78,7 +78,6 @@ da_scala_library(
"@maven//:io_netty_netty_handler",
"@maven//:io_netty_netty_transport",
"@maven//:io_zipkin_brave_brave",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_flywaydb_flyway_core",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_12",
"@maven//:org_scalaz_scalaz_core_2_12",
@ -131,8 +130,8 @@ da_scala_library(
"//ledger/ledger-api-health",
"//ledger/participant-state",
"//ledger/participant-state-index",
"//libs-scala/contextualized-logging",
"//libs-scala/direct-execution-context",
"//libs-scala/grpc-utils",
"//libs-scala/resources",
"//libs-scala/resources-akka",
"@maven//:ch_qos_logback_logback_classic",
@ -155,7 +154,6 @@ da_scala_library(
"@maven//:io_netty_netty_handler",
"@maven//:io_netty_netty_transport",
"@maven//:io_zipkin_brave_brave",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_flywaydb_flyway_core",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_12",
"@maven//:org_scalaz_scalaz_core_2_12",
@ -260,6 +258,7 @@ da_scala_library(
"//ledger/ledger-api-health",
"//ledger/participant-state",
"//ledger/test-common",
"//libs-scala/contextualized-logging",
"//libs-scala/direct-execution-context",
"//libs-scala/grpc-utils",
"//libs-scala/resources",
@ -316,26 +315,22 @@ da_scala_test_suite(
"//ledger/participant-state",
"//ledger/participant-state-index",
"//ledger/test-common",
"//libs-scala/contextualized-logging",
"//libs-scala/direct-execution-context",
"//libs-scala/grpc-utils",
"//libs-scala/resources",
"//libs-scala/timer-utils",
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_chuusai_shapeless_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_stream_testkit_2_12",
"@maven//:com_typesafe_akka_akka_testkit_2_12",
"@maven//:com_typesafe_config",
"@maven//:commons_io_commons_io",
"@maven//:io_circe_circe_core_2_12",
"@maven//:io_circe_circe_generic_2_12",
"@maven//:io_circe_circe_parser_2_12",
"@maven//:io_dropwizard_metrics_metrics_core",
"@maven//:io_grpc_grpc_services",
"@maven//:io_netty_netty_handler",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_awaitility_awaitility",
"@maven//:org_flywaydb_flyway_core",
"@maven//:org_mockito_mockito_core",
@ -345,8 +340,6 @@ da_scala_test_suite(
"@maven//:org_scalatest_scalatest_2_12",
"@maven//:org_scalaz_scalaz_core_2_12",
"@maven//:org_slf4j_slf4j_api",
"@maven//:org_typelevel_cats_core_2_12",
"@maven//:org_typelevel_cats_kernel_2_12",
],
)

8
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/ApiServices.scala
View File

@ -26,6 +26,7 @@ import com.digitalasset.ledger.api.auth.services._
import com.digitalasset.ledger.api.health.HealthChecks
import com.digitalasset.ledger.api.v1.command_completion_service.CompletionEndRequest
import com.digitalasset.ledger.client.services.commands.CommandSubmissionFlow
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.apiserver.services.admin.{
ApiConfigManagementService,
ApiPackageManagementService,
@ -35,17 +36,16 @@ import com.digitalasset.platform.apiserver.services.transaction.ApiTransactionSe
import com.digitalasset.platform.apiserver.services.{
ApiActiveContractsService,
ApiCommandCompletionService,
ApiCommandService,
ApiLedgerConfigurationService,
ApiLedgerIdentityService,
ApiPackageService,
ApiSubmissionService
ApiSubmissionService,
ApiTimeService
}
import com.digitalasset.platform.sandbox.config.CommandConfiguration
import com.digitalasset.platform.sandbox.stores.ledger.CommandExecutorImpl
import com.digitalasset.platform.server.api.services.grpc.GrpcHealthService
import com.digitalasset.platform.apiserver.services.ApiCommandService
import com.digitalasset.platform.apiserver.services.ApiTimeService
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import io.grpc.BindableService
import io.grpc.protobuf.services.ProtoReflectionService
import scalaz.syntax.tag._

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/JdbcIndex.scala
View File

@ -12,7 +12,7 @@ import com.daml.ledger.participant.state.index.v2.IndexService
import com.daml.ledger.participant.state.v1.{ParticipantId, ReadService}
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.ledger.api.domain.{ParticipantId => _, _}
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.logging.LoggingContext
import com.digitalasset.platform.sandbox.stores.LedgerBackedIndexService
import com.digitalasset.platform.sandbox.stores.ledger.{
Ledger,

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/LedgerApiServer.scala
View File

@ -12,7 +12,7 @@ import akka.actor.ActorSystem
import akka.stream.Materializer
import com.codahale.metrics.MetricRegistry
import com.digitalasset.grpc.adapter.{AkkaExecutionSequencerPool, ExecutionSequencerFactory}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.resources.{Resource, ResourceOwner}
import io.grpc.netty.NettyServerBuilder
import io.grpc.{Server, ServerInterceptor}

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/StandaloneApiServer.scala
View File

@ -18,8 +18,8 @@ import com.digitalasset.ledger.api.auth.interceptor.AuthorizationInterceptor
import com.digitalasset.ledger.api.auth.{AuthService, Authorizer}
import com.digitalasset.ledger.api.domain
import com.digitalasset.ledger.api.health.HealthChecks
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.apiserver.StandaloneApiServer._
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.BuildInfo
import com.digitalasset.platform.sandbox.config.SandboxConfig
import com.digitalasset.platform.sandbox.stores.InMemoryPackageStore

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiActiveContractsService.scala
View File

@ -10,15 +10,15 @@ import com.daml.ledger.participant.state.index.v2.{
ActiveContractSetSnapshot,
IndexActiveContractsService => ACSBackend
}
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.v1.active_contracts_service.ActiveContractsServiceGrpc.ActiveContractsService
import com.digitalasset.ledger.api.v1.active_contracts_service._
import com.digitalasset.ledger.api.v1.event.CreatedEvent
import com.digitalasset.ledger.api.validation.TransactionFilterValidator
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.participant.util.LfEngineToApi
import com.digitalasset.platform.server.api.validation.ActiveContractsServiceValidation
import io.grpc.{BindableService, ServerServiceDefinition}

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiCommandCompletionService.scala
View File

@ -9,15 +9,15 @@ import akka.NotUsed
import akka.stream.Materializer
import akka.stream.scaladsl.Source
import com.daml.ledger.participant.state.index.v2.IndexCompletionsService
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain
import com.digitalasset.ledger.api.domain.{CompletionEvent, LedgerId, LedgerOffset}
import com.digitalasset.ledger.api.messages.command.completion.CompletionStreamRequest
import com.digitalasset.ledger.api.v1.command_completion_service._
import com.digitalasset.ledger.api.validation.PartyNameChecker
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.services.domain.CommandCompletionService
import com.digitalasset.platform.server.api.services.grpc.GrpcCommandCompletionService
import io.grpc.ServerServiceDefinition

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiCommandService.scala
View File

@ -26,10 +26,10 @@ import com.digitalasset.ledger.client.services.commands.{
CommandCompletionSource,
CommandTrackerFlow
}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.platform.apiserver.services.tracking.{TrackerImpl, TrackerMap}
import com.digitalasset.platform.apiserver.services.ApiCommandService.LowLevelCommandServiceAccess
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.apiserver.services.tracking.{TrackerImpl, TrackerMap}
import com.digitalasset.platform.server.api.ApiException
import com.digitalasset.platform.server.api.services.grpc.GrpcCommandService
import com.digitalasset.util.Ctx

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiLedgerConfigurationService.scala
View File

@ -8,12 +8,12 @@ import akka.stream.Materializer
import akka.stream.scaladsl.Source
import com.daml.ledger.participant.state.index.v2.IndexConfigurationService
import com.digitalasset.api.util.DurationConversion._
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.v1.ledger_configuration_service._
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation.LedgerConfigurationServiceValidation
import io.grpc.{BindableService, ServerServiceDefinition}

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiLedgerIdentityService.scala
View File

@ -13,8 +13,8 @@ import com.digitalasset.ledger.api.v1.ledger_identity_service.{
GetLedgerIdentityResponse,
LedgerIdentityServiceGrpc
}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.ApiException
import io.grpc.{BindableService, ServerServiceDefinition, Status}
import scalaz.syntax.tag._

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiPackageService.scala
View File

@ -6,6 +6,7 @@ package com.digitalasset.platform.apiserver.services
import com.daml.ledger.participant.state.index.v2.IndexPackagesService
import com.digitalasset.daml.lf.data.Ref
import com.digitalasset.daml_lf_dev.DamlLf.{Archive, HashFunction}
import com.digitalasset.dec.{DirectExecutionContext => DEC}
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.v1.package_service.HashFunction.{
SHA256 => APISHA256,
@ -13,9 +14,8 @@ import com.digitalasset.ledger.api.v1.package_service.HashFunction.{
}
import com.digitalasset.ledger.api.v1.package_service.PackageServiceGrpc.PackageService
import com.digitalasset.ledger.api.v1.package_service.{HashFunction => APIHashFunction, _}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.{DirectExecutionContext => DEC}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation.PackageServiceValidation
import io.grpc.{BindableService, ServerServiceDefinition, Status}

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiSubmissionService.scala
View File

@ -20,15 +20,15 @@ import com.daml.ledger.participant.state.v1.{
WriteService
}
import com.digitalasset.api.util.TimeProvider
import com.digitalasset.platform.logging.LoggingContext.withEnrichedLoggingContext
import com.digitalasset.daml.lf.engine.{Error => LfError}
import com.digitalasset.daml.lf.transaction.Transaction.Transaction
import com.digitalasset.daml.lf.transaction.{BlindingInfo, Transaction}
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.ledger.api.domain.{LedgerId, Commands => ApiCommands}
import com.digitalasset.ledger.api.messages.command.submission.SubmitRequest
import com.digitalasset.logging.LoggingContext.withEnrichedLoggingContext
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.metrics.timedFuture
import com.digitalasset.platform.sandbox.stores.ledger.{CommandExecutor, ErrorCause}
import com.digitalasset.platform.server.api.services.domain.CommandSubmissionService

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/ApiTimeService.scala
View File

@ -14,10 +14,10 @@ import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.v1.testing.time_service.TimeServiceGrpc.TimeService
import com.digitalasset.ledger.api.v1.testing.time_service._
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.akkastreams.dispatcher.SignalDispatcher
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.platform.apiserver.TimeServiceBackend
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation.FieldValidations
import com.google.protobuf.empty.Empty
import io.grpc.{ServerServiceDefinition, Status, StatusRuntimeException}

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/admin/ApiConfigManagementService.scala
View File

@ -15,12 +15,12 @@ import com.daml.ledger.participant.state.v1.{
}
import com.digitalasset.api.util.{DurationConversion, TimeProvider, TimestampConversion}
import com.digitalasset.daml.lf.data.Time
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.ledger.api.domain
import com.digitalasset.ledger.api.v1.admin.config_management_service.ConfigManagementServiceGrpc.ConfigManagementService
import com.digitalasset.ledger.api.v1.admin.config_management_service._
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation
import com.digitalasset.platform.server.api.validation.ErrorFactories
import io.grpc.{ServerServiceDefinition, StatusRuntimeException}

14
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/admin/ApiPackageManagementService.scala
View File

@ -4,30 +4,30 @@
package com.digitalasset.platform.apiserver.services.admin
import java.io.ByteArrayInputStream
import java.util.zip.ZipInputStream
import java.util.UUID
import java.util.zip.ZipInputStream
import akka.actor.Scheduler
import akka.stream.Materializer
import akka.stream.scaladsl.Sink
import com.daml.ledger.participant.state.v1.{SubmissionId, SubmissionResult, WritePackagesService}
import com.daml.ledger.participant.state.index.v2.{IndexPackagesService, IndexTransactionsService}
import com.daml.ledger.participant.state.v1.{SubmissionId, SubmissionResult, WritePackagesService}
import com.digitalasset.api.util.TimeProvider
import com.digitalasset.daml.lf.archive.DarReader
import com.digitalasset.daml_lf_dev.DamlLf.Archive
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.ledger.api.domain.{LedgerOffset, PackageEntry}
import com.digitalasset.ledger.api.v1.admin.package_management_service.PackageManagementServiceGrpc.PackageManagementService
import com.digitalasset.ledger.api.v1.admin.package_management_service._
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.platform.server.api.validation.ErrorFactories
import com.google.protobuf.timestamp.Timestamp
import com.digitalasset.ledger.api.domain.{LedgerOffset, PackageEntry}
import com.digitalasset.api.util.TimeProvider
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import io.grpc.ServerServiceDefinition
import scala.compat.java8.FutureConverters
import scala.concurrent.{ExecutionContext, Future}
import scala.concurrent.duration.{DurationInt, FiniteDuration}
import scala.concurrent.{ExecutionContext, Future}
import scala.util.Try
final class ApiPackageManagementService private (

6
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/admin/ApiPartyManagementService.scala
View File

@ -6,8 +6,8 @@ package com.digitalasset.platform.apiserver.services.admin
import java.util.UUID
import akka.actor.Scheduler
import akka.stream.scaladsl.Sink
import akka.stream.Materializer
import akka.stream.scaladsl.Sink
import com.daml.ledger.participant.state.index.v2.{
IndexPartyManagementService,
IndexTransactionsService
@ -15,15 +15,15 @@ import com.daml.ledger.participant.state.index.v2.{
import com.daml.ledger.participant.state.v1
import com.daml.ledger.participant.state.v1.{SubmissionId, SubmissionResult, WritePartyService}
import com.digitalasset.daml.lf.data.Ref
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain
import com.digitalasset.ledger.api.domain.PartyEntry.{AllocationAccepted, AllocationRejected}
import com.digitalasset.ledger.api.domain.{LedgerOffset, PartyEntry}
import com.digitalasset.ledger.api.v1.admin.party_management_service.PartyManagementServiceGrpc.PartyManagementService
import com.digitalasset.ledger.api.v1.admin.party_management_service._
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.api.grpc.GrpcApiService
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation.ErrorFactories
import io.grpc.ServerServiceDefinition

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/tracking/TrackerMap.scala
View File

@ -5,10 +5,10 @@ package com.digitalasset.platform.apiserver.services.tracking
import java.util.concurrent.atomic.AtomicReference
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.ledger.api.v1.command_service.SubmitAndWaitRequest
import com.digitalasset.ledger.api.v1.completion.Completion
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import org.slf4j.LoggerFactory
import scala.collection.immutable.HashMap

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/apiserver/services/transaction/ApiTransactionService.scala
View File

@ -14,7 +14,7 @@ import com.digitalasset.grpc.adapter.ExecutionSequencerFactory
import com.digitalasset.ledger.api.domain._
import com.digitalasset.ledger.api.messages.transaction._
import com.digitalasset.ledger.api.validation.PartyNameChecker
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.EventIdFormatter
import com.digitalasset.platform.sandbox.EventIdFormatter.TransactionIdWithIndex
import com.digitalasset.platform.server.api.services.domain.TransactionService

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/indexer/JdbcIndexer.scala
View File

@ -21,7 +21,7 @@ import com.digitalasset.daml_lf_dev.DamlLf
import com.digitalasset.dec.{DirectExecutionContext => DEC}
import com.digitalasset.ledger.api.domain
import com.digitalasset.ledger.api.domain.{LedgerId, PartyDetails}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.EventIdFormatter
import com.digitalasset.platform.sandbox.metrics.timedFuture
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.{

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/indexer/RecoveringIndexer.scala
View File

@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicReference
import akka.actor.Scheduler
import akka.pattern.after
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.resources.Resource
import scala.concurrent.duration.{DurationInt, FiniteDuration}

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/indexer/StandaloneIndexerServer.scala
View File

@ -6,7 +6,7 @@ package com.digitalasset.platform.indexer
import akka.actor.ActorSystem
import com.codahale.metrics.MetricRegistry
import com.daml.ledger.participant.state.v1.ReadService
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.resources.akka.AkkaResourceOwner
import com.digitalasset.resources.{Resource, ResourceOwner}

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/SandboxServer.scala
View File

@ -21,6 +21,8 @@ import com.digitalasset.ledger.api.auth.interceptor.AuthorizationInterceptor
import com.digitalasset.ledger.api.auth.{AuthService, AuthServiceWildcard, Authorizer}
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.health.HealthChecks
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.apiserver.{
ApiServer,
ApiServices,
@ -28,8 +30,6 @@ import com.digitalasset.platform.apiserver.{
TimeServiceBackend
}
import com.digitalasset.platform.common.LedgerIdMode
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.sandbox.SandboxServer._
import com.digitalasset.platform.sandbox.banner.Banner
import com.digitalasset.platform.sandbox.config.SandboxConfig

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/services/SandboxResetService.scala
View File

@ -5,11 +5,11 @@ package com.digitalasset.platform.sandbox.services
import java.util.concurrent.atomic.AtomicBoolean
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.ledger.api.auth.Authorizer
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.v1.testing.reset_service.{ResetRequest, ResetServiceGrpc}
import com.digitalasset.dec.{DirectExecutionContext => DE}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.server.api.validation.ErrorFactories
import com.google.protobuf.empty.Empty
import io.grpc.ServerCall.Listener

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/SandboxIndexAndWriteService.scala
View File

@ -36,7 +36,7 @@ import com.digitalasset.ledger.api.domain.CompletionEvent.{
}
import com.digitalasset.ledger.api.domain.{ParticipantId => _, _}
import com.digitalasset.ledger.api.health.HealthStatus
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.logging.LoggingContext
import com.digitalasset.platform.participant.util.EventFilter
import com.digitalasset.platform.sandbox.stores.ledger.ScenarioLoader.LedgerEntryOrBump
import com.digitalasset.platform.sandbox.stores.ledger._

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/Ledger.scala
View File

@ -22,7 +22,7 @@ import com.digitalasset.daml.lf.value.Value.AbsoluteContractId
import com.digitalasset.daml_lf_dev.DamlLf.Archive
import com.digitalasset.ledger.api.domain.{LedgerId, PartyDetails}
import com.digitalasset.ledger.api.health.ReportsHealth
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.logging.LoggingContext
import com.digitalasset.platform.participant.util.EventFilter.TemplateAwareFilter
import com.digitalasset.platform.sandbox.stores.ActiveLedgerState.Contract
import com.digitalasset.platform.sandbox.stores.ledger.ScenarioLoader.LedgerEntryOrBump

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/ReadOnlySqlLedger.scala
View File

@ -10,7 +10,7 @@ import com.codahale.metrics.MetricRegistry
import com.digitalasset.dec.{DirectExecutionContext => DEC}
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.health.HealthStatus
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.stores.ledger.ReadOnlyLedger
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.{
DbType,

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/SqlLedger.scala
View File

@ -23,7 +23,7 @@ import com.digitalasset.daml_lf_dev.DamlLf.Archive
import com.digitalasset.dec.{DirectExecutionContext => DEC}
import com.digitalasset.ledger.api.domain.{LedgerId, PartyDetails, RejectionReason}
import com.digitalasset.ledger.api.health.HealthStatus
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.stores.ledger.ScenarioLoader.LedgerEntryOrBump
import com.digitalasset.platform.sandbox.stores.ledger.sql.SqlStartMode.{
AlwaysReset,

4
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/dao/JdbcLedgerDao.scala
View File

@ -38,9 +38,8 @@ import com.digitalasset.ledger._
import com.digitalasset.ledger.api.domain.RejectionReason._
import com.digitalasset.ledger.api.domain.{LedgerId, PartyDetails, RejectionReason}
import com.digitalasset.ledger.api.health.HealthStatus
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.participant.util.EventFilter.TemplateAwareFilter
import com.digitalasset.resources.ResourceOwner
import com.digitalasset.platform.sandbox.stores.ActiveLedgerState.{
ActiveContract,
Contract,
@ -70,6 +69,7 @@ import com.digitalasset.platform.sandbox.stores.ledger.{
PackageLedgerEntry,
PartyLedgerEntry
}
import com.digitalasset.resources.ResourceOwner
import com.google.common.io.ByteStreams
import scalaz.syntax.tag._

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/migration/FlywayMigrations.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.platform.sandbox.stores.ledger.sql.migration
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.{DbType, HikariConnection}
import com.digitalasset.resources.Resource
import com.zaxxer.hikari.HikariDataSource

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/util/DbDispatcher.scala
View File

@ -8,7 +8,7 @@ import java.util.concurrent.{ExecutorService, Executors, TimeUnit}
import com.codahale.metrics.{MetricRegistry, Timer}
import com.digitalasset.ledger.api.health.{HealthStatus, ReportsHealth}
import com.digitalasset.platform.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.logging.{ContextualizedLogger, LoggingContext}
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.HikariJdbcConnectionProvider
import com.digitalasset.resources.ResourceOwner
import com.google.common.util.concurrent.ThreadFactoryBuilder

2
ledger/sandbox/src/test/lib/scala/com/digitalasset/platform/sandbox/LedgerResource.scala
View File

@ -10,7 +10,7 @@ import com.digitalasset.api.util.TimeProvider
import com.digitalasset.daml.lf.data.ImmArray
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.testing.utils.Resource
import com.digitalasset.platform.logging.LoggingContext
import com.digitalasset.logging.LoggingContext
import com.digitalasset.platform.sandbox.persistence.{PostgresFixture, PostgresResource}
import com.digitalasset.platform.sandbox.stores.ledger.Ledger
import com.digitalasset.platform.sandbox.stores.ledger.ScenarioLoader.LedgerEntryOrBump

5
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/indexer/RecoveringIndexerSpec.scala
View File

@ -9,17 +9,16 @@ import akka.actor.ActorSystem
import akka.pattern.after
import ch.qos.logback.classic.Level
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.indexer.RecoveringIndexerSpec._
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.testing.LogCollector
import com.digitalasset.resources.{Resource, ResourceOwner}
import org.scalatest.mockito.MockitoSugar
import org.scalatest.{AsyncWordSpec, BeforeAndAfterEach, Matchers}
import scala.collection.mutable
import scala.concurrent.Await
import scala.concurrent.duration.{DurationInt, DurationLong, FiniteDuration}
import scala.concurrent.{ExecutionContext, Future, Promise}
import scala.concurrent.{Await, ExecutionContext, Future, Promise}
import scala.util.{Failure, Success, Try}
class RecoveringIndexerSpec

5
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/sandbox/persistence/PostgresIT.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.platform.sandbox.persistence
import com.codahale.metrics.MetricRegistry
import com.digitalasset.dec.DirectExecutionContext
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.sandbox.stores.ledger.sql.dao.{
HikariJdbcConnectionProvider,
JdbcConnectionProvider
@ -17,9 +17,6 @@ import org.scalatest._
import scala.concurrent.Await
import scala.concurrent.duration.DurationInt
import scala.concurrent.Await
import scala.concurrent.duration.DurationInt
class PostgresIT extends WordSpec with Matchers with PostgresAroundAll with BeforeAndAfterAll {
private var connectionProviderResource: Resource[JdbcConnectionProvider] = _

2
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/sandbox/stores/ledger/ImplicitPartyAdditionIT.scala
View File

@ -31,11 +31,11 @@ import com.digitalasset.ledger.api.testing.utils.{
Resource,
SuiteResourceManagementAroundEach
}
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.sandbox.{LedgerResource, MetricsAround}
import org.scalatest.concurrent.{AsyncTimeLimitedTests, ScalaFutures}
import org.scalatest.time.Span
import org.scalatest.{AsyncWordSpec, Matchers}
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import scala.collection.immutable.TreeMap
import scala.concurrent.duration._

2
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/sandbox/stores/ledger/TransactionMRTComplianceIT.scala
View File

@ -23,11 +23,11 @@ import com.digitalasset.ledger.api.testing.utils.{
Resource,
SuiteResourceManagementAroundEach
}
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.sandbox.{LedgerResource, MetricsAround}
import org.scalatest.concurrent.{AsyncTimeLimitedTests, ScalaFutures}
import org.scalatest.time.Span
import org.scalatest.{AsyncWordSpec, Matchers}
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import scala.collection.immutable.TreeMap
import scala.concurrent.ExecutionContext

2
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/JdbcLedgerDaoSpec.scala
View File

@ -43,6 +43,7 @@ import com.digitalasset.ledger.api.domain.{
TransactionFilter
}
import com.digitalasset.ledger.api.testing.utils.AkkaBeforeAndAfterAll
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.participant.util.EventFilter
import com.digitalasset.platform.sandbox.persistence.PostgresAroundAll
import com.digitalasset.platform.sandbox.stores.ActiveLedgerState.ActiveContract
@ -52,7 +53,6 @@ import com.digitalasset.platform.sandbox.stores.ledger.sql.util.DbDispatcher
import com.digitalasset.platform.sandbox.stores.ledger.{ConfigurationEntry, LedgerEntry}
import com.digitalasset.resources.Resource
import org.scalatest.{AsyncWordSpec, Matchers, OptionValues}
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import scala.collection.immutable.TreeMap
import scala.concurrent.duration.DurationInt

2
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/sandbox/stores/ledger/sql/SqlLedgerSpec.scala
View File

@ -9,6 +9,7 @@ import com.digitalasset.daml.lf.data.{ImmArray, Ref}
import com.digitalasset.ledger.api.domain.LedgerId
import com.digitalasset.ledger.api.health.{Healthy, Unhealthy}
import com.digitalasset.ledger.api.testing.utils.AkkaBeforeAndAfterAll
import com.digitalasset.logging.LoggingContext.newLoggingContext
import com.digitalasset.platform.sandbox.MetricsAround
import com.digitalasset.platform.sandbox.persistence.PostgresAroundEach
import com.digitalasset.platform.sandbox.stores.ledger.Ledger
@ -17,7 +18,6 @@ import com.digitalasset.resources.Resource
import org.scalatest.concurrent.{AsyncTimeLimitedTests, Eventually, ScaledTimeSpans}
import org.scalatest.time.{Minute, Seconds, Span}
import org.scalatest.{AsyncWordSpec, Matchers}
import com.digitalasset.platform.logging.LoggingContext.newLoggingContext
import scala.collection.mutable
import scala.concurrent.duration.DurationInt

45
libs-scala/contextualized-logging/BUILD.bazel Normal file
View File

@ -0,0 +1,45 @@
# Copyright (c) 2020 The DAML Authors. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
load(
"//bazel_tools:scala.bzl",
"da_scala_library",
"da_scala_test_suite",
)
da_scala_library(
name = "contextualized-logging",
srcs = glob(["src/main/scala/**/*.scala"]),
tags = ["maven_coordinates=com.digitalasset:contextualized-logging:__VERSION__"],
visibility = [
"//visibility:public",
],
deps = [
"//libs-scala/grpc-utils",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:io_grpc_grpc_api",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_slf4j_slf4j_api",
],
)
da_scala_test_suite(
name = "contextualized-logging-tests",
srcs = glob(["src/test/suite/**/*.scala"]),
deps = [
":contextualized-logging",
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_chuusai_shapeless_2_12",
"@maven//:io_circe_circe_core_2_12",
"@maven//:io_circe_circe_generic_2_12",
"@maven//:io_circe_circe_parser_2_12",
"@maven//:net_logstash_logback_logstash_logback_encoder",
"@maven//:org_mockito_mockito_core",
"@maven//:org_mockito_mockito_scala_2_12",
"@maven//:org_slf4j_slf4j_api",
"@maven//:org_typelevel_cats_core_2_12",
"@maven//:org_typelevel_cats_kernel_2_12",
],
)

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/logging/ContextualizedLogger.scala → libs-scala/contextualized-logging/src/main/scala/com/digitalasset/logging/ContextualizedLogger.scala
View File

@ -1,7 +1,7 @@
// Copyright (c) 2020 The DAML Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package com.digitalasset.platform.logging
package com.digitalasset.logging
import akka.NotUsed
import akka.stream.scaladsl.Flow

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/logging/LeveledLogger.scala → libs-scala/contextualized-logging/src/main/scala/com/digitalasset/logging/LeveledLogger.scala
View File

@ -1,7 +1,7 @@
// Copyright (c) 2020 The DAML Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package com.digitalasset.platform.logging
package com.digitalasset.logging
import org.slf4j.{Logger, Marker}

2
ledger/sandbox/src/main/scala/com/digitalasset/platform/logging/LoggingContext.scala → libs-scala/contextualized-logging/src/main/scala/com/digitalasset/logging/LoggingContext.scala
View File

@ -1,7 +1,7 @@
// Copyright (c) 2020 The DAML Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package com.digitalasset.platform.logging
package com.digitalasset.logging
import net.logstash.logback.argument.StructuredArgument
import net.logstash.logback.marker.MapEntriesAppendingMarker

7
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/logging/ContextualizedLoggerIT.scala → libs-scala/contextualized-logging/src/test/suite/scala/com/digitalasset/logging/ContextualizedLoggerIT.scala
View File

@ -1,7 +1,7 @@
// Copyright (c) 2020 The DAML Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package com.digitalasset.platform.logging
package com.digitalasset.logging
import java.io.{ByteArrayOutputStream, OutputStream}
@ -11,10 +11,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent
import ch.qos.logback.classic.{Level, LoggerContext}
import ch.qos.logback.core.OutputStreamAppender
import ch.qos.logback.core.encoder.Encoder
import com.digitalasset.platform.logging.LoggingContext.{
newLoggingContext,
withEnrichedLoggingContext
}
import com.digitalasset.logging.LoggingContext.{newLoggingContext, withEnrichedLoggingContext}
import net.logstash.logback.encoder.LogstashEncoder
import org.scalatest.{FlatSpec, Matchers}
import org.slf4j.{Logger, LoggerFactory}

10
ledger/sandbox/src/test/suite/scala/com/digitalasset/platform/logging/ContextualizedLoggerSpec.scala → libs-scala/contextualized-logging/src/test/suite/scala/com/digitalasset/logging/ContextualizedLoggerSpec.scala
View File

@ -1,14 +1,14 @@
// Copyright (c) 2020 The DAML Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package com.digitalasset.platform.logging
package com.digitalasset.logging
import org.mockito.ArgumentMatchersSugar
import org.mockito.Mockito.{times, verify, when}
import org.scalatest.mockito.MockitoSugar
import org.scalatest.{FlatSpec, Matchers}
import org.slf4j.{Logger, Marker}
import org.slf4j.event.{EventConstants, Level}
import org.slf4j.{Logger, Marker}
@SuppressWarnings(Array("org.wartremover.warts.Any"))
final class ContextualizedLoggerSpec
@ -77,9 +77,9 @@ final class ContextualizedLoggerSpec
it should "pick the expected context also when executing in a future" in
withContext("id" -> "future") { logger => implicit context =>
import concurrent.ExecutionContext.Implicits.global
import concurrent.{Await, Future}
import concurrent.duration.DurationInt
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration.DurationInt
import scala.concurrent.{Await, Future}
val f1 = Future { logger.info("a") }
LoggingContext.withEnrichedLoggingContext("id" -> "next") { implicit context =>

3
release/artifacts.yaml
View File

@ -213,6 +213,9 @@
- target: //libs-scala/auth-utils:auth-utils
type: jar-scala
mavenUpload: true
- target: //libs-scala/contextualized-logging:contextualized-logging
type: jar-scala
mavenUpload: true
- target: //libs-scala/direct-execution-context:direct-execution-context
type: jar-scala
mavenUpload: true