Skip to content

[OCTRL-985] Place kafka messages related to same environments in the same partition #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knopers8 merged 1 commit into from
Mar 3, 2025
Merged

[OCTRL-985] Place kafka messages related to same environments in the same partition #655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions common/event/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func NewWriterWithTopic(topic topic.Topic) *KafkaWriter {
Writer: &kafka.Writer{
Addr: kafka.TCP(viper.GetStringSlice("kafkaEndpoints")...),
Topic: string(topic),
Balancer: &kafka.LeastBytes{},
Balancer: &kafka.Hash{},
AllowAutoTopicCreation: true,
},
}
Expand All @@ -80,6 +80,18 @@ func (w *KafkaWriter) WriteEvent(e interface{}) {
}
}

type HasEnvID interface {
GetEnvironmentId() string
}

func extractAndConvertEnvID[T HasEnvID](object T) []byte {
envID := []byte(object.GetEnvironmentId())
if len(envID) > 0 {
return envID
}
return nil
}

func (w *KafkaWriter) WriteEventWithTimestamp(e interface{}, timestamp time.Time) {
if w == nil {
return
Expand All @@ -89,6 +101,7 @@ func (w *KafkaWriter) WriteEventWithTimestamp(e interface{}, timestamp time.Time
var (
err error
wrappedEvent *pb.Event
key []byte = nil
)

switch e := e.(type) {
Expand All @@ -111,36 +124,42 @@ func (w *KafkaWriter) WriteEventWithTimestamp(e interface{}, timestamp time.Time
Payload: &pb.Event_FrameworkEvent{FrameworkEvent: e},
}
case *pb.Ev_TaskEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Payload: &pb.Event_TaskEvent{TaskEvent: e},
}
case *pb.Ev_RoleEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Payload: &pb.Event_RoleEvent{RoleEvent: e},
}
case *pb.Ev_EnvironmentEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Payload: &pb.Event_EnvironmentEvent{EnvironmentEvent: e},
}
case *pb.Ev_CallEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Payload: &pb.Event_CallEvent{CallEvent: e},
}
case *pb.Ev_IntegratedServiceEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Payload: &pb.Event_IntegratedServiceEvent{IntegratedServiceEvent: e},
}
case *pb.Ev_RunEvent:
key = extractAndConvertEnvID(e)
wrappedEvent = &pb.Event{
Timestamp: timestamp.UnixMilli(),
TimestampNano: timestamp.UnixNano(),
Expand All @@ -151,7 +170,7 @@ func (w *KafkaWriter) WriteEventWithTimestamp(e interface{}, timestamp time.Time
if wrappedEvent == nil {
err = fmt.Errorf("unsupported event type")
} else {
err = w.doWriteEvent(wrappedEvent)
err = w.doWriteEvent(key, wrappedEvent)
}

if err != nil {
Expand All @@ -162,7 +181,7 @@ func (w *KafkaWriter) WriteEventWithTimestamp(e interface{}, timestamp time.Time
}()
}

func (w *KafkaWriter) doWriteEvent(e *pb.Event) error {
func (w *KafkaWriter) doWriteEvent(key []byte, e *pb.Event) error {
if w == nil {
return nil
}
Expand All @@ -172,10 +191,15 @@ func (w *KafkaWriter) doWriteEvent(e *pb.Event) error {
return fmt.Errorf("failed to marshal event: %w", err)
}

err = w.WriteMessages(context.Background(), kafka.Message{
message := kafka.Message{
Value: data,
})
}

if key != nil {
message.Key = key
}

err = w.WriteMessages(context.Background(), message)
if err != nil {
return fmt.Errorf("failed to write event: %w", err)
}
Expand Down
Loading