Move code to keep a consistent order

BUG: call to lttng_probe_instrument need to find a better place