Merge branch 'release-5.0' into release-5.0-4db325d04803

pingcap · Apr 16, 2021 · c93da0e · c93da0e
2 parents efa9d9c + 672d649
commit c93da0e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/conn.go b/server/conn.go
@@ -946,7 +946,10 @@ func (cc *clientConn) dispatch(ctx context.Context, data []byte) error {
 	}
 
 	span := opentracing.StartSpan("server.dispatch")
-	ctx = opentracing.ContextWithSpan(ctx, span)
+	cfg := config.GetGlobalConfig()
+	if cfg.OpenTracing.Enable {
+		ctx = opentracing.ContextWithSpan(ctx, span)
+	}
 
 	var cancelFunc context.CancelFunc
 	ctx, cancelFunc = context.WithCancel(ctx)