Merge pull request #7953 from marten-seemann/fix-reqlog-race

fix race condition when logging requests

commands/context.go

@@ -117,7 +117,6 @@ func (c *Context) LogRequest(req *cmds.Request) func() {
 		Command:   strings.Join(req.Path, "/"),
 		Options:   req.Options,
 		Args:      req.Arguments,
-		ID:        c.ReqLog.nextID,
 		log:       c.ReqLog,
 	}
 	c.ReqLog.AddEntry(rle)

commands/reqlog.go

@@ -38,6 +38,7 @@ func (rl *ReqLog) AddEntry(rle *ReqLogEntry) {
 	rl.lock.Lock()
 	defer rl.lock.Unlock()
 
+	rle.ID = rl.nextID
 	rl.nextID++
 	rl.Requests = append(rl.Requests, rle)