* master: Revert "Remove service, migrate all to service-new (#1630)" (#1731) Remove service, migrate all to service-new (#1630) Updating tracing dependency (#1722)