Merge pull request #392 from ethpandaops/fix/server-dupes

fix(server): Resolve duplicate events being exported
ethpandaops · Oct 8, 2024 · 4854584 · 4854584
2 parents 39273fe + fbe89d1
commit 4854584
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pkg/sentry/presets.go b/pkg/sentry/presets.go
@@ -125,7 +125,7 @@ outputs:
 			Value: []byte(`
 preset: docker-compose
 outputs:
-- name: ethpandaops
+- name: dockercompose
   type: xatu
   config:
     address: localhost:8080

diff --git a/pkg/server/service/event-ingester/handler.go b/pkg/server/service/event-ingester/handler.go
@@ -142,6 +142,8 @@ func (h *Handler) Events(ctx context.Context, events []*xatu.DecoratedEvent, use
 		}
 	}
 
+	handlerFilteredEvents := make([]*xatu.DecoratedEvent, 0)
+	// Route the events to the correct handler
 	for _, event := range events {
 		if event == nil || event.Event == nil {
 			continue
@@ -199,9 +201,11 @@ func (h *Handler) Events(ctx context.Context, events []*xatu.DecoratedEvent, use
 
 		event.Meta.Server = e.AppendServerMeta(ctx, &meta)
 
-		filteredEvents = append(filteredEvents, event)
+		handlerFilteredEvents = append(handlerFilteredEvents, event)
 	}
 
+	filteredEvents = handlerFilteredEvents
+
 	// Redact the events again
 	if group != nil {
 		redactedEvents, err := group.ApplyRedacter(filteredEvents)

diff --git a/pkg/server/service/event-ingester/ingester.go b/pkg/server/service/event-ingester/ingester.go
@@ -138,17 +138,12 @@ 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.ShippingMethodSync
-			out.ShippingMethod = &shippingMethod
-		}
-
 		sink, err := output.NewSink(out.Name,
 			out.SinkType,
 			out.Config,
 			e.log,
 			out.FilterConfig,
-			*out.ShippingMethod,
+			processor.ShippingMethodSync,
 		)
 		if err != nil {
 			return nil, err