Skip to content

Conversation

@mgoworko
Copy link
Collaborator

No description provided.

# Conflicts:
#	es67x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es70x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es710x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es711x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es714x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es716x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es717x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es72x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es73x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es74x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es77x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es78x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es79x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es80x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es810x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es811x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es812x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es813x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es814x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es815x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es816x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es818x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es81x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es82x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es83x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es84x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es85x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es87x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es88x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es89x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es90x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es91x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
#	es92x/src/main/scala/tech/beshu/ror/es/services/RestClientAuditSinkService.scala
import cats.implicits.*
import monix.eval.Task
import org.apache.logging.log4j.scala.Logging
import tech.beshu.ror.utils.RequestIdAwareLogging
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overview of changes:

  • everywhere changed org.apache.logging.log4j.scala.Logging to tech.beshu.ror.utils.RequestIdAwareLogging
  • logger requires implicit instance of trait HasRequestId in scope
  • all implementations of trait RequestContext, BlockContext, RequestId, ResponseContext extend HasRequestId
  • in situations, where the request id is not available, the noRequestIdLogger is used

That way we known, that all logs either have the request id, or are using easily-searchable noRequestIdLogger

rorEsConfig: ReadonlyRestEsConfig)
(implicit environmentConfig: EnvironmentConfig)
extends ActionFilter with Logging {
extends ActionFilter with RequestIdAwareLogging {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in modules are 99% the same, with some minor module-specific differences

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant