asim: do not reset log tags

The asim tests run in parallel now, and this was erasing
a log marker that allows us to separate the log lines
by test case.

Author: tbg

pkg/kv/kvserver/asim/mmaintegration/mma_store_rebalancer.go

@@ -88,7 +88,7 @@ func NewMMAStoreRebalancer(
 // Tick is called periodically to check for and apply rebalancing operations
 // using mmaprototype.Allocator.
 func (msr *MMAStoreRebalancer) Tick(ctx context.Context, tick time.Time, s state.State) {
-	ctx = msr.ResetAndAnnotateCtx(ctx)
+	ctx = msr.AnnotateCtx(ctx)
 	ctx = logtags.AddTag(ctx, "t", tick.Sub(msr.settings.StartTime))
 
 	if !msr.currentlyRebalancing &&

pkg/kv/kvserver/asim/queue/lease_queue.go

@@ -113,7 +113,7 @@ func (lq *leaseQueue) MaybeAdd(ctx context.Context, replica state.Replica, s sta
 // order on ties.
 func (lq *leaseQueue) Tick(ctx context.Context, tick time.Time, s state.State) {
 	lq.AddLogTag("tick", tick)
-	ctx = lq.ResetAndAnnotateCtx(ctx)
+	ctx = lq.AnnotateCtx(ctx)
 	// TODO(wenyihu6): it is unclear why next tick is forwarded to last tick
 	// here (see #149904 for more details).
 	if lq.lastTick.After(lq.next) {

pkg/kv/kvserver/asim/queue/replicate_queue.go

@@ -112,7 +112,7 @@ func (rq *replicateQueue) MaybeAdd(ctx context.Context, replica state.Replica, s
 // supports processing ConsiderRebalance actions on replicas.
 func (rq *replicateQueue) Tick(ctx context.Context, tick time.Time, s state.State) {
 	rq.AddLogTag("tick", tick)
-	ctx = rq.ResetAndAnnotateCtx(ctx)
+	ctx = rq.AnnotateCtx(ctx)
 	// TODO(wenyihu6): it is unclear why next tick is forwarded to last tick
 	// here (see #149904 for more details).
 	if rq.lastTick.After(rq.next) {

pkg/kv/kvserver/asim/storerebalancer/store_rebalancer.go

@@ -156,7 +156,7 @@ func (src *storeRebalancerControl) checkPendingTicket() (done bool, _ error) {
 
 func (src *storeRebalancerControl) Tick(ctx context.Context, tick time.Time, state state.State) {
 	src.sr.AddLogTag("tick", tick.Sub(src.settings.StartTime))
-	ctx = src.sr.ResetAndAnnotateCtx(ctx)
+	ctx = src.sr.AnnotateCtx(ctx)
 	switch src.rebalancerState.phase {
 	case rebalancerSleeping:
 		src.phaseSleep(ctx, tick, state)