Add old constructor for retro compatibility

client/client.go

@@ -15,8 +15,10 @@ import (
 	"time"
 
 	uuid "github.com/satori/go.uuid"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/topfreegames/eventsgateway/logger"
+	logruswrapper "github.com/topfreegames/eventsgateway/logger/logrus"
 	pb "github.com/topfreegames/protos/eventsgateway/grpc/generated"
 	"google.golang.org/grpc"
 )
@@ -31,9 +33,21 @@ type Client struct {
 	serverAddress string
 }
 
-// NewClient ctor
+// NewClient ctor (DEPRECATED, use New() instead)
 // configPrefix is whatever comes before `client` subpart of config
 func NewClient(
+	configPrefix string,
+	config *viper.Viper,
+	logger logrus.FieldLogger,
+	client pb.GRPCForwarderClient,
+	opts ...grpc.DialOption,
+) (*Client, error) {
+	return New(configPrefix, config, logruswrapper.NewWithLogger(logger), client, opts...)
+}
+
+// New ctor
+// configPrefix is whatever comes before `client` subpart of config
+func New(
 	configPrefix string,
 	config *viper.Viper,
 	logger logger.Logger,

client/client_test.go

@@ -34,29 +34,29 @@ var _ = Describe("Client", func() {
 
 	BeforeEach(func() {
 		var err error
-		c, err = client.NewClient("", config, log, mockGRPCClient)
+		c, err = client.New("", config, log, mockGRPCClient)
 		Expect(err).NotTo(HaveOccurred())
 		now = time.Now().UnixNano() / 1000000
 	})
 
 	Describe("NewClient", func() {
 		It("should return client if no error", func() {
-			c, err := client.NewClient("", config, log, mockGRPCClient)
+			c, err := client.New("", config, log, mockGRPCClient)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(c).NotTo(BeNil())
 		})
 
 		It("should return an error if no kafka topic", func() {
 			config.Set("client.kafkatopic", "")
-			c, err := client.NewClient("", config, log, mockGRPCClient)
+			c, err := client.New("", config, log, mockGRPCClient)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("no kafka topic informed"))
 			Expect(c).To(BeNil())
 		})
 
 		It("should return an error if no server address", func() {
 			config.Set("client.grpc.serveraddress", "")
-			c, err := client.NewClient("", config, log, mockGRPCClient)
+			c, err := client.New("", config, log, mockGRPCClient)
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(ContainSubstring("no grpc server address informed"))
 			Expect(c).To(BeNil())
@@ -76,7 +76,7 @@ var _ = Describe("Client", func() {
 
 		BeforeEach(func() {
 			var err error
-			c, err = client.NewClient("", config, log, mockGRPCClient)
+			c, err = client.New("", config, log, mockGRPCClient)
 			Expect(err).NotTo(HaveOccurred())
 			now = time.Now().UnixNano() / int64(time.Millisecond)
 		})

client/client_whitebox_test.go

@@ -34,7 +34,7 @@ var _ = Describe("Client Whitebox", func() {
 		mockCtrl := gomock.NewController(GinkgoT())
 		mockGRPCClient := mockpb.NewMockGRPCForwarderClient(mockCtrl)
 		config.Set("client.async", true)
-		c, err = NewClient(
+		c, err = New(
 			"",
 			config,
 			logruswrapper.NewWithLogger(logger),

client/sync_test.go

@@ -34,7 +34,7 @@ var _ = Describe("Sync Client", func() {
 
 	BeforeEach(func() {
 		var err error
-		c, err = client.NewClient("", config, log, mockGRPCClient)
+		c, err = client.New("", config, log, mockGRPCClient)
 		Expect(err).NotTo(HaveOccurred())
 		now = time.Now().UnixNano() / 1000000
 	})
@@ -52,7 +52,7 @@ var _ = Describe("Sync Client", func() {
 
 		BeforeEach(func() {
 			var err error
-			c, err = client.NewClient("", config, log, mockGRPCClient)
+			c, err = client.New("", config, log, mockGRPCClient)
 			Expect(err).NotTo(HaveOccurred())
 			now = time.Now().UnixNano() / 1000000
 		})

loadtest/runner.go

@@ -58,7 +58,7 @@ func newRunner(
 
 func (r *runner) configure() error {
 	r.config.Set("client.kafkatopic", randomTopic())
-	c, err := client.NewClient("", r.config, r.log, nil)
+	c, err := client.New("", r.config, r.log, nil)
 	if err != nil {
 		return err
 	}

producer/producer.go

@@ -51,7 +51,7 @@ func NewProducer(
 }
 
 func (p *Producer) configure() error {
-	c, err := client.NewClient("", p.config, p.log, nil)
+	c, err := client.New("", p.config, p.log, nil)
 	if err != nil {
 		return err
 	}