Remove omitempty json tags from stucts
When unmarshaling the json response from the API in languages to a dynamic object having the omitempty field tag on types such as float64 case the key to be omitted on 0.0 values. Various langages will interpret this as a null when 0.0 is the actual value. This patch removes the omitempty tags on fields that are not structs where they can be safely omited. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
parent
a3c5223b2a
commit
44f4c95c0e
|
@ -6,21 +6,21 @@ import "time"
|
||||||
|
|
||||||
type ThrottlingData struct {
|
type ThrottlingData struct {
|
||||||
// Number of periods with throttling active
|
// Number of periods with throttling active
|
||||||
Periods uint64 `json:"periods,omitempty"`
|
Periods uint64 `json:"periods"`
|
||||||
// Number of periods when the container hit its throttling limit.
|
// Number of periods when the container hit its throttling limit.
|
||||||
ThrottledPeriods uint64 `json:"throttled_periods,omitempty"`
|
ThrottledPeriods uint64 `json:"throttled_periods"`
|
||||||
// Aggregate time the container was throttled for in nanoseconds.
|
// Aggregate time the container was throttled for in nanoseconds.
|
||||||
ThrottledTime uint64 `json:"throttled_time,omitempty"`
|
ThrottledTime uint64 `json:"throttled_time"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// All CPU stats are aggregated since container inception.
|
// All CPU stats are aggregated since container inception.
|
||||||
type CpuUsage struct {
|
type CpuUsage struct {
|
||||||
// Total CPU time consumed.
|
// Total CPU time consumed.
|
||||||
// Units: nanoseconds.
|
// Units: nanoseconds.
|
||||||
TotalUsage uint64 `json:"total_usage,omitempty"`
|
TotalUsage uint64 `json:"total_usage"`
|
||||||
// Total CPU time consumed per core.
|
// Total CPU time consumed per core.
|
||||||
// Units: nanoseconds.
|
// Units: nanoseconds.
|
||||||
PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
|
PercpuUsage []uint64 `json:"percpu_usage"`
|
||||||
// Time spent by tasks of the cgroup in kernel mode.
|
// Time spent by tasks of the cgroup in kernel mode.
|
||||||
// Units: nanoseconds.
|
// Units: nanoseconds.
|
||||||
UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
|
UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
|
||||||
|
@ -30,41 +30,41 @@ type CpuUsage struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type CpuStats struct {
|
type CpuStats struct {
|
||||||
CpuUsage CpuUsage `json:"cpu_usage,omitempty"`
|
CpuUsage CpuUsage `json:"cpu_usage"`
|
||||||
SystemUsage uint64 `json:"system_cpu_usage"`
|
SystemUsage uint64 `json:"system_cpu_usage"`
|
||||||
ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
|
ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type MemoryStats struct {
|
type MemoryStats struct {
|
||||||
// current res_counter usage for memory
|
// current res_counter usage for memory
|
||||||
Usage uint64 `json:"usage,omitempty"`
|
Usage uint64 `json:"usage"`
|
||||||
// maximum usage ever recorded.
|
// maximum usage ever recorded.
|
||||||
MaxUsage uint64 `json:"max_usage,omitempty"`
|
MaxUsage uint64 `json:"max_usage"`
|
||||||
// TODO(vishh): Export these as stronger types.
|
// TODO(vishh): Export these as stronger types.
|
||||||
// all the stats exported via memory.stat.
|
// all the stats exported via memory.stat.
|
||||||
Stats map[string]uint64 `json:"stats,omitempty"`
|
Stats map[string]uint64 `json:"stats"`
|
||||||
// number of times memory usage hits limits.
|
// number of times memory usage hits limits.
|
||||||
Failcnt uint64 `json:"failcnt"`
|
Failcnt uint64 `json:"failcnt"`
|
||||||
Limit uint64 `json:"limit"`
|
Limit uint64 `json:"limit"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type BlkioStatEntry struct {
|
type BlkioStatEntry struct {
|
||||||
Major uint64 `json:"major,omitempty"`
|
Major uint64 `json:"major"`
|
||||||
Minor uint64 `json:"minor,omitempty"`
|
Minor uint64 `json:"minor"`
|
||||||
Op string `json:"op,omitempty"`
|
Op string `json:"op"`
|
||||||
Value uint64 `json:"value,omitempty"`
|
Value uint64 `json:"value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type BlkioStats struct {
|
type BlkioStats struct {
|
||||||
// number of bytes tranferred to and from the block device
|
// number of bytes tranferred to and from the block device
|
||||||
IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive,omitempty"`
|
IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive"`
|
||||||
IoServicedRecursive []BlkioStatEntry `json:"io_serviced_recursive,omitempty"`
|
IoServicedRecursive []BlkioStatEntry `json:"io_serviced_recursive"`
|
||||||
IoQueuedRecursive []BlkioStatEntry `json:"io_queue_recursive,omitempty"`
|
IoQueuedRecursive []BlkioStatEntry `json:"io_queue_recursive"`
|
||||||
IoServiceTimeRecursive []BlkioStatEntry `json:"io_service_time_recursive,omitempty"`
|
IoServiceTimeRecursive []BlkioStatEntry `json:"io_service_time_recursive"`
|
||||||
IoWaitTimeRecursive []BlkioStatEntry `json:"io_wait_time_recursive,omitempty"`
|
IoWaitTimeRecursive []BlkioStatEntry `json:"io_wait_time_recursive"`
|
||||||
IoMergedRecursive []BlkioStatEntry `json:"io_merged_recursive,omitempty"`
|
IoMergedRecursive []BlkioStatEntry `json:"io_merged_recursive"`
|
||||||
IoTimeRecursive []BlkioStatEntry `json:"io_time_recursive,omitempty"`
|
IoTimeRecursive []BlkioStatEntry `json:"io_time_recursive"`
|
||||||
SectorsRecursive []BlkioStatEntry `json:"sectors_recursive,omitempty"`
|
SectorsRecursive []BlkioStatEntry `json:"sectors_recursive"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Network struct {
|
type Network struct {
|
||||||
|
|
Loading…
Reference in New Issue