diff --git a/Earthfile b/Earthfile index f0c500d..ab43f6a 100644 --- a/Earthfile +++ b/Earthfile @@ -13,7 +13,7 @@ protogen: --path protos/ego # save artifact to - SAVE ARTIFACT gen/ego/v1 AS LOCAL egopb + SAVE ARTIFACT gen/ego/v2 AS LOCAL egopb testprotogen: # copy the proto files to generate diff --git a/actor.go b/actor.go index aa720fd..d823917 100644 --- a/actor.go +++ b/actor.go @@ -36,12 +36,13 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/eventstream" - "github.com/tochemey/ego/internal/telemetry" - "github.com/tochemey/goakt/actors" - "github.com/tochemey/goakt/goaktpb" + "github.com/tochemey/goakt/v2/actors" + "github.com/tochemey/goakt/v2/goaktpb" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/eventstream" + "github.com/tochemey/ego/v2/internal/telemetry" ) var ( diff --git a/actor_test.go b/actor_test.go index dc761e7..ec41302 100644 --- a/actor_test.go +++ b/actor_test.go @@ -35,14 +35,15 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore/memory" - pgeventstore "github.com/tochemey/ego/eventstore/postgres" - "github.com/tochemey/ego/eventstream" - testpb "github.com/tochemey/ego/test/data/pb/v1" - "github.com/tochemey/goakt/actors" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/actors" + "github.com/tochemey/goakt/v2/log" "github.com/tochemey/gopack/postgres" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore/memory" + pgeventstore "github.com/tochemey/ego/v2/eventstore/postgres" + "github.com/tochemey/ego/v2/eventstream" + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) func TestActor(t *testing.T) { diff --git a/egopb/ego.pb.go b/egopb/ego.pb.go index 5083dc1..986acb7 100644 --- a/egopb/ego.pb.go +++ b/egopb/ego.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.31.0 // protoc (unknown) -// source: ego/v1/ego.proto +// source: ego/v2/ego.proto package egopb @@ -46,7 +46,7 @@ type Event struct { func (x *Event) Reset() { *x = Event{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[0] + mi := &file_ego_v2_ego_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -59,7 +59,7 @@ func (x *Event) String() string { func (*Event) ProtoMessage() {} func (x *Event) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[0] + mi := &file_ego_v2_ego_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -72,7 +72,7 @@ func (x *Event) ProtoReflect() protoreflect.Message { // Deprecated: Use Event.ProtoReflect.Descriptor instead. func (*Event) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{0} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{0} } func (x *Event) GetPersistenceId() string { @@ -143,7 +143,7 @@ type CommandReply struct { func (x *CommandReply) Reset() { *x = CommandReply{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[1] + mi := &file_ego_v2_ego_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -156,7 +156,7 @@ func (x *CommandReply) String() string { func (*CommandReply) ProtoMessage() {} func (x *CommandReply) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[1] + mi := &file_ego_v2_ego_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -169,7 +169,7 @@ func (x *CommandReply) ProtoReflect() protoreflect.Message { // Deprecated: Use CommandReply.ProtoReflect.Descriptor instead. func (*CommandReply) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{1} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{1} } func (m *CommandReply) GetReply() isCommandReply_Reply { @@ -231,7 +231,7 @@ type StateReply struct { func (x *StateReply) Reset() { *x = StateReply{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[2] + mi := &file_ego_v2_ego_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -244,7 +244,7 @@ func (x *StateReply) String() string { func (*StateReply) ProtoMessage() {} func (x *StateReply) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[2] + mi := &file_ego_v2_ego_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -257,7 +257,7 @@ func (x *StateReply) ProtoReflect() protoreflect.Message { // Deprecated: Use StateReply.ProtoReflect.Descriptor instead. func (*StateReply) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{2} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{2} } func (x *StateReply) GetPersistenceId() string { @@ -302,7 +302,7 @@ type ErrorReply struct { func (x *ErrorReply) Reset() { *x = ErrorReply{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[3] + mi := &file_ego_v2_ego_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -315,7 +315,7 @@ func (x *ErrorReply) String() string { func (*ErrorReply) ProtoMessage() {} func (x *ErrorReply) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[3] + mi := &file_ego_v2_ego_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -328,7 +328,7 @@ func (x *ErrorReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ErrorReply.ProtoReflect.Descriptor instead. func (*ErrorReply) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{3} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{3} } func (x *ErrorReply) GetMessage() string { @@ -348,7 +348,7 @@ type NoReply struct { func (x *NoReply) Reset() { *x = NoReply{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[4] + mi := &file_ego_v2_ego_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -361,7 +361,7 @@ func (x *NoReply) String() string { func (*NoReply) ProtoMessage() {} func (x *NoReply) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[4] + mi := &file_ego_v2_ego_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -374,7 +374,7 @@ func (x *NoReply) ProtoReflect() protoreflect.Message { // Deprecated: Use NoReply.ProtoReflect.Descriptor instead. func (*NoReply) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{4} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{4} } // GetStateCommand tells the Aggregate @@ -388,7 +388,7 @@ type GetStateCommand struct { func (x *GetStateCommand) Reset() { *x = GetStateCommand{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[5] + mi := &file_ego_v2_ego_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -401,7 +401,7 @@ func (x *GetStateCommand) String() string { func (*GetStateCommand) ProtoMessage() {} func (x *GetStateCommand) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[5] + mi := &file_ego_v2_ego_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -414,7 +414,7 @@ func (x *GetStateCommand) ProtoReflect() protoreflect.Message { // Deprecated: Use GetStateCommand.ProtoReflect.Descriptor instead. func (*GetStateCommand) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{5} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{5} } // Offset defines the projection offset @@ -436,7 +436,7 @@ type Offset struct { func (x *Offset) Reset() { *x = Offset{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[6] + mi := &file_ego_v2_ego_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -449,7 +449,7 @@ func (x *Offset) String() string { func (*Offset) ProtoMessage() {} func (x *Offset) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[6] + mi := &file_ego_v2_ego_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -462,7 +462,7 @@ func (x *Offset) ProtoReflect() protoreflect.Message { // Deprecated: Use Offset.ProtoReflect.Descriptor instead. func (*Offset) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{6} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{6} } func (x *Offset) GetShardNumber() uint64 { @@ -508,7 +508,7 @@ type ProjectionId struct { func (x *ProjectionId) Reset() { *x = ProjectionId{} if protoimpl.UnsafeEnabled { - mi := &file_ego_v1_ego_proto_msgTypes[7] + mi := &file_ego_v2_ego_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -521,7 +521,7 @@ func (x *ProjectionId) String() string { func (*ProjectionId) ProtoMessage() {} func (x *ProjectionId) ProtoReflect() protoreflect.Message { - mi := &file_ego_v1_ego_proto_msgTypes[7] + mi := &file_ego_v2_ego_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -534,7 +534,7 @@ func (x *ProjectionId) ProtoReflect() protoreflect.Message { // Deprecated: Use ProjectionId.ProtoReflect.Descriptor instead. func (*ProjectionId) Descriptor() ([]byte, []int) { - return file_ego_v1_ego_proto_rawDescGZIP(), []int{7} + return file_ego_v2_ego_proto_rawDescGZIP(), []int{7} } func (x *ProjectionId) GetProjectionName() string { @@ -551,10 +551,10 @@ func (x *ProjectionId) GetShardNumber() uint64 { return 0 } -var File_ego_v1_ego_proto protoreflect.FileDescriptor +var File_ego_v2_ego_proto protoreflect.FileDescriptor -var file_ego_v1_ego_proto_rawDesc = []byte{ - 0x0a, 0x10, 0x65, 0x67, 0x6f, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, +var file_ego_v2_ego_proto_rawDesc = []byte{ + 0x0a, 0x10, 0x65, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x65, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x65, 0x67, 0x6f, 0x2e, 0x76, 0x31, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x02, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, @@ -616,7 +616,7 @@ var file_ego_v1_ego_proto_rawDesc = []byte{ 0x6f, 0x6d, 0x2e, 0x65, 0x67, 0x6f, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x45, 0x67, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x48, 0x02, 0x50, 0x01, 0x5a, 0x20, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x6f, 0x63, 0x68, 0x65, 0x6d, 0x65, 0x79, 0x2f, 0x65, 0x67, 0x6f, - 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x67, 0x6f, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x45, 0x58, 0x58, 0xaa, + 0x2f, 0x76, 0x32, 0x3b, 0x65, 0x67, 0x6f, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x45, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x45, 0x67, 0x6f, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x06, 0x45, 0x67, 0x6f, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x12, 0x45, 0x67, 0x6f, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x45, 0x67, 0x6f, 0x3a, 0x3a, 0x56, 0x31, @@ -624,19 +624,19 @@ var file_ego_v1_ego_proto_rawDesc = []byte{ } var ( - file_ego_v1_ego_proto_rawDescOnce sync.Once - file_ego_v1_ego_proto_rawDescData = file_ego_v1_ego_proto_rawDesc + file_ego_v2_ego_proto_rawDescOnce sync.Once + file_ego_v2_ego_proto_rawDescData = file_ego_v2_ego_proto_rawDesc ) -func file_ego_v1_ego_proto_rawDescGZIP() []byte { - file_ego_v1_ego_proto_rawDescOnce.Do(func() { - file_ego_v1_ego_proto_rawDescData = protoimpl.X.CompressGZIP(file_ego_v1_ego_proto_rawDescData) +func file_ego_v2_ego_proto_rawDescGZIP() []byte { + file_ego_v2_ego_proto_rawDescOnce.Do(func() { + file_ego_v2_ego_proto_rawDescData = protoimpl.X.CompressGZIP(file_ego_v2_ego_proto_rawDescData) }) - return file_ego_v1_ego_proto_rawDescData + return file_ego_v2_ego_proto_rawDescData } -var file_ego_v1_ego_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_ego_v1_ego_proto_goTypes = []interface{}{ +var file_ego_v2_ego_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_ego_v2_ego_proto_goTypes = []interface{}{ (*Event)(nil), // 0: ego.v1.Event (*CommandReply)(nil), // 1: ego.v1.CommandReply (*StateReply)(nil), // 2: ego.v1.StateReply @@ -647,7 +647,7 @@ var file_ego_v1_ego_proto_goTypes = []interface{}{ (*ProjectionId)(nil), // 7: ego.v1.ProjectionId (*anypb.Any)(nil), // 8: google.protobuf.Any } -var file_ego_v1_ego_proto_depIdxs = []int32{ +var file_ego_v2_ego_proto_depIdxs = []int32{ 8, // 0: ego.v1.Event.event:type_name -> google.protobuf.Any 8, // 1: ego.v1.Event.resulting_state:type_name -> google.protobuf.Any 2, // 2: ego.v1.CommandReply.state_reply:type_name -> ego.v1.StateReply @@ -660,13 +660,13 @@ var file_ego_v1_ego_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_ego_v1_ego_proto_init() } -func file_ego_v1_ego_proto_init() { - if File_ego_v1_ego_proto != nil { +func init() { file_ego_v2_ego_proto_init() } +func file_ego_v2_ego_proto_init() { + if File_ego_v2_ego_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_ego_v1_ego_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Event); i { case 0: return &v.state @@ -678,7 +678,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CommandReply); i { case 0: return &v.state @@ -690,7 +690,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*StateReply); i { case 0: return &v.state @@ -702,7 +702,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ErrorReply); i { case 0: return &v.state @@ -714,7 +714,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*NoReply); i { case 0: return &v.state @@ -726,7 +726,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetStateCommand); i { case 0: return &v.state @@ -738,7 +738,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Offset); i { case 0: return &v.state @@ -750,7 +750,7 @@ func file_ego_v1_ego_proto_init() { return nil } } - file_ego_v1_ego_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_ego_v2_ego_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProjectionId); i { case 0: return &v.state @@ -763,7 +763,7 @@ func file_ego_v1_ego_proto_init() { } } } - file_ego_v1_ego_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_ego_v2_ego_proto_msgTypes[1].OneofWrappers = []interface{}{ (*CommandReply_StateReply)(nil), (*CommandReply_ErrorReply)(nil), } @@ -771,18 +771,18 @@ func file_ego_v1_ego_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_ego_v1_ego_proto_rawDesc, + RawDescriptor: file_ego_v2_ego_proto_rawDesc, NumEnums: 0, NumMessages: 8, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_ego_v1_ego_proto_goTypes, - DependencyIndexes: file_ego_v1_ego_proto_depIdxs, - MessageInfos: file_ego_v1_ego_proto_msgTypes, + GoTypes: file_ego_v2_ego_proto_goTypes, + DependencyIndexes: file_ego_v2_ego_proto_depIdxs, + MessageInfos: file_ego_v2_ego_proto_msgTypes, }.Build() - File_ego_v1_ego_proto = out.File - file_ego_v1_ego_proto_rawDesc = nil - file_ego_v1_ego_proto_goTypes = nil - file_ego_v1_ego_proto_depIdxs = nil + File_ego_v2_ego_proto = out.File + file_ego_v2_ego_proto_rawDesc = nil + file_ego_v2_ego_proto_goTypes = nil + file_ego_v2_ego_proto_depIdxs = nil } diff --git a/engine.go b/engine.go index 330ce69..61625da 100644 --- a/engine.go +++ b/engine.go @@ -27,36 +27,41 @@ package ego import ( "context" "fmt" + "os" "time" "github.com/pkg/errors" "go.uber.org/atomic" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/eventstream" - egotel "github.com/tochemey/ego/internal/telemetry" - "github.com/tochemey/ego/offsetstore" - "github.com/tochemey/ego/projection" - "github.com/tochemey/goakt/actors" - "github.com/tochemey/goakt/discovery" - "github.com/tochemey/goakt/log" - "github.com/tochemey/goakt/telemetry" + "github.com/tochemey/goakt/v2/actors" + "github.com/tochemey/goakt/v2/discovery" + "github.com/tochemey/goakt/v2/log" + "github.com/tochemey/goakt/v2/telemetry" + + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/eventstream" + egotel "github.com/tochemey/ego/v2/internal/telemetry" + "github.com/tochemey/ego/v2/offsetstore" + "github.com/tochemey/ego/v2/projection" ) // Engine represents the engine that empowers the various entities type Engine struct { - name string // name is the application name - eventsStore eventstore.EventsStore // eventsStore is the events store - enableCluster *atomic.Bool // enableCluster enable/disable cluster mode - actorSystem actors.ActorSystem // actorSystem is the underlying actor system - logger log.Logger // logger is the logging engine to use - discoveryProvider discovery.Provider // discoveryProvider is the discovery provider for clustering - discoveryConfig discovery.Config // discoveryConfig is the discovery provider config for clustering - telemetry *telemetry.Telemetry // telemetry is the observability engine - partitionsCount uint64 // partitionsCount specifies the number of partitions - started atomic.Bool - - eventStream eventstream.Stream + name string // name is the application name + eventsStore eventstore.EventsStore // eventsStore is the events store + enableCluster *atomic.Bool // enableCluster enable/disable cluster mode + actorSystem actors.ActorSystem // actorSystem is the underlying actor system + logger log.Logger // logger is the logging engine to use + discoveryProvider discovery.Provider // discoveryProvider is the discovery provider for clustering + telemetry *telemetry.Telemetry // telemetry is the observability engine + partitionsCount uint64 // partitionsCount specifies the number of partitions + started atomic.Bool + hostName string + peersPort int + gossipPort int + remotingPort int + minimumPeersQuorum uint16 + eventStream eventstream.Stream } // NewEngine creates an instance of Engine @@ -90,9 +95,18 @@ func (x *Engine) Start(ctx context.Context) error { } if x.enableCluster.Load() { - opts = append(opts, actors.WithClustering( - discovery.NewServiceDiscovery(x.discoveryProvider, x.discoveryConfig), - x.partitionsCount)) + if x.hostName == "" { + x.hostName, _ = os.Hostname() + } + + opts = append(opts, + actors.WithClustering( + x.discoveryProvider, + x.partitionsCount, + x.minimumPeersQuorum, + x.gossipPort, + x.peersPort), + actors.WithRemoting(x.hostName, int32(x.remotingPort))) } var err error diff --git a/engine_test.go b/engine_test.go index e551b07..81eee67 100644 --- a/engine_test.go +++ b/engine_test.go @@ -38,14 +38,14 @@ import ( "github.com/travisjeffery/go-dynaport" "google.golang.org/protobuf/proto" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore/memory" - samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1" - offsetstore "github.com/tochemey/ego/offsetstore/memory" - "github.com/tochemey/ego/projection" - "github.com/tochemey/goakt/discovery" - "github.com/tochemey/goakt/log" - mockdisco "github.com/tochemey/goakt/mocks/discovery" + "github.com/tochemey/goakt/v2/log" + mockdisco "github.com/tochemey/goakt/v2/mocks/discovery" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore/memory" + samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1" + offsetstore "github.com/tochemey/ego/v2/offsetstore/memory" + "github.com/tochemey/ego/v2/projection" ) func TestEgo(t *testing.T) { @@ -62,16 +62,8 @@ func TestEgo(t *testing.T) { clusterPort := nodePorts[1] remotingPort := nodePorts[2] - podName := "pod" host := "127.0.0.1" - // set the environments - t.Setenv("GOSSIP_PORT", strconv.Itoa(gossipPort)) - t.Setenv("CLUSTER_PORT", strconv.Itoa(clusterPort)) - t.Setenv("REMOTING_PORT", strconv.Itoa(remotingPort)) - t.Setenv("NODE_NAME", podName) - t.Setenv("NODE_IP", host) - // define discovered addresses addrs := []string{ net.JoinHostPort(host, strconv.Itoa(gossipPort)), @@ -79,13 +71,11 @@ func TestEgo(t *testing.T) { // mock the discovery provider provider := new(mockdisco.Provider) - config := discovery.NewConfig() provider.EXPECT().ID().Return("testDisco") provider.EXPECT().Initialize().Return(nil) provider.EXPECT().Register().Return(nil) provider.EXPECT().Deregister().Return(nil) - provider.EXPECT().SetConfig(config).Return(nil) provider.EXPECT().DiscoverPeers().Return(addrs, nil) provider.EXPECT().Close().Return(nil) @@ -93,7 +83,7 @@ func TestEgo(t *testing.T) { handler := projection.NewDiscardHandler(log.DefaultLogger) // create the ego engine e := NewEngine("Sample", eventStore, - WithCluster(provider, config, 4)) + WithCluster(provider, 4, 1, host, remotingPort, gossipPort, clusterPort)) // start ego engine err := e.Start(ctx) diff --git a/entity.go b/entity.go index 2ccd0e0..5e346db 100644 --- a/entity.go +++ b/entity.go @@ -31,8 +31,9 @@ import ( "github.com/pkg/errors" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/goakt/actors" + "github.com/tochemey/goakt/v2/actors" + + "github.com/tochemey/ego/v2/egopb" ) var ( diff --git a/entity_test.go b/entity_test.go index 1c4673c..96a3cf2 100644 --- a/entity_test.go +++ b/entity_test.go @@ -31,8 +31,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tochemey/ego/eventstore/memory" - samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1" + + "github.com/tochemey/ego/v2/eventstore/memory" + samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1" ) func TestNewEntity(t *testing.T) { diff --git a/eventstore/iface.go b/eventstore/iface.go index 6aa8e56..d42cd92 100644 --- a/eventstore/iface.go +++ b/eventstore/iface.go @@ -27,7 +27,7 @@ package eventstore import ( "context" - "github.com/tochemey/ego/egopb" + "github.com/tochemey/ego/v2/egopb" ) // EventsStore defines the API to write to the events store diff --git a/eventstore/memory/memory.go b/eventstore/memory/memory.go index 17ae012..d42e14c 100644 --- a/eventstore/memory/memory.go +++ b/eventstore/memory/memory.go @@ -39,9 +39,9 @@ import ( "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/known/anypb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/internal/telemetry" + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/internal/telemetry" ) // EventsStore keep in memory every journal diff --git a/eventstore/memory/memory_test.go b/eventstore/memory/memory_test.go index 338cabd..593902d 100644 --- a/eventstore/memory/memory_test.go +++ b/eventstore/memory/memory_test.go @@ -35,9 +35,9 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - testpb "github.com/tochemey/ego/test/data/pb/v1" + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) func TestEventsStore(t *testing.T) { diff --git a/eventstore/postgres/postgres.go b/eventstore/postgres/postgres.go index 85a3cac..b0127eb 100644 --- a/eventstore/postgres/postgres.go +++ b/eventstore/postgres/postgres.go @@ -33,10 +33,11 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/internal/telemetry" "github.com/tochemey/gopack/postgres" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/internal/telemetry" ) var ( diff --git a/eventstore/postgres/postgres_test.go b/eventstore/postgres/postgres_test.go index 5d108bc..3bb729c 100644 --- a/eventstore/postgres/postgres_test.go +++ b/eventstore/postgres/postgres_test.go @@ -35,10 +35,11 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - testpb "github.com/tochemey/ego/test/data/pb/v1" "github.com/tochemey/gopack/postgres" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) func TestPostgresEventsStore(t *testing.T) { diff --git a/eventstore/postgres/row.go b/eventstore/postgres/row.go index 4d8a98c..698f4dd 100644 --- a/eventstore/postgres/row.go +++ b/eventstore/postgres/row.go @@ -33,7 +33,7 @@ import ( "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/known/anypb" - "github.com/tochemey/ego/egopb" + "github.com/tochemey/ego/v2/egopb" ) // row represents the events store row diff --git a/eventstream/subscriber.go b/eventstream/subscriber.go index 750699d..0ed2cf2 100644 --- a/eventstream/subscriber.go +++ b/eventstream/subscriber.go @@ -29,7 +29,7 @@ import ( "github.com/google/uuid" - "github.com/tochemey/ego/internal/queue" + "github.com/tochemey/ego/v2/internal/queue" ) // Subscriber defines the Subscriber Interface diff --git a/example/main.go b/example/main.go index 1511313..922129e 100644 --- a/example/main.go +++ b/example/main.go @@ -33,10 +33,11 @@ import ( "syscall" "github.com/google/uuid" - "github.com/tochemey/ego" - "github.com/tochemey/ego/eventstore/memory" - samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1" "google.golang.org/protobuf/proto" + + "github.com/tochemey/ego/v2" + "github.com/tochemey/ego/v2/eventstore/memory" + samplepb "github.com/tochemey/ego/v2/example/pbs/sample/pb/v1" ) func main() { diff --git a/example/pbs/sample/pb/v1/sample.pb.go b/example/pbs/sample/pb/v1/sample.pb.go index f1c0a70..7921454 100644 --- a/example/pbs/sample/pb/v1/sample.pb.go +++ b/example/pbs/sample/pb/v1/sample.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v2.31.0 // protoc (unknown) -// source: sample/pb/v1/sample.proto +// source: sample/pb/v2/sample.proto package samplepb @@ -451,13 +451,13 @@ func file_sample_pb_v1_sample_proto_rawDescGZIP() []byte { var file_sample_pb_v1_sample_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_sample_pb_v1_sample_proto_goTypes = []interface{}{ - (*Ping)(nil), // 0: sample.v1.Ping - (*Pong)(nil), // 1: sample.v1.Pong - (*Account)(nil), // 2: sample.v1.Account - (*CreateAccount)(nil), // 3: sample.v1.CreateAccount - (*CreditAccount)(nil), // 4: sample.v1.CreditAccount - (*AccountCreated)(nil), // 5: sample.v1.AccountCreated - (*AccountCredited)(nil), // 6: sample.v1.AccountCredited + (*Ping)(nil), // 0: sample.v2.Ping + (*Pong)(nil), // 1: sample.v2.Pong + (*Account)(nil), // 2: sample.v2.Account + (*CreateAccount)(nil), // 3: sample.v2.CreateAccount + (*CreditAccount)(nil), // 4: sample.v2.CreditAccount + (*AccountCreated)(nil), // 5: sample.v2.AccountCreated + (*AccountCredited)(nil), // 6: sample.v2.AccountCredited } var file_sample_pb_v1_sample_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type diff --git a/go.mod b/go.mod index b068524..37cbffc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tochemey/ego +module github.com/tochemey/ego/v2 go 1.21 @@ -12,30 +12,30 @@ require ( github.com/hashicorp/go-memdb v1.3.4 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.9.0 - github.com/tochemey/goakt v1.6.0 + github.com/tochemey/goakt/v2 v2.0.0 github.com/tochemey/gopack v0.0.0-20240303193017-58b82904de1b github.com/travisjeffery/go-dynaport v1.0.0 - go.opentelemetry.io/otel v1.24.0 - go.opentelemetry.io/otel/trace v1.24.0 + go.opentelemetry.io/otel v1.27.0 + go.opentelemetry.io/otel/trace v1.27.0 go.uber.org/atomic v1.11.0 go.uber.org/goleak v1.3.0 golang.org/x/sync v0.7.0 - google.golang.org/protobuf v1.33.0 + google.golang.org/protobuf v1.34.1 ) require ( - connectrpc.com/connect v1.16.0 // indirect + connectrpc.com/connect v1.16.2 // indirect connectrpc.com/otelconnect v0.7.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/RoaringBitmap/roaring v1.9.0 // indirect + github.com/RoaringBitmap/roaring v1.9.3 // indirect github.com/XSAM/otelsql v0.29.0 // indirect + github.com/alphadose/haxmap v1.4.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/buraksezer/consistent v0.10.0 // indirect - github.com/buraksezer/olric v0.5.6-0.20240205222928-c5efb0d4b5ea // indirect - github.com/caarlos0/env/v10 v10.0.0 // indirect + github.com/buraksezer/olric v0.5.6-0.20240510193155-81e12546eb39 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/continuity v0.4.3 // indirect @@ -43,13 +43,13 @@ require ( github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/emicklei/go-restful/v3 v3.12.0 // indirect github.com/georgysavva/scany/v2 v2.1.0 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/jsonpointer v0.20.0 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect @@ -57,19 +57,20 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect - github.com/hashicorp/go-msgpack v0.5.5 // indirect + github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-sockaddr v1.0.6 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/logutils v1.0.0 // indirect - github.com/hashicorp/memberlist v0.5.0 // indirect + github.com/hashicorp/memberlist v0.5.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/miekg/dns v1.1.58 // indirect + github.com/miekg/dns v1.1.59 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mschoch/smat v0.2.0 // indirect @@ -80,7 +81,7 @@ require ( github.com/ory/dockertest v3.3.5+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/redis/go-redis/v9 v9.5.1 // indirect - github.com/reugn/go-quartz v0.11.2 // indirect + github.com/reugn/go-quartz v0.12.0 // indirect github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -89,28 +90,29 @@ require ( github.com/tidwall/redcon v1.6.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - go.opentelemetry.io/otel/metric v1.24.0 // indirect + github.com/zeebo/xxh3 v1.0.2 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/mod v0.16.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/term v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.19.0 // indirect - google.golang.org/appengine v1.6.8 // indirect + golang.org/x/tools v0.21.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.29.3 // indirect - k8s.io/apimachinery v0.29.3 // indirect - k8s.io/client-go v0.29.3 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect + k8s.io/api v0.29.4 // indirect + k8s.io/apimachinery v0.29.4 // indirect + k8s.io/client-go v0.29.4 // indirect + k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect + k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 270454f..03da846 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -connectrpc.com/connect v1.16.0 h1:rdtfQjZ0OyFkWPTegBNcH7cwquGAN1WzyJy80oFNibg= -connectrpc.com/connect v1.16.0/go.mod h1:XpZAduBQUySsb4/KO5JffORVkDI4B6/EYPi7N8xpNZw= +connectrpc.com/connect v1.16.2 h1:ybd6y+ls7GOlb7Bh5C8+ghA6SvCBajHwxssO2CGFjqE= +connectrpc.com/connect v1.16.2/go.mod h1:n2kgwskMHXC+lVqb18wngEpF95ldBHXjZYJussz5FRc= connectrpc.com/otelconnect v0.7.0 h1:ZH55ZZtcJOTKWWLy3qmL4Pam4RzRWBJFOqTPyAqCXkY= connectrpc.com/otelconnect v0.7.0/go.mod h1:Bt2ivBymHZHqxvo4HkJ0EwHuUzQN6k2l0oH+mp/8nwc= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= @@ -15,14 +15,16 @@ github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/RoaringBitmap/roaring v1.6.0/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE= -github.com/RoaringBitmap/roaring v1.9.0 h1:lwKhr90/j0jVXJyh5X+vQN1VVn77rQFfYnh6RDRGCcE= -github.com/RoaringBitmap/roaring v1.9.0/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= +github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM= +github.com/RoaringBitmap/roaring v1.9.3/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= github.com/XSAM/otelsql v0.29.0 h1:pEw9YXXs8ZrGRYfDc0cmArIz9lci5b42gmP5+tA1Huc= github.com/XSAM/otelsql v0.29.0/go.mod h1:d3/0xGIGC5RVEE+Ld7KotwaLy6zDeaF3fLJHOPpdN2w= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alphadose/haxmap v1.4.0 h1:1yn+oGzy2THJj1DMuJBzRanE3sMnDAjJVbU0L31Jp3w= +github.com/alphadose/haxmap v1.4.0/go.mod h1:rjHw1IAqbxm0S3U5tD16GoKsiAd8FWx5BJ2IYqXwgmM= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= @@ -41,14 +43,11 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/buraksezer/consistent v0.10.0 h1:hqBgz1PvNLC5rkWcEBVAL9dFMBWz6I0VgUCW25rrZlU= github.com/buraksezer/consistent v0.10.0/go.mod h1:6BrVajWq7wbKZlTOUPs/XVfR8c0maujuPowduSpZqmw= -github.com/buraksezer/olric v0.5.6-0.20240205222928-c5efb0d4b5ea h1:iThz84rs8fghn9bRJLMxJjT6CAjIa6uCr/B2H6+qocY= -github.com/buraksezer/olric v0.5.6-0.20240205222928-c5efb0d4b5ea/go.mod h1:b1aCKANfqosRKIeYR5NPETD8/VnxcVdlbYGMZ97GPNA= -github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdzXA= -github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18= +github.com/buraksezer/olric v0.5.6-0.20240510193155-81e12546eb39 h1:ZB2KxErCucUiYTz9gZlujrurj4WcOe+j4t1sB1okuGw= +github.com/buraksezer/olric v0.5.6-0.20240510193155-81e12546eb39/go.mod h1:b1aCKANfqosRKIeYR5NPETD8/VnxcVdlbYGMZ97GPNA= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -58,7 +57,6 @@ github.com/cockroachdb/cockroach-go/v2 v2.2.0 h1:/5znzg5n373N/3ESjHF5SMLxiW4RKB0 github.com/cockroachdb/cockroach-go/v2 v2.2.0/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI= github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8= github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -70,10 +68,10 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk= +github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flowchartsman/retry v1.2.0 h1:qDhlw6RNufXz6RGr+IiYimFpMMkt77SUSHY5tgFaUCU= github.com/flowchartsman/retry v1.2.0/go.mod h1:+sfx8OgCCiAr3t5jh2Gk+T0fRTI+k52edaYxURQxY64= @@ -84,22 +82,20 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= -github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -112,8 +108,6 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -123,15 +117,14 @@ github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvR github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8 h1:gpptm606MZYGaMHMsB4Srmb6EbW/IVHnt04rcMXnkBQ= -github.com/google/pprof v0.0.0-20230912144702-c363fe2c2ed8/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -149,8 +142,8 @@ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-memdb v1.3.4 h1:XSL3NR682X/cVk2IeV0d70N4DZ9ljI885xAEU8IoK3c= github.com/hashicorp/go-memdb v1.3.4/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYiNm53bMpgSg= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0= +github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= @@ -167,8 +160,9 @@ github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iP github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= +github.com/hashicorp/memberlist v0.5.1 h1:mk5dRuzeDNis2bi6LLoQIXfMH7JQvAzt3mQD0vNZZUo= +github.com/hashicorp/memberlist v0.5.1/go.mod h1:zGDXV6AqbDTKTM6yxW0I4+JtFzZAJVoIPvss4hV8F24= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -189,12 +183,13 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -216,8 +211,8 @@ github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67 github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4= -github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY= +github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= +github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4= @@ -236,20 +231,20 @@ github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOl github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt/v2 v2.5.5 h1:ROfXb50elFq5c9+1ztaUbdlrArNFl2+fQWP6B8HGEq4= -github.com/nats-io/jwt/v2 v2.5.5/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.10.12 h1:G6u+RDrHkw4bkwn7I911O5jqys7jJVRY6MwgndyUsnE= -github.com/nats-io/nats-server/v2 v2.10.12/go.mod h1:H1n6zXtYLFCgXcf/SF8QNTSIFuS8tyZQMN9NguUHdEs= -github.com/nats-io/nats.go v1.34.0 h1:fnxnPCNiwIG5w08rlMcEKTUw4AV/nKyGCOJE8TdhSPk= -github.com/nats-io/nats.go v1.34.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/jwt/v2 v2.5.7 h1:j5lH1fUXCnJnY8SsQeB/a/z9Azgu2bYIDvtPVNdxe2c= +github.com/nats-io/jwt/v2 v2.5.7/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= +github.com/nats-io/nats-server/v2 v2.10.16 h1:2jXaiydp5oB/nAx/Ytf9fdCi9QN6ItIc9eehX8kwVV0= +github.com/nats-io/nats-server/v2 v2.10.16/go.mod h1:Pksi38H2+6xLe1vQx0/EA4bzetM0NqyIHcIbmgXSkIU= +github.com/nats-io/nats.go v1.35.0 h1:XFNqNM7v5B+MQMKqVGAyHwYhyKb48jrenXNxIU20ULk= +github.com/nats-io/nats.go v1.35.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -282,10 +277,10 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/reugn/go-quartz v0.11.2 h1:+jc54Ji06n/D/endEPmc+CuG/Jc8466nda1oxtFRrks= -github.com/reugn/go-quartz v0.11.2/go.mod h1:no4ktgYbAAuY0E1SchR8cTx1LF4jYIzdgaQhzRPSkpk= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/reugn/go-quartz v0.12.0 h1:RsrklW++R5Swc7mCPYseXM06PTWN4N7/f1rsYkhHiww= +github.com/reugn/go-quartz v0.12.0/go.mod h1:no4ktgYbAAuY0E1SchR8cTx1LF4jYIzdgaQhzRPSkpk= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/ryanuber/columnize v2.1.2+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -311,7 +306,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -322,10 +316,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/redcon v1.6.2 h1:5qfvrrybgtO85jnhSravmkZyC0D+7WstbfCs3MmPhow= github.com/tidwall/redcon v1.6.2/go.mod h1:p5Wbsgeyi2VSTBWOcA5vRXrOb9arFTcU2+ZzFjqV75Y= -github.com/tochemey/goakt v1.5.1 h1:th0U73eZY15ejFG5rQKWsEcqXF5aWkaX46+cT4SKKNI= -github.com/tochemey/goakt v1.5.1/go.mod h1:BwKY08ag2hKanuWuyuKeqcH5hfg/tB4Sc7F7xwwZjIM= -github.com/tochemey/goakt v1.6.0 h1:Aij4US4rFS1jEHSkrzelK8j4NVU9O9kRQYLv85n4Ugc= -github.com/tochemey/goakt v1.6.0/go.mod h1:qA+l15RczHoX2YMrgNlkmVEihqStgMQrcqBqcvjlVaY= +github.com/tochemey/goakt/v2 v2.0.0 h1:sGDZXrRqkpzfgJxeGVkrtPKsti8bdWwQIlTErn3Jhwk= +github.com/tochemey/goakt/v2 v2.0.0/go.mod h1:bq6L4i+g25Gf+Exq7mOoBjKdf1X6cSo1/+CqXFoSgS8= github.com/tochemey/gopack v0.0.0-20240303193017-58b82904de1b h1:OsgVtcoRL6V8ismMIwG9XSfFG73oC9U6XWgTECoTit0= github.com/tochemey/gopack v0.0.0-20240303193017-58b82904de1b/go.mod h1:EeuLasIUo0sW+3lk5yTi4xkjknXZOZ4B3tUX5pvMDQI= github.com/travisjeffery/go-dynaport v1.0.0 h1:m/qqf5AHgB96CMMSworIPyo1i7NZueRsnwdzdCJ8Ajw= @@ -338,17 +330,20 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= -go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= -go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= -go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= -go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= -go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= -go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9osbiBrJrz/w8= -go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0= -go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= -go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= +github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= +github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= +github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= +go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -364,15 +359,15 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -380,26 +375,19 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -415,31 +403,22 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -448,19 +427,14 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -481,21 +455,21 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw= -k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= -k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU= -k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= -k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg= -k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/api v0.29.4 h1:WEnF/XdxuCxdG3ayHNRR8yH3cI1B/llkWBma6bq4R3w= +k8s.io/api v0.29.4/go.mod h1:DetSv0t4FBTcEpfA84NJV3g9a7+rSzlUHk5ADAYHUv0= +k8s.io/apimachinery v0.29.4 h1:RaFdJiDmuKs/8cm1M6Dh1Kvyh59YQFDcFuFTSmXes6Q= +k8s.io/apimachinery v0.29.4/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/client-go v0.29.4 h1:79ytIedxVfyXV8rpH3jCBW0u+un0fxHDwX5F9K8dPR8= +k8s.io/client-go v0.29.4/go.mod h1:kC1thZQ4zQWYwldsfI088BbK6RkxK+aF5ebV8y9Q4tk= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM= +k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= +k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/helper_test.go b/helper_test.go index e4b98ef..abb6f52 100644 --- a/helper_test.go +++ b/helper_test.go @@ -28,8 +28,9 @@ import ( "context" "github.com/pkg/errors" - testpb "github.com/tochemey/ego/test/data/pb/v1" "google.golang.org/protobuf/types/known/emptypb" + + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) // AccountEntityBehavior implement EntityBehavior diff --git a/offsetstore/iface.go b/offsetstore/iface.go index 6e773b5..5917ae2 100644 --- a/offsetstore/iface.go +++ b/offsetstore/iface.go @@ -27,7 +27,7 @@ package offsetstore import ( "context" - "github.com/tochemey/ego/egopb" + "github.com/tochemey/ego/v2/egopb" ) // OffsetStore defines the contract needed to persist offsets diff --git a/offsetstore/memory/memory.go b/offsetstore/memory/memory.go index 2a007a8..81414ff 100644 --- a/offsetstore/memory/memory.go +++ b/offsetstore/memory/memory.go @@ -34,9 +34,9 @@ import ( "github.com/pkg/errors" "go.uber.org/atomic" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/internal/telemetry" - "github.com/tochemey/ego/offsetstore" + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/internal/telemetry" + "github.com/tochemey/ego/v2/offsetstore" ) // OffsetStore implements the offset store interface diff --git a/offsetstore/memory/memory_test.go b/offsetstore/memory/memory_test.go index 8d756b4..b1fad8f 100644 --- a/offsetstore/memory/memory_test.go +++ b/offsetstore/memory/memory_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/offsetstore" + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/offsetstore" ) func TestOffsetStore(t *testing.T) { diff --git a/offsetstore/postgres/postgres.go b/offsetstore/postgres/postgres.go index 2470bc5..3cac605 100644 --- a/offsetstore/postgres/postgres.go +++ b/offsetstore/postgres/postgres.go @@ -34,10 +34,11 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/proto" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/internal/telemetry" - "github.com/tochemey/ego/offsetstore" "github.com/tochemey/gopack/postgres" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/internal/telemetry" + "github.com/tochemey/ego/v2/offsetstore" ) var ( diff --git a/offsetstore/postgres/postgres_test.go b/offsetstore/postgres/postgres_test.go index a8842ea..254f846 100644 --- a/offsetstore/postgres/postgres_test.go +++ b/offsetstore/postgres/postgres_test.go @@ -33,9 +33,10 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/offsetstore" "github.com/tochemey/gopack/postgres" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/offsetstore" ) func TestPostgresOffsetStore(t *testing.T) { diff --git a/option.go b/option.go index ab132a0..02dc24a 100644 --- a/option.go +++ b/option.go @@ -27,9 +27,9 @@ package ego import ( "go.uber.org/atomic" - "github.com/tochemey/goakt/discovery" - "github.com/tochemey/goakt/log" - "github.com/tochemey/goakt/telemetry" + "github.com/tochemey/goakt/v2/discovery" + "github.com/tochemey/goakt/v2/log" + "github.com/tochemey/goakt/v2/telemetry" ) // Option is the interface that applies a configuration option. @@ -49,12 +49,16 @@ func (f OptionFunc) Apply(e *Engine) { } // WithCluster enables cluster mode -func WithCluster(discoProvider discovery.Provider, config discovery.Config, partitionsCount uint64) Option { +func WithCluster(provider discovery.Provider, partitionCount uint64, minimumPeersQuorum uint16, host string, remotingPort, gossipPort, peersPort int) Option { return OptionFunc(func(e *Engine) { e.enableCluster = atomic.NewBool(true) - e.discoveryProvider = discoProvider - e.discoveryConfig = config - e.partitionsCount = partitionsCount + e.discoveryProvider = provider + e.partitionsCount = partitionCount + e.peersPort = peersPort + e.minimumPeersQuorum = minimumPeersQuorum + e.gossipPort = gossipPort + e.hostName = host + e.remotingPort = remotingPort }) } diff --git a/option_test.go b/option_test.go index 21ca5ff..c8d6131 100644 --- a/option_test.go +++ b/option_test.go @@ -30,18 +30,16 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/tochemey/goakt/discovery" - "github.com/tochemey/goakt/discovery/kubernetes" - "github.com/tochemey/goakt/log" - "github.com/tochemey/goakt/telemetry" + "github.com/tochemey/goakt/v2/discovery/kubernetes" + "github.com/tochemey/goakt/v2/log" + "github.com/tochemey/goakt/v2/telemetry" ) func TestOptions(t *testing.T) { // use the default logger of GoAkt logger := log.DefaultLogger // create a discovery provider - discoveryProvider := kubernetes.NewDiscovery() - config := discovery.NewConfig() + discoveryProvider := kubernetes.NewDiscovery(&kubernetes.Config{}) tel := telemetry.New() testCases := []struct { @@ -51,12 +49,16 @@ func TestOptions(t *testing.T) { }{ { name: "WithCluster", - option: WithCluster(discoveryProvider, config, 30), + option: WithCluster(discoveryProvider, 30, 3, "localhost", 1334, 1335, 1336), expected: Engine{ - discoveryProvider: discoveryProvider, - discoveryConfig: config, - partitionsCount: 30, - enableCluster: atomic.NewBool(true), + discoveryProvider: discoveryProvider, + minimumPeersQuorum: 3, + hostName: "localhost", + gossipPort: 1335, + peersPort: 1336, + remotingPort: 1334, + partitionsCount: 30, + enableCluster: atomic.NewBool(true), }, }, { diff --git a/projection/actor.go b/projection/actor.go index fdfbd97..323a4ea 100644 --- a/projection/actor.go +++ b/projection/actor.go @@ -29,10 +29,11 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/offsetstore" - "github.com/tochemey/goakt/actors" - "github.com/tochemey/goakt/goaktpb" + "github.com/tochemey/goakt/v2/actors" + "github.com/tochemey/goakt/v2/goaktpb" + + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/offsetstore" ) // Start is used to start the projection diff --git a/projection/actor_test.go b/projection/actor_test.go index c88a49b..3a48f3e 100644 --- a/projection/actor_test.go +++ b/projection/actor_test.go @@ -36,12 +36,13 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore/memory" - memoffsetstore "github.com/tochemey/ego/offsetstore/memory" - testpb "github.com/tochemey/ego/test/data/pb/v1" - "github.com/tochemey/goakt/actors" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/actors" + "github.com/tochemey/goakt/v2/log" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore/memory" + memoffsetstore "github.com/tochemey/ego/v2/offsetstore/memory" + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) func TestActor(t *testing.T) { diff --git a/projection/handler.go b/projection/handler.go index 34d13fb..436ee46 100644 --- a/projection/handler.go +++ b/projection/handler.go @@ -30,7 +30,7 @@ import ( "go.uber.org/atomic" "google.golang.org/protobuf/types/known/anypb" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/log" ) // Handler is used to handle event and state consumed from the event store diff --git a/projection/option.go b/projection/option.go index 7f12229..361309d 100644 --- a/projection/option.go +++ b/projection/option.go @@ -27,7 +27,7 @@ package projection import ( "time" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/log" ) // Option is the interface that applies a configuration option. diff --git a/projection/option_test.go b/projection/option_test.go index 53088fb..993a175 100644 --- a/projection/option_test.go +++ b/projection/option_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/log" ) func TestOption(t *testing.T) { diff --git a/projection/runner.go b/projection/runner.go index d4e0981..9832ea0 100644 --- a/projection/runner.go +++ b/projection/runner.go @@ -35,11 +35,12 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore" - "github.com/tochemey/ego/internal/telemetry" - "github.com/tochemey/ego/offsetstore" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/log" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore" + "github.com/tochemey/ego/v2/internal/telemetry" + "github.com/tochemey/ego/v2/offsetstore" ) // runner defines the projection runner diff --git a/projection/runner_test.go b/projection/runner_test.go index bc40ea2..9e39e28 100644 --- a/projection/runner_test.go +++ b/projection/runner_test.go @@ -38,11 +38,12 @@ import ( "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/tochemey/ego/egopb" - "github.com/tochemey/ego/eventstore/memory" - memoffsetstore "github.com/tochemey/ego/offsetstore/memory" - testpb "github.com/tochemey/ego/test/data/pb/v1" - "github.com/tochemey/goakt/log" + "github.com/tochemey/goakt/v2/log" + + "github.com/tochemey/ego/v2/egopb" + "github.com/tochemey/ego/v2/eventstore/memory" + memoffsetstore "github.com/tochemey/ego/v2/offsetstore/memory" + testpb "github.com/tochemey/ego/v2/test/data/pb/v1" ) func TestProjection(t *testing.T) { diff --git a/protos/ego/v1/ego.proto b/protos/ego/v2/ego.proto similarity index 97% rename from protos/ego/v1/ego.proto rename to protos/ego/v2/ego.proto index e3cf3f0..16df8af 100644 --- a/protos/ego/v1/ego.proto +++ b/protos/ego/v2/ego.proto @@ -4,7 +4,7 @@ package ego.v1; import "google/protobuf/any.proto"; -option go_package = "github.com/tochemey/ego/v1;egopb"; +option go_package = "github.com/tochemey/ego/v2;egopb"; // Event defines the event that needs to be persisted onto the events store message Event { diff --git a/protos/test/buf.yaml b/protos/test/buf.yaml index 9fbc669..af7819e 100644 --- a/protos/test/buf.yaml +++ b/protos/test/buf.yaml @@ -1,4 +1,4 @@ -version: v1 +version: v2 lint: use: - DEFAULT diff --git a/protos/test/pb/v1/test.proto b/protos/test/pb/v2/test.proto similarity index 89% rename from protos/test/pb/v1/test.proto rename to protos/test/pb/v2/test.proto index a7d98cc..d596a6f 100644 --- a/protos/test/pb/v1/test.proto +++ b/protos/test/pb/v2/test.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package tests.v1; -option go_package = "github.com/tochemey/ego/tests/v1;testpb"; +option go_package = "github.com/tochemey/ego/tests/v2;testpb"; message TestReply {} message TestPanic {} diff --git a/readme.md b/readme.md index 552fdd9..44524e1 100644 --- a/readme.md +++ b/readme.md @@ -84,7 +84,7 @@ import ( "github.com/google/uuid" "github.com/tochemey/ego" "github.com/tochemey/ego/eventstore/memory" - samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v1" + samplepb "github.com/tochemey/ego/example/pbs/sample/pb/v2" "google.golang.org/protobuf/proto" ) diff --git a/test/data/pb/v1/test.pb.go b/test/data/pb/v1/test.pb.go index 64e71f0..ba3d2e4 100644 --- a/test/data/pb/v1/test.pb.go +++ b/test/data/pb/v1/test.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v2.31.0 // protoc (unknown) -// source: test/pb/v1/test.proto +// source: test/pb/v2/test.proto package testpb @@ -586,17 +586,17 @@ func file_test_pb_v1_test_proto_rawDescGZIP() []byte { var file_test_pb_v1_test_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_test_pb_v1_test_proto_goTypes = []interface{}{ - (*TestReply)(nil), // 0: tests.v1.TestReply - (*TestPanic)(nil), // 1: tests.v1.TestPanic - (*TestTimeout)(nil), // 2: tests.v1.TestTimeout - (*Reply)(nil), // 3: tests.v1.Reply - (*TestSend)(nil), // 4: tests.v1.TestSend - (*Account)(nil), // 5: tests.v1.Account - (*CreateAccount)(nil), // 6: tests.v1.CreateAccount - (*CreditAccount)(nil), // 7: tests.v1.CreditAccount - (*AccountCreated)(nil), // 8: tests.v1.AccountCreated - (*AccountCredited)(nil), // 9: tests.v1.AccountCredited - (*TestNoEvent)(nil), // 10: tests.v1.TestNoEvent + (*TestReply)(nil), // 0: tests.v2.TestReply + (*TestPanic)(nil), // 1: tests.v2.TestPanic + (*TestTimeout)(nil), // 2: tests.v2.TestTimeout + (*Reply)(nil), // 3: tests.v2.Reply + (*TestSend)(nil), // 4: tests.v2.TestSend + (*Account)(nil), // 5: tests.v2.Account + (*CreateAccount)(nil), // 6: tests.v2.CreateAccount + (*CreditAccount)(nil), // 7: tests.v2.CreditAccount + (*AccountCreated)(nil), // 8: tests.v2.AccountCreated + (*AccountCredited)(nil), // 9: tests.v2.AccountCredited + (*TestNoEvent)(nil), // 10: tests.v2.TestNoEvent } var file_test_pb_v1_test_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type