Merge pull request moby#51302 from thaJeztah/fix_one_shot_stats

daemon: Daemon.stats: fill-in container ID and Name when collecting

Author: thaJeztah

daemon/stats.go

@@ -48,8 +48,6 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
 	var preRead time.Time
 	getStatJSON := func(v any) *containertypes.StatsResponse {
 		ss := v.(containertypes.StatsResponse)
-		ss.Name = ctr.Name
-		ss.ID = ctr.ID
 		ss.PreCPUStats = preCPUStats
 		ss.PreRead = preRead
 		preCPUStats = ss.CPUStats

daemon/stats_unix.go

@@ -47,10 +47,11 @@ func (daemon *Daemon) stats(c *container.Container) (*containertypes.StatsRespon
 		return nil, err
 	}
 	s := &containertypes.StatsResponse{
+		Name: c.Name,
+		ID:   c.ID,
 		Read: cs.Read,
 	}
-	stats := cs.Metrics
-	switch t := stats.(type) {
+	switch t := cs.Metrics.(type) {
 	case *statsV1.Metrics:
 		return daemon.statsV1(s, t)
 	case *statsV2.Metrics:

daemon/stats_windows.go

@@ -28,6 +28,8 @@ func (daemon *Daemon) stats(c *container.Container) (*containertypes.StatsRespon
 
 	// Start with an empty structure
 	s := &containertypes.StatsResponse{
+		Name:     c.Name,
+		ID:       c.ID,
 		Read:     stats.Read,
 		NumProcs: platform.NumProcs(),
 	}

integration-cli/docker_api_containers_test.go

@@ -1134,17 +1134,17 @@ func (s *DockerAPISuite) TestContainerAPIStatsWithNetworkDisabled(c *testing.T)
 	assert.NilError(c, err)
 	defer apiClient.Close()
 
-	_, err = apiClient.ContainerCreate(testutil.GetContext(c), client.ContainerCreateOptions{
+	ctr, err := apiClient.ContainerCreate(testutil.GetContext(c), client.ContainerCreateOptions{
 		Config:           &config,
 		HostConfig:       &container.HostConfig{},
 		NetworkingConfig: &network.NetworkingConfig{},
 		Name:             name,
 	})
 	assert.NilError(c, err)
 
-	err = apiClient.ContainerStart(testutil.GetContext(c), name, client.ContainerStartOptions{})
+	err = apiClient.ContainerStart(testutil.GetContext(c), ctr.ID, client.ContainerStartOptions{})
 	assert.NilError(c, err)
-	cli.WaitRun(c, name)
+	cli.WaitRun(c, ctr.ID)
 
 	type b struct {
 		stats client.StatsResponseReader
@@ -1153,7 +1153,7 @@ func (s *DockerAPISuite) TestContainerAPIStatsWithNetworkDisabled(c *testing.T)
 	bc := make(chan b, 1)
 	go func() {
 		stats, err := apiClient.ContainerStats(testutil.GetContext(c), name, false)
-		bc <- b{stats, err}
+		bc <- b{stats: stats, err: err}
 	}()
 
 	// allow some time to stream the stats from the container
@@ -1167,7 +1167,10 @@ func (s *DockerAPISuite) TestContainerAPIStatsWithNetworkDisabled(c *testing.T)
 		c.Fatal("stream was not closed after container was removed")
 	case sr := <-bc:
 		assert.NilError(c, sr.err)
-		sr.stats.Body.Close()
+		var v container.StatsResponse
+		assert.NilError(c, json.NewDecoder(sr.stats.Body).Decode(&v))
+		assert.Check(c, is.Equal(v.ID, ctr.ID))
+		_ = sr.stats.Body.Close()
 	}
 }