Merge pull request #830 from rueian/use-opencensus-default-sampler

Use opencensus's DefaultSampler instead of AlwaysSampler as default
go-kit · Jan 25, 2019 · 6b19129 · 6b19129
2 parents 8a8a1bb + 362a2eb
commit 6b19129
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/tracing/opencensus/grpc.go b/tracing/opencensus/grpc.go
@@ -22,10 +22,6 @@ func GRPCClientTrace(options ...TracerOption) kitgrpc.ClientOption {
 		option(&cfg)
 	}
 
-	if cfg.Sampler == nil {
-		cfg.Sampler = trace.AlwaysSample()
-	}
-
 	clientBefore := kitgrpc.ClientBefore(
 		func(ctx context.Context, md *metadata.MD) context.Context {
 			var name string
@@ -79,10 +75,6 @@ func GRPCServerTrace(options ...TracerOption) kitgrpc.ServerOption {
 		option(&cfg)
 	}
 
-	if cfg.Sampler == nil {
-		cfg.Sampler = trace.AlwaysSample()
-	}
-
 	serverBefore := kitgrpc.ServerBefore(
 		func(ctx context.Context, md metadata.MD) context.Context {
 			var name string

diff --git a/tracing/opencensus/http.go b/tracing/opencensus/http.go
@@ -19,10 +19,6 @@ func HTTPClientTrace(options ...TracerOption) kithttp.ClientOption {
 		option(&cfg)
 	}
 
-	if cfg.Sampler == nil {
-		cfg.Sampler = trace.AlwaysSample()
-	}
-
 	if !cfg.Public && cfg.HTTPPropagate == nil {
 		cfg.HTTPPropagate = &b3.HTTPFormat{}
 	}
@@ -101,10 +97,6 @@ func HTTPServerTrace(options ...TracerOption) kithttp.ServerOption {
 		option(&cfg)
 	}
 
-	if cfg.Sampler == nil {
-		cfg.Sampler = trace.AlwaysSample()
-	}
-
 	if !cfg.Public && cfg.HTTPPropagate == nil {
 		cfg.HTTPPropagate = &b3.HTTPFormat{}
 	}