Make agent host port configurable in hotrod

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Jan 23, 2018 · f157473 · f157473
1 parent e52ecff
commit f157473
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/examples/hotrod/cmd/customer.go b/examples/hotrod/cmd/customer.go
@@ -35,9 +35,10 @@ var customerCmd = &cobra.Command{
 		logger := log.NewFactory(logger.With(zap.String("service", "customer")))
 		server := customer.NewServer(
 			net.JoinHostPort(customerOptions.serverInterface, strconv.Itoa(customerOptions.serverPort)),
-			tracing.Init("customer", metricsFactory.Namespace("customer", nil), logger),
+			tracing.Init("customer", metricsFactory.Namespace("customer", nil), logger, jAgentHostPort),
 			metricsFactory,
 			logger,
+			jAgentHostPort,
 		)
 		return server.Run()
 	},

diff --git a/examples/hotrod/cmd/driver.go b/examples/hotrod/cmd/driver.go
@@ -35,9 +35,10 @@ var driverCmd = &cobra.Command{
 		logger := log.NewFactory(logger.With(zap.String("service", "driver")))
 		server := driver.NewServer(
 			net.JoinHostPort(driverOptions.serverInterface, strconv.Itoa(driverOptions.serverPort)),
-			tracing.Init("driver", metricsFactory.Namespace("driver", nil), logger),
+			tracing.Init("driver", metricsFactory.Namespace("driver", nil), logger, jAgentHostPort),
 			metricsFactory,
 			logger,
+			jAgentHostPort,
 		)
 		return server.Run()
 	},

diff --git a/examples/hotrod/cmd/frontend.go b/examples/hotrod/cmd/frontend.go
@@ -35,7 +35,7 @@ var frontendCmd = &cobra.Command{
 		logger := log.NewFactory(logger.With(zap.String("service", "frontend")))
 		server := frontend.NewServer(
 			net.JoinHostPort(frontendOptions.serverInterface, strconv.Itoa(frontendOptions.serverPort)),
-			tracing.Init("frontend", metricsFactory.Namespace("frontend", nil), logger),
+			tracing.Init("frontend", metricsFactory.Namespace("frontend", nil), logger, jAgentHostPort),
 			logger,
 		)
 		return server.Run()

diff --git a/examples/hotrod/cmd/root.go b/examples/hotrod/cmd/root.go
@@ -29,6 +29,7 @@ import (
 
 var (
 	metricsBackend string
+	jAgentHostPort string
 	logger         *zap.Logger
 	metricsFactory metrics.Factory
 )
@@ -51,6 +52,7 @@ func Execute() {
 
 func init() {
 	RootCmd.PersistentFlags().StringVarP(&metricsBackend, "metrics", "m", "expvar", "Metrics backend (expvar|prometheus)")
+	RootCmd.PersistentFlags().StringVarP(&jAgentHostPort, "jaeger-agent.host-port", "a", "localhost:6831", "String representing jaeger-agent host:port")
 	rand.Seed(int64(time.Now().Nanosecond()))
 	logger, _ = zap.NewDevelopment()
 	cobra.OnInitialize(initMetrics)

diff --git a/examples/hotrod/cmd/route.go b/examples/hotrod/cmd/route.go
@@ -35,7 +35,7 @@ var routeCmd = &cobra.Command{
 		logger := log.NewFactory(logger.With(zap.String("service", "route")))
 		server := route.NewServer(
 			net.JoinHostPort(routeOptions.serverInterface, strconv.Itoa(routeOptions.serverPort)),
-			tracing.Init("route", metricsFactory.Namespace("route", nil), logger),
+			tracing.Init("route", metricsFactory.Namespace("route", nil), logger, jAgentHostPort),
 			logger,
 		)
 		return server.Run()

diff --git a/examples/hotrod/pkg/tracing/init.go b/examples/hotrod/pkg/tracing/init.go
@@ -28,7 +28,7 @@ import (
 )
 
 // Init creates a new instance of Jaeger tracer.
-func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory) opentracing.Tracer {
+func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory, hostPort string) opentracing.Tracer {
 	cfg := config.Configuration{
 		Sampler: &config.SamplerConfig{
 			Type:  "const",
@@ -37,6 +37,7 @@ func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory
 		Reporter: &config.ReporterConfig{
 			LogSpans:            false,
 			BufferFlushInterval: 1 * time.Second,
+			LocalAgentHostPort: hostPort,
 		},
 	}
 	tracer, _, err := cfg.New(

diff --git a/examples/hotrod/services/customer/server.go b/examples/hotrod/services/customer/server.go
@@ -36,13 +36,13 @@ type Server struct {
 }
 
 // NewServer creates a new customer.Server
-func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory) *Server {
+func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory, jAgentHostPort string) *Server {
 	return &Server{
 		hostPort: hostPort,
 		tracer:   tracer,
 		logger:   logger,
 		database: newDatabase(
-			tracing.Init("mysql", metricsFactory.Namespace("mysql", nil), logger),
+			tracing.Init("mysql", metricsFactory.Namespace("mysql", nil), logger, jAgentHostPort),
 			logger.With(zap.String("component", "mysql")),
 		),
 	}

diff --git a/examples/hotrod/services/driver/redis.go b/examples/hotrod/services/driver/redis.go
@@ -39,9 +39,9 @@ type Redis struct {
 	errorSimulator
 }
 
-func newRedis(metricsFactory metrics.Factory, logger log.Factory) *Redis {
+func newRedis(metricsFactory metrics.Factory, logger log.Factory, jAgentHostPort string) *Redis {
 	return &Redis{
-		tracer: tracing.Init("redis", metricsFactory.Namespace("redis", nil), logger),
+		tracer: tracing.Init("redis", metricsFactory.Namespace("redis", nil), logger, jAgentHostPort),
 		logger: logger,
 	}
 }

diff --git a/examples/hotrod/services/driver/server.go b/examples/hotrod/services/driver/server.go
@@ -36,7 +36,7 @@ type Server struct {
 }
 
 // NewServer creates a new driver.Server
-func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory) *Server {
+func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory, jAgentHostPort string) *Server {
 	channelOpts := &tchannel.ChannelOptions{
 		Tracer: tracer,
 	}
@@ -52,7 +52,7 @@ func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metric
 		logger:   logger,
 		ch:       ch,
 		server:   server,
-		redis:    newRedis(metricsFactory, logger),
+		redis:    newRedis(metricsFactory, logger, jAgentHostPort),
 	}
 }