feat: add reply-to address

PeerDB-io · Mar 11, 2024 · 7f24192 · 7f24192
1 parent 149af0e
commit 7f24192
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/flow/alerting/alerting.go b/flow/alerting/alerting.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"strings"
 	"time"
 
 	"github.com/jackc/pgx/v5"
@@ -54,6 +55,7 @@ func (a *Alerter) registerSendersFromPool(ctx context.Context) ([]AlertSenderCon
 			emailServiceConfig := EmailAlertSenderConfig{
 				sourceEmail:          peerdbenv.PeerDBAlertingEmailSenderSourceEmail(),
 				configurationSetName: peerdbenv.PeerDBAlertingEmailSenderConfigurationSet(),
+				replyToAddresses:     strings.Split(peerdbenv.PeerDBAlertingEmailSenderReplyToAddresses(), ","),
 			}
 			if emailServiceConfig.sourceEmail == "" {
 				return errors.New("missing sourceEmail for Email alerting service")
@@ -131,7 +133,8 @@ func (a *Alerter) AlertIfSlotLag(ctx context.Context, peerName string, slotInfo
 
 	if slotInfo.LagInMb > float32(lowestSlotLagMBAlertThreshold) {
 		for _, alertSenderConfig := range alertSenderConfigs {
-			if a.checkAndAddAlertToCatalog(ctx, alertSenderConfig.Id, alertKey, fmt.Sprintf(alertMessageTemplate, lowestSlotLagMBAlertThreshold)) {
+			if a.checkAndAddAlertToCatalog(ctx,
+				alertSenderConfig.Id, alertKey, fmt.Sprintf(alertMessageTemplate, lowestSlotLagMBAlertThreshold)) {
 				if alertSenderConfig.Sender.getSlotLagMBAlertThreshold() > 0 {
 					if slotInfo.LagInMb > float32(alertSenderConfig.Sender.getSlotLagMBAlertThreshold()) {
 						a.alertToProvider(ctx, alertSenderConfig, alertKey,
@@ -178,7 +181,8 @@ func (a *Alerter) AlertIfOpenConnections(ctx context.Context, peerName string,
 
 	if openConnections.CurrentOpenConnections > int64(lowestOpenConnectionsThreshold) {
 		for _, alertSenderConfig := range alertSenderConfigs {
-			if a.checkAndAddAlertToCatalog(ctx, alertSenderConfig.Id, alertKey, fmt.Sprintf(alertMessageTemplate, lowestOpenConnectionsThreshold)) {
+			if a.checkAndAddAlertToCatalog(ctx,
+				alertSenderConfig.Id, alertKey, fmt.Sprintf(alertMessageTemplate, lowestOpenConnectionsThreshold)) {
 				if alertSenderConfig.Sender.getOpenConnectionsAlertThreshold() > 0 {
 					if openConnections.CurrentOpenConnections > int64(alertSenderConfig.Sender.getOpenConnectionsAlertThreshold()) {
 						a.alertToProvider(ctx, alertSenderConfig, alertKey,

diff --git a/flow/alerting/email_alert_sender.go b/flow/alerting/email_alert_sender.go
@@ -19,6 +19,7 @@ type emailAlertSenderImpl struct {
 	client                        *ses.Client
 	sourceEmail                   string
 	configurationSetName          string
+	replyToAddresses              []string
 	slotLagMBAlertThreshold       uint32
 	openConnectionsAlertThreshold uint32
 	emailAddresses                []string
@@ -35,6 +36,7 @@ func (e *emailAlertSenderImpl) getOpenConnectionsAlertThreshold() uint32 {
 type EmailAlertSenderConfig struct {
 	sourceEmail                   string
 	configurationSetName          string
+	replyToAddresses              []string
 	SlotLagMBAlertThreshold       uint32   `json:"slot_lag_mb_alert_threshold"`
 	OpenConnectionsAlertThreshold uint32   `json:"open_connections_alert_threshold"`
 	EmailAddresses                []string `json:"email_addresses"`
@@ -59,6 +61,7 @@ func (e *emailAlertSenderImpl) sendAlert(ctx context.Context, alertTitle string,
 		},
 		Source:               aws.String(e.sourceEmail),
 		ConfigurationSetName: aws.String(e.configurationSetName),
+		ReplyToAddresses:     e.replyToAddresses,
 		Tags: []types.MessageTag{
 			{Name: aws.String("DeploymentUUID"), Value: aws.String(peerdbenv.PeerDBDeploymentUID())},
 		},
@@ -82,6 +85,7 @@ func NewEmailAlertSender(client *ses.Client, config *EmailAlertSenderConfig) Ema
 		client:                        client,
 		sourceEmail:                   config.sourceEmail,
 		configurationSetName:          config.configurationSetName,
+		replyToAddresses:              config.replyToAddresses,
 		slotLagMBAlertThreshold:       config.SlotLagMBAlertThreshold,
 		openConnectionsAlertThreshold: config.OpenConnectionsAlertThreshold,
 		emailAddresses:                config.EmailAddresses,

diff --git a/flow/peerdbenv/config.go b/flow/peerdbenv/config.go
@@ -107,3 +107,8 @@ func PeerDBAlertingEmailSenderConfigurationSet() string {
 func PeerDBAlertingEmailSenderRegion() string {
 	return getEnvString("PEERDB_ALERTING_EMAIL_SENDER_REGION", "")
 }
+
+// Comma-separated reply-to addresses
+func PeerDBAlertingEmailSenderReplyToAddresses() string {
+	return getEnvString("PEERDB_ALERTING_EMAIL_SENDER_REPLY_TO_ADDRESSES", "")
+}