@@ -37,7 +37,7 @@ type CopyToContainerOptions struct {

 // The OSType field is set to the server's platform to allow

 // platform-specific handling of the response.

 //

-// TODO(thaJeztah): remove this wrapper, and make OSType part of [StatsJSON].

+// TODO(thaJeztah): remove this wrapper, and make OSType part of [StatsResponse].

 type StatsResponseReader struct {

 	Body   io.ReadCloser `json:"body"`

 	OSType string        `json:"ostype"`

new file mode 100644

@@ -0,0 +1,181 @@

+package container

+

+import "time"

+

+// ThrottlingData stores CPU throttling stats of one running container.

+// Not used on Windows.

+type ThrottlingData struct {

+	// Number of periods with throttling active

+	Periods uint64 `json:"periods"`

+	// Number of periods when the container hits its throttling limit.

+	ThrottledPeriods uint64 `json:"throttled_periods"`

+	// Aggregate time the container was throttled for in nanoseconds.

+	ThrottledTime uint64 `json:"throttled_time"`

+}

+

+// CPUUsage stores All CPU stats aggregated since container inception.

+type CPUUsage struct {

+	// Total CPU time consumed.

+	// Units: nanoseconds (Linux)

+	// Units: 100's of nanoseconds (Windows)

+	TotalUsage uint64 `json:"total_usage"`

+

+	// Total CPU time consumed per core (Linux). Not used on Windows.

+	// Units: nanoseconds.

+	PercpuUsage []uint64 `json:"percpu_usage,omitempty"`

+

+	// Time spent by tasks of the cgroup in kernel mode (Linux).

+	// Time spent by all container processes in kernel mode (Windows).

+	// Units: nanoseconds (Linux).

+	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.

+	UsageInKernelmode uint64 `json:"usage_in_kernelmode"`

+

+	// Time spent by tasks of the cgroup in user mode (Linux).

+	// Time spent by all container processes in user mode (Windows).

+	// Units: nanoseconds (Linux).

+	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers

+	UsageInUsermode uint64 `json:"usage_in_usermode"`

+}

+

+// CPUStats aggregates and wraps all CPU related info of container

+type CPUStats struct {

+	// CPU Usage. Linux and Windows.

+	CPUUsage CPUUsage `json:"cpu_usage"`

+

+	// System Usage. Linux only.

+	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`

+

+	// Online CPUs. Linux only.

+	OnlineCPUs uint32 `json:"online_cpus,omitempty"`

+

+	// Throttling Data. Linux only.

+	ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`

+}

+

+// MemoryStats aggregates all memory stats since container inception on Linux.

+// Windows returns stats for commit and private working set only.

+type MemoryStats struct {

+	// Linux Memory Stats

+

+	// current res_counter usage for memory

+	Usage uint64 `json:"usage,omitempty"`

+	// maximum usage ever recorded.

+	MaxUsage uint64 `json:"max_usage,omitempty"`

+	// TODO(vishh): Export these as stronger types.

+	// all the stats exported via memory.stat.

+	Stats map[string]uint64 `json:"stats,omitempty"`

+	// number of times memory usage hits limits.

+	Failcnt uint64 `json:"failcnt,omitempty"`

+	Limit   uint64 `json:"limit,omitempty"`

+

+	// Windows Memory Stats

+	// See https://technet.microsoft.com/en-us/magazine/ff382715.aspx

+

+	// committed bytes

+	Commit uint64 `json:"commitbytes,omitempty"`

+	// peak committed bytes

+	CommitPeak uint64 `json:"commitpeakbytes,omitempty"`

+	// private working set

+	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`

+}

+

+// BlkioStatEntry is one small entity to store a piece of Blkio stats

+// Not used on Windows.

+type BlkioStatEntry struct {

+	Major uint64 `json:"major"`

+	Minor uint64 `json:"minor"`

+	Op    string `json:"op"`

+	Value uint64 `json:"value"`

+}

+

+// BlkioStats stores All IO service stats for data read and write.

+// This is a Linux specific structure as the differences between expressing

+// block I/O on Windows and Linux are sufficiently significant to make

+// little sense attempting to morph into a combined structure.

+type BlkioStats struct {

+	// number of bytes transferred to and from the block device

+	IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive"`

+	IoServicedRecursive     []BlkioStatEntry `json:"io_serviced_recursive"`

+	IoQueuedRecursive       []BlkioStatEntry `json:"io_queue_recursive"`

+	IoServiceTimeRecursive  []BlkioStatEntry `json:"io_service_time_recursive"`

+	IoWaitTimeRecursive     []BlkioStatEntry `json:"io_wait_time_recursive"`

+	IoMergedRecursive       []BlkioStatEntry `json:"io_merged_recursive"`

+	IoTimeRecursive         []BlkioStatEntry `json:"io_time_recursive"`

+	SectorsRecursive        []BlkioStatEntry `json:"sectors_recursive"`

+}

+

+// StorageStats is the disk I/O stats for read/write on Windows.

+type StorageStats struct {

+	ReadCountNormalized  uint64 `json:"read_count_normalized,omitempty"`

+	ReadSizeBytes        uint64 `json:"read_size_bytes,omitempty"`

+	WriteCountNormalized uint64 `json:"write_count_normalized,omitempty"`

+	WriteSizeBytes       uint64 `json:"write_size_bytes,omitempty"`

+}

+

+// NetworkStats aggregates the network stats of one container

+type NetworkStats struct {

+	// Bytes received. Windows and Linux.

+	RxBytes uint64 `json:"rx_bytes"`

+	// Packets received. Windows and Linux.

+	RxPackets uint64 `json:"rx_packets"`

+	// Received errors. Not used on Windows. Note that we don't `omitempty` this

+	// field as it is expected in the >=v1.21 API stats structure.

+	RxErrors uint64 `json:"rx_errors"`

+	// Incoming packets dropped. Windows and Linux.

+	RxDropped uint64 `json:"rx_dropped"`

+	// Bytes sent. Windows and Linux.

+	TxBytes uint64 `json:"tx_bytes"`

+	// Packets sent. Windows and Linux.

+	TxPackets uint64 `json:"tx_packets"`

+	// Sent errors. Not used on Windows. Note that we don't `omitempty` this

+	// field as it is expected in the >=v1.21 API stats structure.

+	TxErrors uint64 `json:"tx_errors"`

+	// Outgoing packets dropped. Windows and Linux.

+	TxDropped uint64 `json:"tx_dropped"`

+	// Endpoint ID. Not used on Linux.

+	EndpointID string `json:"endpoint_id,omitempty"`

+	// Instance ID. Not used on Linux.

+	InstanceID string `json:"instance_id,omitempty"`

+}

+

+// PidsStats contains the stats of a container's pids

+type PidsStats struct {

+	// Current is the number of pids in the cgroup

+	Current uint64 `json:"current,omitempty"`

+	// Limit is the hard limit on the number of pids in the cgroup.

+	// A "Limit" of 0 means that there is no limit.

+	Limit uint64 `json:"limit,omitempty"`

+}

+

+// Stats is Ultimate struct aggregating all types of stats of one container

+type Stats struct {

+	// Common stats

+	Read    time.Time `json:"read"`

+	PreRead time.Time `json:"preread"`

+

+	// Linux specific stats, not populated on Windows.

+	PidsStats  PidsStats  `json:"pids_stats,omitempty"`

+	BlkioStats BlkioStats `json:"blkio_stats,omitempty"`

+

+	// Windows specific stats, not populated on Linux.

+	NumProcs     uint32       `json:"num_procs"`

+	StorageStats StorageStats `json:"storage_stats,omitempty"`

+

+	// Shared stats

+	CPUStats    CPUStats    `json:"cpu_stats,omitempty"`

+	PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"

+	MemoryStats MemoryStats `json:"memory_stats,omitempty"`

+}

+

+// StatsResponse is newly used Networks.

+//

+// TODO(thaJeztah): unify with [Stats]. This wrapper was to account for pre-api v1.21 changes, see https://github.com/moby/moby/commit/d3379946ec96fb6163cb8c4517d7d5a067045801

+type StatsResponse struct {

+	Stats

+

+	Name string `json:"name,omitempty"`

+	ID   string `json:"id,omitempty"`

+

+	// Networks request version >=1.21

+	Networks map[string]NetworkStats `json:"networks,omitempty"`

+}

deleted file mode 100644

@@ -1,181 +0,0 @@

-// Package types is used for API stability in the types and response to the

-// consumers of the API stats endpoint.

-package types // import "github.com/docker/docker/api/types"

-

-import "time"

-

-// ThrottlingData stores CPU throttling stats of one running container.

-// Not used on Windows.

-type ThrottlingData struct {

-	// Number of periods with throttling active

-	Periods uint64 `json:"periods"`

-	// Number of periods when the container hits its throttling limit.

-	ThrottledPeriods uint64 `json:"throttled_periods"`

-	// Aggregate time the container was throttled for in nanoseconds.

-	ThrottledTime uint64 `json:"throttled_time"`

-}

-

-// CPUUsage stores All CPU stats aggregated since container inception.

-type CPUUsage struct {

-	// Total CPU time consumed.

-	// Units: nanoseconds (Linux)

-	// Units: 100's of nanoseconds (Windows)

-	TotalUsage uint64 `json:"total_usage"`

-

-	// Total CPU time consumed per core (Linux). Not used on Windows.

-	// Units: nanoseconds.

-	PercpuUsage []uint64 `json:"percpu_usage,omitempty"`

-

-	// Time spent by tasks of the cgroup in kernel mode (Linux).

-	// Time spent by all container processes in kernel mode (Windows).

-	// Units: nanoseconds (Linux).

-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.

-	UsageInKernelmode uint64 `json:"usage_in_kernelmode"`

-

-	// Time spent by tasks of the cgroup in user mode (Linux).

-	// Time spent by all container processes in user mode (Windows).

-	// Units: nanoseconds (Linux).

-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers

-	UsageInUsermode uint64 `json:"usage_in_usermode"`

-}

-

-// CPUStats aggregates and wraps all CPU related info of container

-type CPUStats struct {

-	// CPU Usage. Linux and Windows.

-	CPUUsage CPUUsage `json:"cpu_usage"`

-

-	// System Usage. Linux only.

-	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`

-

-	// Online CPUs. Linux only.

-	OnlineCPUs uint32 `json:"online_cpus,omitempty"`

-

-	// Throttling Data. Linux only.

-	ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`

-}

-

-// MemoryStats aggregates all memory stats since container inception on Linux.

-// Windows returns stats for commit and private working set only.

-type MemoryStats struct {

-	// Linux Memory Stats

-

-	// current res_counter usage for memory

-	Usage uint64 `json:"usage,omitempty"`

-	// maximum usage ever recorded.

-	MaxUsage uint64 `json:"max_usage,omitempty"`

-	// TODO(vishh): Export these as stronger types.

-	// all the stats exported via memory.stat.

-	Stats map[string]uint64 `json:"stats,omitempty"`

-	// number of times memory usage hits limits.

-	Failcnt uint64 `json:"failcnt,omitempty"`

-	Limit   uint64 `json:"limit,omitempty"`

-

-	// Windows Memory Stats

-	// See https://technet.microsoft.com/en-us/magazine/ff382715.aspx

-

-	// committed bytes

-	Commit uint64 `json:"commitbytes,omitempty"`

-	// peak committed bytes

-	CommitPeak uint64 `json:"commitpeakbytes,omitempty"`

-	// private working set

-	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`

-}

-

-// BlkioStatEntry is one small entity to store a piece of Blkio stats

-// Not used on Windows.

-type BlkioStatEntry struct {

-	Major uint64 `json:"major"`

-	Minor uint64 `json:"minor"`

-	Op    string `json:"op"`

-	Value uint64 `json:"value"`

-}

-

-// BlkioStats stores All IO service stats for data read and write.

-// This is a Linux specific structure as the differences between expressing

-// block I/O on Windows and Linux are sufficiently significant to make

-// little sense attempting to morph into a combined structure.

-type BlkioStats struct {

-	// number of bytes transferred to and from the block device

-	IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive"`

-	IoServicedRecursive     []BlkioStatEntry `json:"io_serviced_recursive"`

-	IoQueuedRecursive       []BlkioStatEntry `json:"io_queue_recursive"`

-	IoServiceTimeRecursive  []BlkioStatEntry `json:"io_service_time_recursive"`

-	IoWaitTimeRecursive     []BlkioStatEntry `json:"io_wait_time_recursive"`

-	IoMergedRecursive       []BlkioStatEntry `json:"io_merged_recursive"`

-	IoTimeRecursive         []BlkioStatEntry `json:"io_time_recursive"`

-	SectorsRecursive        []BlkioStatEntry `json:"sectors_recursive"`

-}

-

-// StorageStats is the disk I/O stats for read/write on Windows.

-type StorageStats struct {

-	ReadCountNormalized  uint64 `json:"read_count_normalized,omitempty"`

-	ReadSizeBytes        uint64 `json:"read_size_bytes,omitempty"`

-	WriteCountNormalized uint64 `json:"write_count_normalized,omitempty"`

-	WriteSizeBytes       uint64 `json:"write_size_bytes,omitempty"`

-}

-

-// NetworkStats aggregates the network stats of one container

-type NetworkStats struct {

-	// Bytes received. Windows and Linux.

-	RxBytes uint64 `json:"rx_bytes"`

-	// Packets received. Windows and Linux.

-	RxPackets uint64 `json:"rx_packets"`

-	// Received errors. Not used on Windows. Note that we don't `omitempty` this

-	// field as it is expected in the >=v1.21 API stats structure.

-	RxErrors uint64 `json:"rx_errors"`

-	// Incoming packets dropped. Windows and Linux.

-	RxDropped uint64 `json:"rx_dropped"`

-	// Bytes sent. Windows and Linux.

-	TxBytes uint64 `json:"tx_bytes"`

-	// Packets sent. Windows and Linux.

-	TxPackets uint64 `json:"tx_packets"`

-	// Sent errors. Not used on Windows. Note that we don't `omitempty` this

-	// field as it is expected in the >=v1.21 API stats structure.

-	TxErrors uint64 `json:"tx_errors"`

-	// Outgoing packets dropped. Windows and Linux.

-	TxDropped uint64 `json:"tx_dropped"`

-	// Endpoint ID. Not used on Linux.

-	EndpointID string `json:"endpoint_id,omitempty"`

-	// Instance ID. Not used on Linux.

-	InstanceID string `json:"instance_id,omitempty"`

-}

-

-// PidsStats contains the stats of a container's pids

-type PidsStats struct {

-	// Current is the number of pids in the cgroup

-	Current uint64 `json:"current,omitempty"`

-	// Limit is the hard limit on the number of pids in the cgroup.

-	// A "Limit" of 0 means that there is no limit.

-	Limit uint64 `json:"limit,omitempty"`

-}

-

-// Stats is Ultimate struct aggregating all types of stats of one container

-type Stats struct {

-	// Common stats

-	Read    time.Time `json:"read"`

-	PreRead time.Time `json:"preread"`

-

-	// Linux specific stats, not populated on Windows.

-	PidsStats  PidsStats  `json:"pids_stats,omitempty"`

-	BlkioStats BlkioStats `json:"blkio_stats,omitempty"`

-

-	// Windows specific stats, not populated on Linux.

-	NumProcs     uint32       `json:"num_procs"`

-	StorageStats StorageStats `json:"storage_stats,omitempty"`

-

-	// Shared stats

-	CPUStats    CPUStats    `json:"cpu_stats,omitempty"`

-	PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"

-	MemoryStats MemoryStats `json:"memory_stats,omitempty"`

-}

-

-// StatsJSON is newly used Networks

-type StatsJSON struct {

-	Stats

-

-	Name string `json:"name,omitempty"`

-	ID   string `json:"id,omitempty"`

-

-	// Networks request version >=1.21

-	Networks map[string]NetworkStats `json:"networks,omitempty"`

-}

@@ -114,6 +114,67 @@ type CopyToContainerOptions = container.CopyToContainerOptions

 // Deprecated: use [container.StatsResponseReader].

 type ContainerStats = container.StatsResponseReader

+// ThrottlingData stores CPU throttling stats of one running container.

+// Not used on Windows.

+//

+// Deprecated: use [container.ThrottlingData].

+type ThrottlingData = container.ThrottlingData

+

+// CPUUsage stores All CPU stats aggregated since container inception.

+//

+// Deprecated: use [container.CPUUsage].

+type CPUUsage = container.CPUUsage

+

+// CPUStats aggregates and wraps all CPU related info of container

+//

+// Deprecated: use [container.CPUStats].

+type CPUStats = container.CPUStats

+

+// MemoryStats aggregates all memory stats since container inception on Linux.

+// Windows returns stats for commit and private working set only.

+//

+// Deprecated: use [container.MemoryStats].

+type MemoryStats = container.MemoryStats

+

+// BlkioStatEntry is one small entity to store a piece of Blkio stats

+// Not used on Windows.

+//

+// Deprecated: use [container.BlkioStatEntry].

+type BlkioStatEntry = container.BlkioStatEntry

+

+// BlkioStats stores All IO service stats for data read and write.

+// This is a Linux specific structure as the differences between expressing

+// block I/O on Windows and Linux are sufficiently significant to make

+// little sense attempting to morph into a combined structure.

+//

+// Deprecated: use [container.BlkioStats].

+type BlkioStats = container.BlkioStats

+

+// StorageStats is the disk I/O stats for read/write on Windows.

+//

+// Deprecated: use [container.StorageStats].

+type StorageStats = container.StorageStats

+

+// NetworkStats aggregates the network stats of one container

+//

+// Deprecated: use [container.NetworkStats].

+type NetworkStats = container.NetworkStats

+

+// PidsStats contains the stats of a container's pids

+//

+// Deprecated: use [container.PidsStats].

+type PidsStats = container.PidsStats

+

+// Stats is Ultimate struct aggregating all types of stats of one container

+//

+// Deprecated: use [container.Stats].

+type Stats = container.Stats

+

+// StatsJSON is newly used Networks

+//

+// Deprecated: use [container.StatsResponse].

+type StatsJSON = container.StatsResponse

+

 // EventsOptions holds parameters to filter events with.

 //

 // Deprecated: use [events.ListOptions].

@@ -8,8 +8,8 @@ import (

 	"time"

 	"github.com/containerd/log"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/errdefs"

 )

@@ -30,7 +30,7 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c

 	// If the container is either not running or restarting and requires no stream, return an empty stats.

 	if (!ctr.IsRunning() || ctr.IsRestarting()) && !config.Stream {

-		return enc.Encode(&types.StatsJSON{

+		return enc.Encode(&containertypes.StatsResponse{

 			Name: ctr.Name,

 			ID:   ctr.ID,

 		})

@@ -45,10 +45,10 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c

 		return enc.Encode(stats)

 	}

-	var preCPUStats types.CPUStats

+	var preCPUStats containertypes.CPUStats

 	var preRead time.Time

-	getStatJSON := func(v interface{}) *types.StatsJSON {

-		ss := v.(types.StatsJSON)

+	getStatJSON := func(v interface{}) *containertypes.StatsResponse {

+		ss := v.(containertypes.StatsResponse)

 		ss.Name = ctr.Name

 		ss.ID = ctr.ID

 		ss.PreCPUStats = preCPUStats

@@ -99,7 +99,7 @@ func (daemon *Daemon) unsubscribeToContainerStats(c *container.Container, ch cha

 }

 // GetContainerStats collects all the stats published by a container

-func (daemon *Daemon) GetContainerStats(container *container.Container) (*types.StatsJSON, error) {

+func (daemon *Daemon) GetContainerStats(container *container.Container) (*containertypes.StatsResponse, error) {

 	stats, err := daemon.stats(container)

 	if err != nil {

 		goto done

@@ -124,7 +124,7 @@ done:

 		return stats, nil

 	case errdefs.ErrConflict, errdefs.ErrNotFound:

 		// return empty stats containing only name and ID if not running or not found

-		return &types.StatsJSON{

+		return &containertypes.StatsResponse{

 			Name: container.Name,

 			ID:   container.ID,

 		}, nil

@@ -4,7 +4,7 @@ import (

 	"sync"

 	"time"

-	"github.com/docker/docker/api/types"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

 	"github.com/moby/pubsub"

 )

@@ -31,7 +31,7 @@ func NewCollector(supervisor supervisor, interval time.Duration) *Collector {

 type supervisor interface {

 	// GetContainerStats collects all the stats related to a container

-	GetContainerStats(container *container.Container) (*types.StatsJSON, error)

+	GetContainerStats(container *container.Container) (*containertypes.StatsResponse, error)

 }

 // Collect registers the container with the collector and adds it to

@@ -105,7 +105,7 @@ func (s *Collector) Run() {

 		for _, pair := range pairs {

 			stats, err := s.supervisor.GetContainerStats(pair.container)

 			if err != nil {

-				stats = &types.StatsJSON{

+				stats = &containertypes.StatsResponse{

 					Name: pair.container.Name,

 					ID:   pair.container.ID,

 				}

@@ -12,15 +12,15 @@ import (

 	statsV1 "github.com/containerd/cgroups/v3/cgroup1/stats"

 	statsV2 "github.com/containerd/cgroups/v3/cgroup2/stats"

-	"github.com/docker/docker/api/types"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

 	"github.com/pkg/errors"

 )

-func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []types.BlkioStatEntry {

-	out := make([]types.BlkioStatEntry, len(entries))

+func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []containertypes.BlkioStatEntry {

+	out := make([]containertypes.BlkioStatEntry, len(entries))

 	for i, re := range entries {

-		out[i] = types.BlkioStatEntry{

+		out[i] = containertypes.BlkioStatEntry{

 			Major: re.Major,

 			Minor: re.Minor,

 			Op:    re.Op,

@@ -30,7 +30,7 @@ func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []types.BlkioStatEntry {

 	return out

 }

-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

+func (daemon *Daemon) stats(c *container.Container) (*containertypes.StatsResponse, error) {

 	c.Lock()

 	task, err := c.GetRunningTask()

 	c.Unlock()

@@ -44,7 +44,7 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 		}

 		return nil, err

 	}

-	s := &types.StatsJSON{}

+	s := &containertypes.StatsResponse{}

 	s.Read = cs.Read

 	stats := cs.Metrics

 	switch t := stats.(type) {

@@ -57,9 +57,9 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 	}

 }

-func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*types.StatsJSON, error) {

+func (daemon *Daemon) statsV1(s *containertypes.StatsResponse, stats *statsV1.Metrics) (*containertypes.StatsResponse, error) {

 	if stats.Blkio != nil {

-		s.BlkioStats = types.BlkioStats{

+		s.BlkioStats = containertypes.BlkioStats{

 			IoServiceBytesRecursive: copyBlkioEntry(stats.Blkio.IoServiceBytesRecursive),

 			IoServicedRecursive:     copyBlkioEntry(stats.Blkio.IoServicedRecursive),

 			IoQueuedRecursive:       copyBlkioEntry(stats.Blkio.IoQueuedRecursive),

@@ -71,14 +71,14 @@ func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*type

 		}

 	}

 	if stats.CPU != nil {

-		s.CPUStats = types.CPUStats{

-			CPUUsage: types.CPUUsage{

+		s.CPUStats = containertypes.CPUStats{

+			CPUUsage: containertypes.CPUUsage{

 				TotalUsage:        stats.CPU.Usage.Total,

 				PercpuUsage:       stats.CPU.Usage.PerCPU,

 				UsageInKernelmode: stats.CPU.Usage.Kernel,

 				UsageInUsermode:   stats.CPU.Usage.User,

 			},

-			ThrottlingData: types.ThrottlingData{

+			ThrottlingData: containertypes.ThrottlingData{

 				Periods:          stats.CPU.Throttling.Periods,

 				ThrottledPeriods: stats.CPU.Throttling.ThrottledPeriods,

 				ThrottledTime:    stats.CPU.Throttling.ThrottledTime,

@@ -122,7 +122,7 @@ func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*type

 			"total_unevictable":         stats.Memory.TotalUnevictable,

 		}

 		if stats.Memory.Usage != nil {

-			s.MemoryStats = types.MemoryStats{

+			s.MemoryStats = containertypes.MemoryStats{

 				Stats:    raw,

 				Usage:    stats.Memory.Usage.Usage,

 				MaxUsage: stats.Memory.Usage.Max,

@@ -130,7 +130,7 @@ func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*type

 				Failcnt:  stats.Memory.Usage.Failcnt,

 			}

 		} else {

-			s.MemoryStats = types.MemoryStats{

+			s.MemoryStats = containertypes.MemoryStats{

 				Stats: raw,

 			}

 		}

@@ -142,7 +142,7 @@ func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*type

 	}

 	if stats.Pids != nil {

-		s.PidsStats = types.PidsStats{

+		s.PidsStats = containertypes.PidsStats{

 			Current: stats.Pids.Current,

 			Limit:   stats.Pids.Limit,

 		}

@@ -151,18 +151,18 @@ func (daemon *Daemon) statsV1(s *types.StatsJSON, stats *statsV1.Metrics) (*type

 	return s, nil

 }

-func (daemon *Daemon) statsV2(s *types.StatsJSON, stats *statsV2.Metrics) (*types.StatsJSON, error) {

+func (daemon *Daemon) statsV2(s *containertypes.StatsResponse, stats *statsV2.Metrics) (*containertypes.StatsResponse, error) {

 	if stats.Io != nil {

-		var isbr []types.BlkioStatEntry

+		var isbr []containertypes.BlkioStatEntry

 		for _, re := range stats.Io.Usage {

 			isbr = append(isbr,

-				types.BlkioStatEntry{

+				containertypes.BlkioStatEntry{

 					Major: re.Major,

 					Minor: re.Minor,

 					Op:    "read",

 					Value: re.Rbytes,

 				},

-				types.BlkioStatEntry{

+				containertypes.BlkioStatEntry{

 					Major: re.Major,

 					Minor: re.Minor,

 					Op:    "write",

@@ -170,21 +170,21 @@ func (daemon *Daemon) statsV2(s *types.StatsJSON, stats *statsV2.Metrics) (*type

 				},

 			)

 		}

-		s.BlkioStats = types.BlkioStats{

+		s.BlkioStats = containertypes.BlkioStats{

 			IoServiceBytesRecursive: isbr,

 			// Other fields are unsupported

 		}

 	}

 	if stats.CPU != nil {

-		s.CPUStats = types.CPUStats{

-			CPUUsage: types.CPUUsage{

+		s.CPUStats = containertypes.CPUStats{

+			CPUUsage: containertypes.CPUUsage{

 				TotalUsage: stats.CPU.UsageUsec * 1000,

 				// PercpuUsage is not supported

 				UsageInKernelmode: stats.CPU.SystemUsec * 1000,

 				UsageInUsermode:   stats.CPU.UserUsec * 1000,

 			},

-			ThrottlingData: types.ThrottlingData{

+			ThrottlingData: containertypes.ThrottlingData{

 				Periods:          stats.CPU.NrPeriods,

 				ThrottledPeriods: stats.CPU.NrThrottled,

 				ThrottledTime:    stats.CPU.ThrottledUsec * 1000,

@@ -193,7 +193,7 @@ func (daemon *Daemon) statsV2(s *types.StatsJSON, stats *statsV2.Metrics) (*type

 	}

 	if stats.Memory != nil {

-		s.MemoryStats = types.MemoryStats{

+		s.MemoryStats = containertypes.MemoryStats{

 			// Stats is not compatible with v1

 			Stats: map[string]uint64{

 				"anon":                   stats.Memory.Anon,

@@ -244,7 +244,7 @@ func (daemon *Daemon) statsV2(s *types.StatsJSON, stats *statsV2.Metrics) (*type

 	}

 	if stats.Pids != nil {

-		s.PidsStats = types.PidsStats{

+		s.PidsStats = containertypes.PidsStats{

 			Current: stats.Pids.Current,

 			Limit:   stats.Pids.Limit,

 		}

@@ -267,7 +267,7 @@ func (daemon *Daemon) getNetworkSandboxID(c *container.Container) (string, error

 	return curr.NetworkSettings.SandboxID, nil

 }

-func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.NetworkStats, error) {

+func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]containertypes.NetworkStats, error) {

 	sandboxID, err := daemon.getNetworkSandboxID(c)

 	if err != nil {

 		return nil, err

@@ -283,10 +283,10 @@ func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.

 		return nil, err

 	}

-	stats := make(map[string]types.NetworkStats)

+	stats := make(map[string]containertypes.NetworkStats)

 	// Convert libnetwork nw stats into api stats

 	for ifName, ifStats := range lnstats {

-		stats[ifName] = types.NetworkStats{

+		stats[ifName] = containertypes.NetworkStats{

 			RxBytes:   ifStats.RxBytes,

 			RxPackets: ifStats.RxPackets,

 			RxErrors:  ifStats.RxErrors,

@@ -3,13 +3,13 @@ package daemon // import "github.com/docker/docker/daemon"

 import (

 	"context"

-	"github.com/docker/docker/api/types"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/pkg/platform"

 )

-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

+func (daemon *Daemon) stats(c *container.Container) (*containertypes.StatsResponse, error) {

 	c.Lock()

 	task, err := c.GetRunningTask()

 	c.Unlock()

@@ -27,15 +27,15 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 	}

 	// Start with an empty structure

-	s := &types.StatsJSON{}

+	s := &containertypes.StatsResponse{}

 	s.Stats.Read = stats.Read

 	s.Stats.NumProcs = platform.NumProcs()

 	if stats.HCSStats != nil {

 		hcss := stats.HCSStats

 		// Populate the CPU/processor statistics

-		s.CPUStats = types.CPUStats{

-			CPUUsage: types.CPUUsage{

+		s.CPUStats = containertypes.CPUStats{

+			CPUUsage: containertypes.CPUUsage{

 				TotalUsage:        hcss.Processor.TotalRuntime100ns,

 				UsageInKernelmode: hcss.Processor.RuntimeKernel100ns,

 				UsageInUsermode:   hcss.Processor.RuntimeUser100ns,

@@ -43,14 +43,14 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 		}

 		// Populate the memory statistics

-		s.MemoryStats = types.MemoryStats{

+		s.MemoryStats = containertypes.MemoryStats{

 			Commit:            hcss.Memory.UsageCommitBytes,

 			CommitPeak:        hcss.Memory.UsageCommitPeakBytes,

 			PrivateWorkingSet: hcss.Memory.UsagePrivateWorkingSetBytes,

 		}

 		// Populate the storage statistics

-		s.StorageStats = types.StorageStats{

+		s.StorageStats = containertypes.StorageStats{

 			ReadCountNormalized:  hcss.Storage.ReadCountNormalized,

 			ReadSizeBytes:        hcss.Storage.ReadSizeBytes,

 			WriteCountNormalized: hcss.Storage.WriteCountNormalized,

@@ -58,9 +58,9 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 		}

 		// Populate the network statistics

-		s.Networks = make(map[string]types.NetworkStats)

+		s.Networks = make(map[string]containertypes.NetworkStats)

 		for _, nstats := range hcss.Network {

-			s.Networks[nstats.EndpointId] = types.NetworkStats{

+			s.Networks[nstats.EndpointId] = containertypes.NetworkStats{

 				RxBytes:   nstats.BytesReceived,

 				RxPackets: nstats.PacketsReceived,

 				RxDropped: nstats.DroppedPacketsIncoming,

@@ -74,8 +74,8 @@ func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {

 }

 // Windows network stats are obtained directly through HCS, hence this is a no-op.

-func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.NetworkStats, error) {

-	return make(map[string]types.NetworkStats), nil

+func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]containertypes.NetworkStats, error) {

+	return make(map[string]containertypes.NetworkStats), nil

 }

 // getSystemCPUUsage returns the host system's cpu usage in

@@ -178,7 +178,7 @@ func (s *DockerAPISuite) TestGetContainerStats(c *testing.T) {

 	case sr := <-bc:

 		dec := json.NewDecoder(sr.stats.Body)

 		defer sr.stats.Body.Close()

-		var s *types.Stats

+		var s *container.Stats

 		// decode only one object from the stream

 		assert.NilError(c, dec.Decode(&s))

 	}

@@ -11,7 +11,7 @@ import (

 	"testing"

 	"time"

-	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/system"

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/cli"

@@ -34,7 +34,7 @@ func (s *DockerAPISuite) TestAPIStatsNoStreamGetCpu(c *testing.T) {

 	assert.Equal(c, resp.Header.Get("Content-Type"), "application/json")

 	assert.Equal(c, resp.Header.Get("Content-Type"), "application/json")

-	var v *types.Stats

+	var v *container.Stats

 	err = json.NewDecoder(body).Decode(&v)

 	assert.NilError(c, err)

 	body.Close()

@@ -173,8 +173,8 @@ func (s *DockerAPISuite) TestAPIStatsNetworkStatsVersioning(c *testing.T) {

 	assert.Assert(c, jsonBlobHasGTE121NetworkStats(statsJSONBlob), "Stats JSON blob from API does not look like a >=v1.21 API stats structure", statsJSONBlob)

 }

-func getNetworkStats(c *testing.T, id string) map[string]types.NetworkStats {

-	var st *types.StatsJSON

+func getNetworkStats(c *testing.T, id string) map[string]container.NetworkStats {

+	var st *container.StatsResponse

 	_, body, err := request.Get(testutil.GetContext(c), "/containers/"+id+"/stats?stream=false")

 	assert.NilError(c, err)

@@ -263,7 +263,7 @@ func (s *DockerAPISuite) TestAPIStatsNoStreamConnectedContainers(c *testing.T) {

 		if resp.Header.Get("Content-Type") != "application/json" {

 			ch <- fmt.Errorf("Invalid 'Content-Type' %v", resp.Header.Get("Content-Type"))

 		}

-		var v *types.Stats

+		var v *container.Stats

 		if err := json.NewDecoder(body).Decode(&v); err != nil {

 			ch <- err

 		}

@@ -12,7 +12,7 @@ import (

 	"time"

 	"github.com/creack/pty"

-	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/cli"

 	"github.com/docker/docker/testutil"

@@ -185,7 +185,7 @@ func (s *DockerCLIUpdateSuite) TestUpdateStats(c *testing.T) {

 		assert.NilError(c, err)

 		assert.Equal(c, resp.Header.Get("Content-Type"), "application/json")

-		var v *types.Stats

+		var v *container.Stats

 		err = json.NewDecoder(body).Decode(&v)

 		assert.NilError(c, err)

 		body.Close()

@@ -6,7 +6,7 @@ import (

 	"reflect"

 	"testing"

-	"github.com/docker/docker/api/types"

+	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/integration/internal/container"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -28,11 +28,11 @@ func TestStats(t *testing.T) {

 	assert.NilError(t, err)

 	defer resp.Body.Close()

-	var v types.Stats

+	var v containertypes.Stats

 	err = json.NewDecoder(resp.Body).Decode(&v)

 	assert.NilError(t, err)

 	assert.Check(t, is.Equal(int64(v.MemoryStats.Limit), info.MemTotal))

-	assert.Check(t, !reflect.DeepEqual(v.PreCPUStats, types.CPUStats{}))

+	assert.Check(t, !reflect.DeepEqual(v.PreCPUStats, containertypes.CPUStats{}))

 	err = json.NewDecoder(resp.Body).Decode(&v)

 	assert.Assert(t, is.ErrorContains(err, ""), io.EOF)

@@ -40,11 +40,11 @@ func TestStats(t *testing.T) {

 	assert.NilError(t, err)

 	defer resp.Body.Close()

-	v = types.Stats{}

+	v = containertypes.Stats{}

 	err = json.NewDecoder(resp.Body).Decode(&v)

 	assert.NilError(t, err)

 	assert.Check(t, is.Equal(int64(v.MemoryStats.Limit), info.MemTotal))

-	assert.Check(t, is.DeepEqual(v.PreCPUStats, types.CPUStats{}))

+	assert.Check(t, is.DeepEqual(v.PreCPUStats, containertypes.CPUStats{}))