mock: add ExpectedId
to link span expectations
#3007
+222
−2
Merged