Fix address-related tracing prepopulators #3988

Fix tracing instruments.