Add NoTrace suite for benchmark

benchmark/benchmark.go

@@ -47,10 +47,6 @@ import (
 	"google.golang.org/grpc/grpclog"
 )
 
-func init() {
-	grpc.EnableTracing = false
-}
-
 func newPayload(t testpb.PayloadType, size int) *testpb.Payload {
 	if size < 0 {
 		grpclog.Fatalf("Requested a response with invalid length %d", size)

benchmark/benchmark_test.go

@@ -8,6 +8,7 @@ import (
 
 	"golang.org/x/net/context"
 	testpb "google.golang.org/grpc/benchmark/grpc_testing"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/benchmark/stats"
 	"google.golang.org/grpc/grpclog"
 )
@@ -115,33 +116,80 @@ func streamCaller(client testpb.TestServiceClient, stream testpb.TestService_Str
 }
 
 func BenchmarkClientStreamc1(b *testing.B) {
+	grpc.EnableTracing = true
 	runStream(b, 1)
 }
 
 func BenchmarkClientStreamc8(b *testing.B) {
+	grpc.EnableTracing = true
 	runStream(b, 8)
 }
 
 func BenchmarkClientStreamc64(b *testing.B) {
+	grpc.EnableTracing = true
 	runStream(b, 64)
 }
 
 func BenchmarkClientStreamc512(b *testing.B) {
+	grpc.EnableTracing = true
 	runStream(b, 512)
 }
 func BenchmarkClientUnaryc1(b *testing.B) {
+	grpc.EnableTracing = true
 	runUnary(b, 1)
 }
 
 func BenchmarkClientUnaryc8(b *testing.B) {
+	grpc.EnableTracing = true
 	runUnary(b, 8)
 }
 
 func BenchmarkClientUnaryc64(b *testing.B) {
+	grpc.EnableTracing = true
 	runUnary(b, 64)
 }
 
 func BenchmarkClientUnaryc512(b *testing.B) {
+	grpc.EnableTracing = true
+	runUnary(b, 512)
+}
+
+func BenchmarkClientStreamNoTracec1(b *testing.B) {
+	grpc.EnableTracing = false
+	runStream(b, 1)
+}
+
+func BenchmarkClientStreamNoTracec8(b *testing.B) {
+	grpc.EnableTracing = false
+	runStream(b, 8)
+}
+
+func BenchmarkClientStreamNoTracec64(b *testing.B) {
+	grpc.EnableTracing = false
+	runStream(b, 64)
+}
+
+func BenchmarkClientStreamNoTracec512(b *testing.B) {
+	grpc.EnableTracing = false
+	runStream(b, 512)
+}
+func BenchmarkClientUnaryNoTracec1(b *testing.B) {
+	grpc.EnableTracing = false
+	runUnary(b, 1)
+}
+
+func BenchmarkClientUnaryNoTracec8(b *testing.B) {
+	grpc.EnableTracing = false
+	runUnary(b, 8)
+}
+
+func BenchmarkClientUnaryNoTracec64(b *testing.B) {
+	grpc.EnableTracing = false
+	runUnary(b, 64)
+}
+
+func BenchmarkClientUnaryNoTracec512(b *testing.B) {
+	grpc.EnableTracing = false
 	runUnary(b, 512)
 }