better message formatting

api/pkg/messaging/internal/inprocess/broker.go

@@ -76,7 +76,7 @@ func (b *MessageBroker) Unsubscribe(event model.NotificationEvent, subChan <-cha
 
 func NewInProcessBroker(logger mlogger.Logger, bufferSize int) (*MessageBroker, error) {
 	if bufferSize < 1 {
-		return nil, merrors.InvalidArgument(fmt.Sprintf("Invelid buffer size %d. It must be greater than 1", bufferSize))
+		return nil, merrors.InvalidArgument(fmt.Sprintf("Invelid buffer size %d. It must be greater than 1", bufferSize), "bufferSize")
 	}
 	logger.Info("Created in-process logger", zap.Int("buffer_size", bufferSize))
 	return &MessageBroker{

api/pkg/messaging/internal/natsb/broker.go

@@ -39,7 +39,7 @@ func loadEnv(settings *nc.Settings, l *zap.Logger) (*envConfig, error) {
 			return v, nil
 		}
 		l.Error(fmt.Sprintf("NATS %s not found in environment", label), zap.String("env_var", key))
-		return "", merrors.InvalidArgument(fmt.Sprintf("NATS %s not found in environment variable: %s", label, key))
+		return "", merrors.InvalidArgument(fmt.Sprintf("NATS %s not found in environment variable: %s", label, key), key)
 	}
 
 	user, err := get(settings.UsernameEnv, "user name")
@@ -65,7 +65,7 @@ func loadEnv(settings *nc.Settings, l *zap.Logger) (*envConfig, error) {
 	port, err := strconv.Atoi(portStr)
 	if err != nil || port <= 0 || port > 65535 {
 		l.Error("Invalid NATS port value", zap.String("port", portStr))
-		return nil, merrors.InvalidArgument("Invalid NATS port: " + portStr)
+		return nil, merrors.InvalidArgument("Invalid NATS port: "+portStr, settings.PortEnv)
 	}
 
 	return &envConfig{

api/pkg/messaging/internal/notifications/site/notification.go

@@ -17,7 +17,7 @@ type DemoRequestNotification struct {
 
 func (drn *DemoRequestNotification) Serialize() ([]byte, error) {
 	if drn.request == nil {
-		return nil, merrors.InvalidArgument("demo request payload is empty")
+		return nil, merrors.InvalidArgument("demo request payload is empty", "request")
 	}
 	msg := gmessaging.DemoRequestEvent{
 		Name:             drn.request.Name,