Merge 4ff45a3 into 10bc198

actor/actor_system.go

@@ -16,6 +16,7 @@ type ActorSystem struct {
 	Guardians       *guardiansValue
 	DeadLetter      *deadLetterProcess
 	Extensions      *extensions.Extensions
+	Config          *Config
 }
 
 func (as *ActorSystem) NewLocalPID(id string) *PID {
@@ -42,15 +43,20 @@ func (as *ActorSystem) GetHostPort() (host string, port int, err error) {
 }
 
 func NewActorSystem() *ActorSystem {
-	system := &ActorSystem{}
+	return NewActorSystemWithConfig(defaultActorSystemConfig())
+}
 
+func NewActorSystemWithConfig(config Config) *ActorSystem {
+	system := &ActorSystem{}
+	system.Config = &config
 	system.ProcessRegistry = NewProcessRegistry(system)
 	system.Root = NewRootContext(system, EmptyMessageHeader)
 	system.Guardians = NewGuardians(system)
 	system.EventStream = eventstream.NewEventStream()
 	system.DeadLetter = NewDeadLetter(system)
 	system.Extensions = extensions.NewExtensions()
 	SubscribeSupervision(system)
+	system.Extensions.Register(NewMetrics())
 
 	return system
 }

actor/config.go

@@ -0,0 +1,52 @@
+package actor
+
+import "time"
+
+type Config struct {
+	DeadLetterThrottleInterval  time.Duration      //throttle deadletter logging after this interval
+	DeadLetterThrottleCount     int                //throttle deadletter logging after this count
+	DeadLetterRequestLogging    bool               //do not log deadletters with sender
+	DeveloperSupervisionLogging bool               //console log and promote supervision logs to Warning level
+	DiagnosticsSerializer       func(Actor) string //extract diagnostics from actor and return as string
+}
+
+func defaultActorSystemConfig() Config {
+	return Config{
+		DeadLetterThrottleInterval:  time.Duration(0),
+		DeadLetterThrottleCount:     0,
+		DeadLetterRequestLogging:    true,
+		DeveloperSupervisionLogging: false,
+		DiagnosticsSerializer: func(actor Actor) string {
+			return ""
+		},
+	}
+}
+
+func NewConfig() Config {
+	return defaultActorSystemConfig()
+}
+
+func (asc Config) WithDeadLetterThrottleInterval(duration time.Duration) Config {
+	asc.DeadLetterThrottleInterval = duration
+	return asc
+}
+
+func (asc Config) WithDeadLetterThrottleCount(count int) Config {
+	asc.DeadLetterThrottleCount = count
+	return asc
+}
+
+func (asc Config) WithDeadLetterRequestLogging(enabled bool) Config {
+	asc.DeadLetterRequestLogging = enabled
+	return asc
+}
+
+func (asc Config) WithDeveloperSupervisionLogging(enabled bool) Config {
+	asc.DeveloperSupervisionLogging = enabled
+	return asc
+}
+
+func (asc Config) WithDiagnosticsSerializer(serializer func(Actor) string) Config {
+	asc.DiagnosticsSerializer = serializer
+	return asc
+}

actor/deadletter.go

@@ -17,6 +17,12 @@ func NewDeadLetter(actorSystem *ActorSystem) *deadLetterProcess {
 	actorSystem.ProcessRegistry.Add(dp, "deadletter")
 	_ = actorSystem.EventStream.Subscribe(func(msg interface{}) {
 		if deadLetter, ok := msg.(*DeadLetterEvent); ok {
+
+			//bail out if sender is set and deadletter request logging is false
+			if !actorSystem.Config.DeadLetterRequestLogging && deadLetter.Sender != nil {
+				return
+			}
+
 			plog.Debug("[DeadLetter]", log.Stringer("pid", deadLetter.PID), log.TypeOf("msg", deadLetter.Message), log.Stringer("sender", deadLetter.Sender))
 			// send back a response instead of timeout.
 			if deadLetter.Sender != nil {

actor/metrics.go

@@ -0,0 +1,16 @@
+package actor
+
+import "github.com/AsynkronIT/protoactor-go/extensions"
+
+var extensionId = extensions.NextExtensionId()
+
+type Metrics struct {
+}
+
+func (m *Metrics) Id() extensions.ExtensionId {
+	return extensionId
+}
+
+func NewMetrics() *Metrics {
+	return &Metrics{}
+}