Add flags to allow changing ports for HotROD services (jaegertracing#951)

* Add ConfigOptions so clients find correct ports

Signed-off-by: Corey Boornazian <coreyb220@gmail.com>

Update client.go

Signed-off-by: Corey Boornazian <coreyb220@gmail.com>

* Fix typo on client.go

Signed-off-by: Corey Boornazian <coreyb220@gmail.com>

Fix typo on root.go

Signed-off-by: Corey Boornazian <coreyb220@gmail.com>

Author: cboornaz17

examples/hotrod/cmd/customer.go

@@ -35,7 +35,7 @@ var customerCmd = &cobra.Command{
 		zapLogger := logger.With(zap.String("service", "customer"))
 		logger := log.NewFactory(zapLogger)
 		server := customer.NewServer(
-			net.JoinHostPort(customerOptions.serverInterface, strconv.Itoa(customerOptions.serverPort)),
+			net.JoinHostPort("0.0.0.0", strconv.Itoa(customerPort)),
 			tracing.Init("customer", metricsFactory.Namespace("customer", nil), logger, jAgentHostPort),
 			metricsFactory,
 			logger,
@@ -45,16 +45,7 @@ var customerCmd = &cobra.Command{
 	},
 }
 
-var (
-	customerOptions struct {
-		serverInterface string
-		serverPort      int
-	}
-)
-
 func init() {
 	RootCmd.AddCommand(customerCmd)
 
-	customerCmd.Flags().StringVarP(&customerOptions.serverInterface, "bind", "", "0.0.0.0", "interface to which the Customer server will bind")
-	customerCmd.Flags().IntVarP(&customerOptions.serverPort, "port", "p", 8081, "port on which the Customer server will listen")
 }

examples/hotrod/cmd/driver.go

@@ -35,7 +35,7 @@ var driverCmd = &cobra.Command{
 		zapLogger := logger.With(zap.String("service", "driver"))
 		logger := log.NewFactory(zapLogger)
 		server := driver.NewServer(
-			net.JoinHostPort(driverOptions.serverInterface, strconv.Itoa(driverOptions.serverPort)),
+			net.JoinHostPort("0.0.0.0", strconv.Itoa(driverPort)),
 			tracing.Init("driver", metricsFactory.Namespace("driver", nil), logger, jAgentHostPort),
 			metricsFactory,
 			logger,
@@ -45,16 +45,7 @@ var driverCmd = &cobra.Command{
 	},
 }
 
-var (
-	driverOptions struct {
-		serverInterface string
-		serverPort      int
-	}
-)
-
 func init() {
 	RootCmd.AddCommand(driverCmd)
 
-	driverCmd.Flags().StringVarP(&driverOptions.serverInterface, "bind", "", "0.0.0.0", "interface to which the driver server will bind")
-	driverCmd.Flags().IntVarP(&driverOptions.serverPort, "port", "p", 8082, "port on which the driver server will listen")
 }

examples/hotrod/cmd/frontend.go

@@ -32,27 +32,26 @@ var frontendCmd = &cobra.Command{
 	Short: "Starts Frontend service",
 	Long:  `Starts Frontend service.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
+
+		options.FrontendHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(frontendPort))
+		options.DriverHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(driverPort))
+		options.CustomerHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(customerPort))
+		options.RouteHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(routePort))
+
 		zapLogger := logger.With(zap.String("service", "frontend"))
 		logger := log.NewFactory(zapLogger)
 		server := frontend.NewServer(
-			net.JoinHostPort(frontendOptions.serverInterface, strconv.Itoa(frontendOptions.serverPort)),
+			options,
 			tracing.Init("frontend", metricsFactory.Namespace("frontend", nil), logger, jAgentHostPort),
 			logger,
 		)
 		return logError(zapLogger, server.Run())
 	},
 }
 
-var (
-	frontendOptions struct {
-		serverInterface string
-		serverPort      int
-	}
-)
+var options frontend.ConfigOptions
 
 func init() {
 	RootCmd.AddCommand(frontendCmd)
 
-	frontendCmd.Flags().StringVarP(&frontendOptions.serverInterface, "bind", "", "0.0.0.0", "interface to which the frontend server will bind")
-	frontendCmd.Flags().IntVarP(&frontendOptions.serverPort, "port", "p", 8080, "port on which the frontend server will listen")
 }

examples/hotrod/cmd/root.go

@@ -38,6 +38,11 @@ var (
 	fixDBConnDelay         time.Duration
 	fixDBConnDisableMutex  bool
 	fixRouteWorkerPoolSize int
+
+	customerPort int
+	driverPort   int
+	frontendPort int
+	routePort    int
 )
 
 // RootCmd represents the base command when called without any subcommands
@@ -62,6 +67,13 @@ func init() {
 	RootCmd.PersistentFlags().DurationVarP(&fixDBConnDelay, "fix-db-query-delay", "D", 300*time.Millisecond, "Average lagency of MySQL DB query")
 	RootCmd.PersistentFlags().BoolVarP(&fixDBConnDisableMutex, "fix-disable-db-conn-mutex", "M", false, "Disables the mutex guarding db connection")
 	RootCmd.PersistentFlags().IntVarP(&fixRouteWorkerPoolSize, "fix-route-worker-pool-size", "W", 3, "Default worker pool size")
+
+	// Add flags to choose ports for services
+	RootCmd.PersistentFlags().IntVarP(&customerPort, "customer-service-port", "c", 8081, "Port for customer service")
+	RootCmd.PersistentFlags().IntVarP(&driverPort, "driver-service-port", "d", 8082, "Port for driver service")
+	RootCmd.PersistentFlags().IntVarP(&frontendPort, "frontend-service-port", "f", 8080, "Port for frontend service")
+	RootCmd.PersistentFlags().IntVarP(&routePort, "route-service-port", "r", 8083, "Port for routing service")
+
 	rand.Seed(int64(time.Now().Nanosecond()))
 	logger, _ = zap.NewDevelopment(zap.AddStacktrace(zapcore.FatalLevel))
 	cobra.OnInitialize(onInitialize)
@@ -90,6 +102,22 @@ func onInitialize() {
 		logger.Info("fix: overriding route worker pool size", zap.Int("old", config.RouteWorkerPoolSize), zap.Int("new", fixRouteWorkerPoolSize))
 		config.RouteWorkerPoolSize = fixRouteWorkerPoolSize
 	}
+
+	if customerPort != 8081 {
+		logger.Info("changing customer service port", zap.Int("old", 8081), zap.Int("new", customerPort))
+	}
+
+	if driverPort != 8082 {
+		logger.Info("changing driver service port", zap.Int("old", 8082), zap.Int("new", driverPort))
+	}
+
+	if frontendPort != 8080 {
+		logger.Info("changing frontend service port", zap.Int("old", 8080), zap.Int("new", frontendPort))
+	}
+
+	if routePort != 8083 {
+		logger.Info("changing route service port", zap.Int("old", 8083), zap.Int("new", routePort))
+	}
 }
 
 func logError(logger *zap.Logger, err error) error {

examples/hotrod/cmd/route.go

@@ -35,24 +35,15 @@ var routeCmd = &cobra.Command{
 		zapLogger := logger.With(zap.String("service", "route"))
 		logger := log.NewFactory(zapLogger)
 		server := route.NewServer(
-			net.JoinHostPort(routeOptions.serverInterface, strconv.Itoa(routeOptions.serverPort)),
+			net.JoinHostPort("0.0.0.0", strconv.Itoa(routePort)),
 			tracing.Init("route", metricsFactory.Namespace("route", nil), logger, jAgentHostPort),
 			logger,
 		)
 		return logError(zapLogger, server.Run())
 	},
 }
 
-var (
-	routeOptions struct {
-		serverInterface string
-		serverPort      int
-	}
-)
-
 func init() {
 	RootCmd.AddCommand(routeCmd)
 
-	routeCmd.Flags().StringVarP(&routeOptions.serverInterface, "bind", "", "0.0.0.0", "interface to which the Route server will bind")
-	routeCmd.Flags().IntVarP(&routeOptions.serverPort, "port", "p", 8083, "port on which the Route server will listen")
 }

examples/hotrod/services/config/config.go

@@ -59,4 +59,5 @@ var (
 
 	// RouteCalcDelayStdDev is standard deviation
 	RouteCalcDelayStdDev = RouteCalcDelay / 4
+
 )

examples/hotrod/services/customer/client.go

@@ -32,25 +32,28 @@ type Client struct {
 	tracer opentracing.Tracer
 	logger log.Factory
 	client *tracing.HTTPClient
+	hostPort string
 }
 
 // NewClient creates a new customer.Client
-func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client {
+func NewClient(tracer opentracing.Tracer, logger log.Factory, hostPort string) *Client {
 	return &Client{
 		tracer: tracer,
 		logger: logger,
 		client: &tracing.HTTPClient{
 			Client: &http.Client{Transport: &nethttp.Transport{}},
 			Tracer: tracer,
 		},
+		hostPort: hostPort,
 	}
 }
 
 // Get implements customer.Interface#Get as an RPC
 func (c *Client) Get(ctx context.Context, customerID string) (*Customer, error) {
 	c.logger.For(ctx).Info("Getting customer", zap.String("customer_id", customerID))
 
-	url := fmt.Sprintf("http://127.0.0.1:8081/customer?customer=%s", customerID)
+	url := fmt.Sprintf("http://" + c.hostPort + "/customer?customer=%s", customerID)
+	fmt.Println(url)
 	var customer Customer
 	if err := c.client.GetJSON(ctx, "/customer", url, &customer); err != nil {
 		return nil, err

examples/hotrod/services/driver/client.go

@@ -36,7 +36,7 @@ type Client struct {
 }
 
 // NewClient creates a new driver.Client
-func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client {
+func NewClient(tracer opentracing.Tracer, logger log.Factory, hostPort string) *Client {
 	channelOpts := &tchannel.ChannelOptions{
 		//Logger:        logger,
 		//StatsReporter: statsReporter,
@@ -47,7 +47,7 @@ func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client {
 		logger.Bg().Fatal("Cannot create TChannel", zap.Error(err))
 	}
 	clientOpts := &thrift.ClientOptions{
-		HostPort: "127.0.0.1:8082",
+		HostPort: hostPort,
 	}
 	thriftClient := thrift.NewClient(ch, "driver", clientOpts)
 	client := driver.NewTChanDriverClient(thriftClient)

examples/hotrod/services/frontend/best_eta.go

@@ -38,6 +38,7 @@ type bestETA struct {
 	route    route.Interface
 	pool     *pool.Pool
 	logger   log.Factory
+	options	 ConfigOptions
 }
 
 // Response contains ETA for a trip.
@@ -46,19 +47,22 @@ type Response struct {
 	ETA    time.Duration
 }
 
-func newBestETA(tracer opentracing.Tracer, logger log.Factory) *bestETA {
+func newBestETA(tracer opentracing.Tracer, logger log.Factory, options ConfigOptions) *bestETA {
 	return &bestETA{
 		customer: customer.NewClient(
 			tracer,
 			logger.With(zap.String("component", "customer_client")),
+			options.CustomerHostPort,
 		),
 		driver: driver.NewClient(
 			tracer,
 			logger.With(zap.String("component", "driver_client")),
+			options.DriverHostPort,
 		),
 		route: route.NewClient(
 			tracer,
 			logger.With(zap.String("component", "route_client")),
+			options.RouteHostPort,
 		),
 		pool:   pool.New(config.RouteWorkerPoolSize),
 		logger: logger,

examples/hotrod/services/frontend/server.go

@@ -37,17 +37,26 @@ type Server struct {
 	assetFS  http.FileSystem
 }
 
+// ConfigOptions used to make sure service clients
+// can find correct server ports
+type ConfigOptions struct {
+	FrontendHostPort string
+	DriverHostPort   string
+	CustomerHostPort string
+	RouteHostPort    string
+}
+
 // NewServer creates a new frontend.Server
-func NewServer(hostPort string, tracer opentracing.Tracer, logger log.Factory) *Server {
+func NewServer(options ConfigOptions, tracer opentracing.Tracer, logger log.Factory) *Server {
 	assetFS, err := fs.New()
 	if err != nil {
 		logger.Bg().Fatal("cannot import web assets", zap.Error(err))
 	}
 	return &Server{
-		hostPort: hostPort,
+		hostPort: options.FrontendHostPort,
 		tracer:   tracer,
 		logger:   logger,
-		bestETA:  newBestETA(tracer, logger),
+		bestETA:  newBestETA(tracer, logger, options),
 		assetFS:  assetFS,
 	}
 }

examples/hotrod/services/route/client.go

@@ -32,17 +32,19 @@ type Client struct {
 	tracer opentracing.Tracer
 	logger log.Factory
 	client *tracing.HTTPClient
+	hostPort string
 }
 
 // NewClient creates a new route.Client
-func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client {
+func NewClient(tracer opentracing.Tracer, logger log.Factory, hostPort string) *Client {
 	return &Client{
 		tracer: tracer,
 		logger: logger,
 		client: &tracing.HTTPClient{
 			Client: &http.Client{Transport: &nethttp.Transport{}},
 			Tracer: tracer,
 		},
+		hostPort: hostPort,
 	}
 }
 
@@ -53,8 +55,7 @@ func (c *Client) FindRoute(ctx context.Context, pickup, dropoff string) (*Route,
 	v := url.Values{}
 	v.Set("pickup", pickup)
 	v.Set("dropoff", dropoff)
-	url := "http://127.0.0.1:8083/route?" + v.Encode()
-
+	url := "http://" + c.hostPort + "/route?" + v.Encode()
 	var route Route
 	if err := c.client.GetJSON(ctx, "/route", url, &route); err != nil {
 		c.logger.For(ctx).Error("Error getting route", zap.Error(err))