That depends on how you measure it. There's a good case to be made for the thesis that we've been in a trade war ever since opening trade with China, but it's only recently that we've actually started counter-attacking.
Also, while it's gained traction recently, the political scientists I know personally have been decrying China's human rights violations for the past 20 years. Some of them were hoping things would improve as trade continued and the Chinese economy forced liberalization on the political sphere. That doesn't seem to be the way things have played out.