Remove inner instrument call, wrap everything in outer instrument
Add MockInstrumentationService for tests
Use idiomatic event naming, test search instrumentation