Re-try addition of configurable trace sampling strategy (#709)

* Use new configurable trace sampling and update vendoring to enable the same.

Author: cboggs

Gopkg.lock

@@ -54,8 +54,7 @@ func main() {
 	util.InitLogger(logLevel.AllowedLevel)
 
 	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
-	jaegerAgentHost := os.Getenv("JAEGER_AGENT_HOST")
-	trace := tracing.New(jaegerAgentHost, "distributor")
+	trace := tracing.NewFromEnv("distributor")
 	defer trace.Close()
 
 	r, err := ring.New(ringConfig)

cmd/distributor/main.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/common/server"
+	"github.com/weaveworks/common/tracing"
 	"github.com/weaveworks/cortex/pkg/chunk"
 	"github.com/weaveworks/cortex/pkg/chunk/storage"
 	"github.com/weaveworks/cortex/pkg/ingester"
@@ -26,6 +27,7 @@ func main() {
 			GRPCMiddleware: []grpc.UnaryServerInterceptor{
 				middleware.ServerUserHeaderInterceptor,
 			},
+			ExcludeRequestInLog: true,
 		}
 		chunkStoreConfig chunk.StoreConfig
 		schemaConfig     chunk.SchemaConfig
@@ -35,6 +37,11 @@ func main() {
 		eventSampleRate  int
 		maxStreams       uint
 	)
+
+	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
+	trace := tracing.NewFromEnv("ingester")
+	defer trace.Close()
+
 	// Ingester needs to know our gRPC listen port.
 	ingesterConfig.ListenPort = &serverConfig.GRPCListenPort
 	util.RegisterFlags(&serverConfig, &chunkStoreConfig, &storageConfig,

cmd/ingester/main.go

@@ -59,8 +59,7 @@ func main() {
 	flag.Parse()
 
 	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
-	jaegerAgentHost := os.Getenv("JAEGER_AGENT_HOST")
-	trace := tracing.New(jaegerAgentHost, "lite")
+	trace := tracing.NewFromEnv("ingester")
 	defer trace.Close()
 
 	util.InitLogger(logLevel.AllowedLevel)

cmd/lite/main.go

@@ -46,8 +46,7 @@ func main() {
 	flag.Parse()
 
 	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
-	jaegerAgentHost := os.Getenv("JAEGER_AGENT_HOST")
-	trace := tracing.New(jaegerAgentHost, "querier")
+	trace := tracing.NewFromEnv("querier")
 	defer trace.Close()
 
 	util.InitLogger(logLevel.AllowedLevel)

cmd/querier/main.go

@@ -38,8 +38,7 @@ func main() {
 	)
 
 	// Setting the environment variable JAEGER_AGENT_HOST enables tracing
-	jaegerAgentHost := os.Getenv("JAEGER_AGENT_HOST")
-	trace := tracing.New(jaegerAgentHost, "ruler")
+	trace := tracing.NewFromEnv("ruler")
 	defer trace.Close()
 
 	util.RegisterFlags(&serverConfig, &ringConfig, &distributorConfig,