From d20a4aa1826c568dde2df63663b67187a00662f6 Mon Sep 17 00:00:00 2001 From: Won Jun Jang Date: Thu, 1 Mar 2018 10:42:26 -0500 Subject: [PATCH] fix integration test and address comments Signed-off-by: Won Jun Jang --- cmd/collector/main.go | 4 ++-- cmd/standalone/main.go | 4 ++-- scripts/travis/build-all-in-one-image.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/collector/main.go b/cmd/collector/main.go index 3fed33384a4..7bfd1ea9b70 100644 --- a/cmd/collector/main.go +++ b/cmd/collector/main.go @@ -125,7 +125,7 @@ func main() { server.Register(jc.NewTChanCollectorServer(jaegerBatchesHandler)) server.Register(zc.NewTChanZipkinCollectorServer(zipkinSpansHandler)) - samplingHandler := initializeSamplingHandler(strategyStoreFactory, v, logger, metricsFactory) + samplingHandler := initializeSamplingHandler(strategyStoreFactory, v, metricsFactory, logger) server.Register(sc.NewTChanSamplingManagerServer(samplingHandler)) portStr := ":" + strconv.Itoa(builderOpts.CollectorPort) @@ -215,8 +215,8 @@ func startZipkinHTTPAPI( func initializeSamplingHandler( samplingStrategyStoreFactory *ss.Factory, v *viper.Viper, - logger *zap.Logger, metricsFactory metrics.Factory, + logger *zap.Logger, ) sampling.Handler { samplingStrategyStoreFactory.InitFromViper(v) if err := samplingStrategyStoreFactory.Initialize(metricsFactory, logger); err != nil { diff --git a/cmd/standalone/main.go b/cmd/standalone/main.go index 7c2ab038375..6beb6780d77 100644 --- a/cmd/standalone/main.go +++ b/cmd/standalone/main.go @@ -112,7 +112,7 @@ func main() { if err != nil { logger.Fatal("Failed to create dependency reader", zap.Error(err)) } - samplingHandler := initializeSamplingHandler(strategyStoreFactory, v, logger, metricsFactory) + samplingHandler := initializeSamplingHandler(strategyStoreFactory, v, metricsFactory, logger) aOpts := new(agentApp.Builder).InitFromViper(v) cOpts := new(collector.CollectorOptions).InitFromViper(v) @@ -305,8 +305,8 @@ func registerStaticHandler(r *mux.Router, logger *zap.Logger, qOpts *queryApp.Qu func initializeSamplingHandler( samplingStrategyStoreFactory *ss.Factory, v *viper.Viper, - logger *zap.Logger, metricsFactory metrics.Factory, + logger *zap.Logger, ) sampling.Handler { samplingStrategyStoreFactory.InitFromViper(v) if err := samplingStrategyStoreFactory.Initialize(metricsFactory, logger); err != nil { diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh index 3a8933f1bbd..6efdb23c71e 100755 --- a/scripts/travis/build-all-in-one-image.sh +++ b/scripts/travis/build-all-in-one-image.sh @@ -11,7 +11,7 @@ make build-all-in-one-linux export REPO=jaegertracing/all-in-one docker build -f cmd/standalone/Dockerfile -t $REPO:latest . -export CID=$(docker run -d -p 16686:16686 $REPO:latest) +export CID=$(docker run -d -p 16686:16686 5778:5778 $REPO:latest) make integration-test docker kill $CID