raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Harden EventSourcedBehaviorLoggingSpec, #31143 (#31145)

Browse source
This commit is contained in:
Patrik Nordwall 2022-02-21 12:15:00 +01:00 • committed by GitHub
parent 9c5281bff8
commit 0c46294e96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
akka-persistence-typed-tests/src/test/scala/akka/persistence/typed/EventSourcedBehaviorLoggingSpec.scala
View file

@ -18,13 +18,16 @@ import akka.serialization.jackson.CborSerializable
import com.typesafe.config.{ Config, ConfigFactory } import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.wordspec.AnyWordSpecLike import org.scalatest.wordspec.AnyWordSpecLike
import akka.Done
import akka.actor.typed.ActorRef
object EventSourcedBehaviorLoggingSpec { object EventSourcedBehaviorLoggingSpec {
object ChattyEventSourcingBehavior { object ChattyEventSourcingBehavior {
sealed trait Command sealed trait Command
case class Hello(msg: String) extends Command case class Hello(msg: String, replyTo: ActorRef[Done]) extends Command
case class Hellos(msg1: String, msg2: String) extends Command case class Hellos(msg1: String, msg2: String, replyTo: ActorRef[Done]) extends Command
final case class Event(msg: String) extends CborSerializable final case class Event(msg: String) extends CborSerializable
@ -35,12 +38,12 @@ object EventSourcedBehaviorLoggingSpec {
Set.empty, Set.empty,
(_, command) => (_, command) =>
command match { command match {
case Hello(msg) => case Hello(msg, replyTo) =>
ctx.log.info("received message '{}'", msg) ctx.log.info("received message '{}'", msg)
Effect.persist(Event(msg)) Effect.persist(Event(msg)).thenReply(replyTo)(_ => Done)
case Hellos(msg1, msg2) => case Hellos(msg1, msg2, replyTo) =>
Effect.persist(Event(msg1), Event(msg2)) Effect.persist(Event(msg1), Event(msg2)).thenReply(replyTo)(_ => Done)
}, },
(state, event) => state + event) (state, event) => state + event)
} }
@ -62,43 +65,51 @@ abstract class EventSourcedBehaviorLoggingSpec(config: Config)
val chattyActor = spawn(ChattyEventSourcingBehavior(myId)) val chattyActor = spawn(ChattyEventSourcingBehavior(myId))
"always log user message in context.log" in { "always log user message in context.log" in {
val doneProbe = createTestProbe[Done]()
LoggingTestKit LoggingTestKit
.info("received message 'Mary'") .info("received message 'Mary'")
.withLoggerName("akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$") .withLoggerName("akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$")
.expect { .expect {
chattyActor ! Hello("Mary") chattyActor ! Hello("Mary", doneProbe.ref)
doneProbe.receiveMessage()
} }
} }
s"log internal messages in '$loggerId' logger without logging user data (Persist)" in { s"log internal messages in '$loggerId' logger without logging user data (Persist)" in {
val doneProbe = createTestProbe[Done]()
LoggingTestKit LoggingTestKit
.debug( .debug(
"Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hello], " + "Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hello], " +
"resulting effect: [Persist(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [0]") "resulting effect: [Persist(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
.withLoggerName(loggerName) .withLoggerName(loggerName)
.expect { .expect {
chattyActor ! Hello("Joe") chattyActor ! Hello("Joe", doneProbe.ref)
doneProbe.receiveMessage()
} }
} }
s"log internal messages in '$loggerId' logger without logging user data (PersistAll)" in { s"log internal messages in '$loggerId' logger without logging user data (PersistAll)" in {
val doneProbe = createTestProbe[Done]()
LoggingTestKit LoggingTestKit
.debug("Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hellos], " + .debug("Handled command [akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Hellos], " +
"resulting effect: [PersistAll(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event," + "resulting effect: [PersistAll(akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event," +
"akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [0]") "akka.persistence.typed.EventSourcedBehaviorLoggingSpec$ChattyEventSourcingBehavior$Event)], side effects: [1]")
.withLoggerName(loggerName) .withLoggerName(loggerName)
.expect { .expect {
chattyActor ! Hellos("Mary", "Joe") chattyActor ! Hellos("Mary", "Joe", doneProbe.ref)
doneProbe.receiveMessage()
} }
} }
s"log in '$loggerId' while preserving MDC source" in { s"log in '$loggerId' while preserving MDC source" in {
val doneProbe = createTestProbe[Done]()
LoggingTestKit LoggingTestKit
.debug("Handled command ") .debug("Handled command ")
.withLoggerName(loggerName) .withLoggerName(loggerName)
.withMdc(Map("persistencePhase" -> "running-cmd", "persistenceId" -> "Chatty|chat-1")) .withMdc(Map("persistencePhase" -> "running-cmd", "persistenceId" -> "Chatty|chat-1"))
.expect { .expect {
chattyActor ! Hello("Mary") chattyActor ! Hello("Mary", doneProbe.ref)
doneProbe.receiveMessage()
} }
} }
} }