fix(tracing): Use or_current() to prevent orphaned tracing spans

fix(tracing): Use or_current() to prevent orphaned tracing spans #1745