fix: Set default shipping method if not specified

ethpandaops · Oct 3, 2024 · f053759 · f053759
1 parent 5610c36
commit f053759
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/pkg/cannon/config.go b/pkg/cannon/config.go
@@ -77,12 +77,18 @@ func (c *Config) CreateSinks(log logrus.FieldLogger) ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(c.Outputs))
 
 	for i, out := range c.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodSync
+
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(out.Name,
 			out.SinkType,
 			out.Config,
 			log,
 			out.FilterConfig,
-			processor.ShippingMethodSync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err

diff --git a/pkg/clmimicry/config.go b/pkg/clmimicry/config.go
@@ -67,13 +67,18 @@ func (c *Config) CreateSinks(log logrus.FieldLogger) ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(c.Outputs))
 
 	for i, out := range c.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodAsync
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(
 			out.Name,
 			out.SinkType,
 			out.Config,
 			log,
 			out.FilterConfig,
-			processor.ShippingMethodAsync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err

diff --git a/pkg/mimicry/config.go b/pkg/mimicry/config.go
@@ -58,13 +58,18 @@ func (c *Config) CreateSinks(log logrus.FieldLogger) ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(c.Outputs))
 
 	for i, out := range c.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodAsync
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(
 			out.Name,
 			out.SinkType,
 			out.Config,
 			log,
 			out.FilterConfig,
-			processor.ShippingMethodAsync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err

diff --git a/pkg/output/config.go b/pkg/output/config.go
@@ -21,6 +21,8 @@ type Config struct {
 	Config *RawMessage `yaml:"config"`
 
 	FilterConfig pxatu.EventFilterConfig `yaml:"filter"`
+
+	ShippingMethod *processor.ShippingMethod `yaml:"shippingMethod"`
 }
 
 func (c *Config) Validate() error {

diff --git a/pkg/relaymonitor/config.go b/pkg/relaymonitor/config.go
@@ -85,13 +85,18 @@ func (c *Config) CreateSinks(log logrus.FieldLogger) ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(c.Outputs))
 
 	for i, out := range c.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodAsync
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(
 			out.Name,
 			out.SinkType,
 			out.Config,
 			log,
 			out.FilterConfig,
-			processor.ShippingMethodAsync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err

diff --git a/pkg/sentry/config.go b/pkg/sentry/config.go
@@ -78,12 +78,17 @@ func (c *Config) CreateSinks(log logrus.FieldLogger) ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(c.Outputs))
 
 	for i, out := range c.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodAsync
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(out.Name,
 			out.SinkType,
 			out.Config,
 			log,
 			out.FilterConfig,
-			processor.ShippingMethodAsync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err

diff --git a/pkg/server/service/event-ingester/ingester.go b/pkg/server/service/event-ingester/ingester.go
@@ -138,12 +138,17 @@ func (e *Ingester) CreateSinks() ([]output.Sink, error) {
 	sinks := make([]output.Sink, len(e.config.Outputs))
 
 	for i, out := range e.config.Outputs {
+		if out.ShippingMethod == nil {
+			shippingMethod := processor.ShippingMethodAsync
+			out.ShippingMethod = &shippingMethod
+		}
+
 		sink, err := output.NewSink(out.Name,
 			out.SinkType,
 			out.Config,
 			e.log,
 			out.FilterConfig,
-			processor.ShippingMethodSync,
+			*out.ShippingMethod,
 		)
 		if err != nil {
 			return nil, err