Was Mark Carney's Davos speech a mistake if it upset Trump?

It's not unreasonable to think about how any action by a Canadian government might impact relations with Canada's largest trading partner. At the same time, allowing the American president's potential for anger to dictate the behaviour of Canadian leaders risks ceding a great amount of power.