Refactoring - TraceError in CalculatorClientWithActivityId