diff --git a/receiver/dockerstatsreceiver/documentation.md b/receiver/dockerstatsreceiver/documentation.md index 2a548ce1eb08..3840f9f6a072 100644 --- a/receiver/dockerstatsreceiver/documentation.md +++ b/receiver/dockerstatsreceiver/documentation.md @@ -306,7 +306,7 @@ This metric is only reported if the container has limits set with -cpus, -cpuset | ---- | ----------- | ---------- | | {cpus} | Gauge | Double | -### container.cpu.logical_count +### container.cpu.logical.count Number of cores available to the container. diff --git a/receiver/dockerstatsreceiver/internal/metadata/generated_config.go b/receiver/dockerstatsreceiver/internal/metadata/generated_config.go index 0f5d7c39d5a9..94ce4b4db8bc 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/generated_config.go +++ b/receiver/dockerstatsreceiver/internal/metadata/generated_config.go @@ -34,7 +34,7 @@ type MetricsConfig struct { ContainerBlockioIoWaitTimeRecursive MetricConfig `mapstructure:"container.blockio.io_wait_time_recursive"` ContainerBlockioSectorsRecursive MetricConfig `mapstructure:"container.blockio.sectors_recursive"` ContainerCPULimit MetricConfig `mapstructure:"container.cpu.limit"` - ContainerCPULogicalCount MetricConfig `mapstructure:"container.cpu.logical_count"` + ContainerCPULogicalCount MetricConfig `mapstructure:"container.cpu.logical.count"` ContainerCPUShares MetricConfig `mapstructure:"container.cpu.shares"` ContainerCPUThrottlingDataPeriods MetricConfig `mapstructure:"container.cpu.throttling_data.periods"` ContainerCPUThrottlingDataThrottledPeriods MetricConfig `mapstructure:"container.cpu.throttling_data.throttled_periods"` diff --git a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go index cd0841f6ca23..547d5410715a 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics.go @@ -507,9 +507,9 @@ type metricContainerCPULogicalCount struct { capacity int // max observed number of data points added to the metric. } -// init fills container.cpu.logical_count metric with initial data. +// init fills container.cpu.logical.count metric with initial data. func (m *metricContainerCPULogicalCount) init() { - m.data.SetName("container.cpu.logical_count") + m.data.SetName("container.cpu.logical.count") m.data.SetDescription("Number of cores available to the container.") m.data.SetUnit("{cpus}") m.data.SetEmptyGauge() @@ -4037,7 +4037,7 @@ func (mb *MetricsBuilder) RecordContainerCPULimitDataPoint(ts pcommon.Timestamp, mb.metricContainerCPULimit.recordDataPoint(mb.startTime, ts, val) } -// RecordContainerCPULogicalCountDataPoint adds a data point to container.cpu.logical_count metric. +// RecordContainerCPULogicalCountDataPoint adds a data point to container.cpu.logical.count metric. func (mb *MetricsBuilder) RecordContainerCPULogicalCountDataPoint(ts pcommon.Timestamp, val int64) { mb.metricContainerCPULogicalCount.recordDataPoint(mb.startTime, ts, val) } diff --git a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go index e0e57157b7fc..addd9e9bdb11 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/dockerstatsreceiver/internal/metadata/generated_metrics_test.go @@ -508,9 +508,9 @@ func TestMetricsBuilder(t *testing.T) { assert.Equal(t, ts, dp.Timestamp()) assert.Equal(t, pmetric.NumberDataPointValueTypeDouble, dp.ValueType()) assert.Equal(t, float64(1), dp.DoubleValue()) - case "container.cpu.logical_count": - assert.False(t, validatedMetrics["container.cpu.logical_count"], "Found a duplicate in the metrics slice: container.cpu.logical_count") - validatedMetrics["container.cpu.logical_count"] = true + case "container.cpu.logical.count": + assert.False(t, validatedMetrics["container.cpu.logical.count"], "Found a duplicate in the metrics slice: container.cpu.logical.count") + validatedMetrics["container.cpu.logical.count"] = true assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type()) assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len()) assert.Equal(t, "Number of cores available to the container.", ms.At(i).Description()) diff --git a/receiver/dockerstatsreceiver/internal/metadata/testdata/config.yaml b/receiver/dockerstatsreceiver/internal/metadata/testdata/config.yaml index bdb0e1d06720..1c5dc2133db9 100644 --- a/receiver/dockerstatsreceiver/internal/metadata/testdata/config.yaml +++ b/receiver/dockerstatsreceiver/internal/metadata/testdata/config.yaml @@ -19,7 +19,7 @@ all_set: enabled: true container.cpu.limit: enabled: true - container.cpu.logical_count: + container.cpu.logical.count: enabled: true container.cpu.shares: enabled: true @@ -178,7 +178,7 @@ none_set: enabled: false container.cpu.limit: enabled: false - container.cpu.logical_count: + container.cpu.logical.count: enabled: false container.cpu.shares: enabled: false diff --git a/receiver/dockerstatsreceiver/metadata.yaml b/receiver/dockerstatsreceiver/metadata.yaml index 67afb8673bc6..38ecbaa628cc 100644 --- a/receiver/dockerstatsreceiver/metadata.yaml +++ b/receiver/dockerstatsreceiver/metadata.yaml @@ -151,7 +151,7 @@ metrics: unit: "1" gauge: value_type: int - container.cpu.logical_count: + container.cpu.logical.count: enabled: false description: "Number of cores available to the container." unit: "{cpus}" diff --git a/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml index ed8b11ae67fa..0692645fe3bd 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/cgroups_v2/expected_metrics.yaml @@ -58,7 +58,7 @@ resourceMetrics: - asInt: 2 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/cpu_limit/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/cpu_limit/expected_metrics.yaml index c8993cc60740..b546a2e2df85 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/cpu_limit/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/cpu_limit/expected_metrics.yaml @@ -118,7 +118,7 @@ resourceMetrics: - asInt: 2 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml index 2d2b2012b861..77ae12c06cca 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/no_pids_stats/expected_metrics.yaml @@ -201,7 +201,7 @@ resourceMetrics: - asInt: 8 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml index a49f19f1a981..efbaf5ff0508 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/pids_stats_max/expected_metrics.yaml @@ -110,7 +110,7 @@ resourceMetrics: - asInt: 2 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml index bc63e4adefd5..f4b4fe5ecf36 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/single_container/expected_metrics.yaml @@ -207,7 +207,7 @@ resourceMetrics: - asInt: 8 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml index 3c53049c89fd..634773c41d6a 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/single_container_with_optional_resource_attributes/expected_metrics.yaml @@ -207,7 +207,7 @@ resourceMetrics: - asInt: 8 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: diff --git a/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml b/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml index 833c36139edc..759dda74e978 100644 --- a/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml +++ b/receiver/dockerstatsreceiver/testdata/mock/two_containers/expected_metrics.yaml @@ -201,7 +201,7 @@ resourceMetrics: - asInt: 1 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: @@ -986,7 +986,7 @@ resourceMetrics: - asInt: 1 startTimeUnixNano: "1687762436124732000" timeUnixNano: "1687762436137493000" - name: container.cpu.logical_count + name: container.cpu.logical.count unit: "{cpus}" - description: CPU shares set for the container. gauge: