Support tracer env based initialization in hotrod (#1115)

examples/hotrod/README.md

@@ -49,10 +49,11 @@ go run ./main.go all
 docker run \
   --rm \
   --link jaeger \
+  --env JAEGER_AGENT_HOST=jaeger \
+  --env JAEGER_AGENT_PORT=6831 \
   -p8080-8083:8080-8083 \
-  jaegertracing/example-hotrod:1.6 \
-  all \
-  --jaeger-agent.host-port=jaeger:6831
+  jaegertracing/example-hotrod:latest \
+  all
 ```
 
 Then open http://127.0.0.1:8080

examples/hotrod/cmd/customer.go

@@ -36,10 +36,9 @@ var customerCmd = &cobra.Command{
 		logger := log.NewFactory(zapLogger)
 		server := customer.NewServer(
 			net.JoinHostPort("0.0.0.0", strconv.Itoa(customerPort)),
-			tracing.Init("customer", metricsFactory.Namespace("customer", nil), logger, jAgentHostPort),
+			tracing.Init("customer", metricsFactory, logger),
 			metricsFactory,
 			logger,
-			jAgentHostPort,
 		)
 		return logError(zapLogger, server.Run())
 	},

examples/hotrod/cmd/driver.go

@@ -36,10 +36,9 @@ var driverCmd = &cobra.Command{
 		logger := log.NewFactory(zapLogger)
 		server := driver.NewServer(
 			net.JoinHostPort("0.0.0.0", strconv.Itoa(driverPort)),
-			tracing.Init("driver", metricsFactory.Namespace("driver", nil), logger, jAgentHostPort),
+			tracing.Init("driver", metricsFactory, logger),
 			metricsFactory,
 			logger,
-			jAgentHostPort,
 		)
 		return logError(zapLogger, server.Run())
 	},

examples/hotrod/cmd/frontend.go

@@ -42,7 +42,7 @@ var frontendCmd = &cobra.Command{
 		logger := log.NewFactory(zapLogger)
 		server := frontend.NewServer(
 			options,
-			tracing.Init("frontend", metricsFactory.Namespace("frontend", nil), logger, jAgentHostPort),
+			tracing.Init("frontend", metricsFactory, logger),
 			logger,
 		)
 		return logError(zapLogger, server.Run())

examples/hotrod/cmd/root.go

@@ -31,7 +31,6 @@ import (
 
 var (
 	metricsBackend string
-	jAgentHostPort string
 	logger         *zap.Logger
 	metricsFactory metrics.Factory
 
@@ -63,7 +62,6 @@ func Execute() {
 
 func init() {
 	RootCmd.PersistentFlags().StringVarP(&metricsBackend, "metrics", "m", "expvar", "Metrics backend (expvar|prometheus)")
-	RootCmd.PersistentFlags().StringVarP(&jAgentHostPort, "jaeger-agent.host-port", "a", "0.0.0.0:6831", "String representing jaeger-agent UDP host:port, or jaeger-collector HTTP endpoint address, e.g. http://localhost:14268/api/traces.")
 	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")

examples/hotrod/cmd/route.go

@@ -36,7 +36,7 @@ var routeCmd = &cobra.Command{
 		logger := log.NewFactory(zapLogger)
 		server := route.NewServer(
 			net.JoinHostPort("0.0.0.0", strconv.Itoa(routePort)),
-			tracing.Init("route", metricsFactory.Namespace("route", nil), logger, jAgentHostPort),
+			tracing.Init("route", metricsFactory, logger),
 			logger,
 		)
 		return logError(zapLogger, server.Run())

examples/hotrod/pkg/tracing/init.go

@@ -16,51 +16,33 @@ package tracing
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/opentracing/opentracing-go"
-	"github.com/uber/jaeger-client-go"
 	"github.com/uber/jaeger-client-go/config"
 	"github.com/uber/jaeger-client-go/rpcmetrics"
-	"github.com/uber/jaeger-client-go/transport"
 	"github.com/uber/jaeger-lib/metrics"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/examples/hotrod/pkg/log"
 )
 
 // Init creates a new instance of Jaeger tracer.
-func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory, backendHostPort string) opentracing.Tracer {
-	cfg := config.Configuration{
-		Sampler: &config.SamplerConfig{
-			Type:  "const",
-			Param: 1,
-		},
+func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory) opentracing.Tracer {
+	cfg, err := config.FromEnv()
+	if err != nil {
+		logger.Bg().Fatal("cannot parse Jaeger env vars", zap.Error(err))
 	}
+	cfg.ServiceName = serviceName
+	cfg.Sampler.Type = "const"
+	cfg.Sampler.Param = 1
+
 	// TODO(ys) a quick hack to ensure random generators get different seeds, which are based on current time.
 	time.Sleep(100 * time.Millisecond)
 	jaegerLogger := jaegerLoggerAdapter{logger.Bg()}
-	var sender jaeger.Transport
-	if strings.HasPrefix(backendHostPort, "http://") {
-		sender = transport.NewHTTPTransport(
-			backendHostPort,
-			transport.HTTPBatchSize(1),
-		)
-	} else {
-		if s, err := jaeger.NewUDPTransport(backendHostPort, 0); err != nil {
-			logger.Bg().Fatal("cannot initialize UDP sender", zap.Error(err))
-		} else {
-			sender = s
-		}
-	}
-	tracer, _, err := cfg.New(
-		serviceName,
-		config.Reporter(jaeger.NewRemoteReporter(
-			sender,
-			jaeger.ReporterOptions.BufferFlushInterval(1*time.Second),
-			jaeger.ReporterOptions.Logger(jaegerLogger),
-		)),
+
+	metricsFactory = metricsFactory.Namespace(serviceName, nil)
+	tracer, _, err := cfg.NewTracer(
 		config.Logger(jaegerLogger),
 		config.Metrics(metricsFactory),
 		config.Observer(rpcmetrics.NewObserver(metricsFactory, rpcmetrics.DefaultNameNormalizer)),

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, jAgentHostPort string) *Server {
+func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory) *Server {
 	return &Server{
 		hostPort: hostPort,
 		tracer:   tracer,
 		logger:   logger,
 		database: newDatabase(
-			tracing.Init("mysql", metricsFactory.Namespace("mysql", nil), logger, jAgentHostPort),
+			tracing.Init("mysql", metricsFactory, logger),
 			logger.With(zap.String("component", "mysql")),
 		),
 	}

examples/hotrod/services/driver/redis.go

@@ -39,9 +39,9 @@ type Redis struct {
 	errorSimulator
 }
 
-func newRedis(metricsFactory metrics.Factory, logger log.Factory, jAgentHostPort string) *Redis {
+func newRedis(metricsFactory metrics.Factory, logger log.Factory) *Redis {
 	return &Redis{
-		tracer: tracing.Init("redis", metricsFactory.Namespace("redis", nil), logger, jAgentHostPort),
+		tracer: tracing.Init("redis", metricsFactory, logger),
 		logger: logger,
 	}
 }

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, jAgentHostPort string) *Server {
+func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory) *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, jAgentHostPort),
+		redis:    newRedis(metricsFactory, logger),
 	}
 }
 

glide.yaml

@@ -13,7 +13,7 @@ import:
 - package: go.uber.org/zap
   version: ^1
 - package: github.com/uber/jaeger-client-go
-  version: ^2.11.0
+  version: ^2.15.0
   subpackages:
   - transport
 - package: github.com/uber/jaeger-lib
@@ -58,9 +58,9 @@ import:
   subpackages:
   - fs
 - package: github.com/Shopify/sarama
-  version: ^1.16.0
+  version: 1.16.0
 - package: github.com/bsm/sarama-cluster
-  version: ^2.1.13
+  version: 2.1.13
 - package: github.com/gogo/googleapis
   version: b23578765ee54ff6bceff57f397d833bf4ca6869
 - package: github.com/gogo/protobuf