adjust span names (#2135)

* adjust span names

* fix compile
10 jobs for master in 25 minutes and 37 seconds (queued for 2 seconds)