[receiver/podman] use unqualified names for metric attributes

tosuke-lab · Jul 6, 2024 · 8804082 · 8804082
1 parent 759af84
commit 8804082
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 71 deletions.
diff --git a/receiver/podmanreceiver/documentation.md b/receiver/podmanreceiver/documentation.md
@@ -52,7 +52,7 @@ Total CPU time consumed by the container since its creation.
 
 | Name | Description | Values |
 | ---- | ----------- | ------ |
-| container.cpu.state | The CPU state for the data point. | Str: ``user``, ``system`` |
+| state | The CPU state for the data point. | Str: ``user``, ``system`` |
 
 ### container.cpu.usage.percpu
 
@@ -128,7 +128,7 @@ Network bytes for the container.
 
 | Name | Description | Values |
 | ---- | ----------- | ------ |
-| network.io.direction | The network IO operation direction. | Str: ``transmit``, ``receive`` |
+| direction | The direction data is moving. | Str: ``transmit``, ``receive`` |
 
 ### container.network.io.usage.rx_bytes
 

diff --git a/receiver/podmanreceiver/internal/metadata/generated_metrics.go b/receiver/podmanreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/podmanreceiver/internal/metadata/generated_metrics_test.go b/receiver/podmanreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/podmanreceiver/metadata.yaml b/receiver/podmanreceiver/metadata.yaml
@@ -32,12 +32,12 @@ attributes:
   core:
     description: "The CPU core number when utilising per-CPU metrics."
     type: string
-  container.cpu.state:
+  state:
     description: "The CPU state for the data point."
     type: string
     enum: [user, system]
-  network.io.direction:
-    description: "The network IO operation direction."
+  direction:
+    description: "The direction data is moving."
     type: string
     enum: [transmit, receive]
 
@@ -52,7 +52,7 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     attributes:
-      - container.cpu.state
+      - state
   container.cpu.usage.system:
     enabled: true
     description: "System CPU usage."
@@ -126,7 +126,7 @@ metrics:
       monotonic: true
       aggregation_temporality: cumulative
     attributes:
-      - network.io.direction
+      - direction
   container.network.io.usage.rx_bytes:
     enabled: true
     description: "Bytes received by the container."

diff --git a/receiver/podmanreceiver/receiver.go b/receiver/podmanreceiver/receiver.go
@@ -160,18 +160,18 @@ func (r *metricsReceiver) recordCPUMetrics(now pcommon.Timestamp, stats *contain
 
 	r.mb.RecordContainerCPUTimeDataPoint(now,
 		toSecondsWithNanosecondPrecisionF(stats.CPUNano-stats.CPUSystemNano),
-		metadata.AttributeContainerCPUStateUser)
+		metadata.AttributeStateUser)
 	r.mb.RecordContainerCPUTimeDataPoint(now,
 		toSecondsWithNanosecondPrecisionF(stats.CPUSystemNano),
-		metadata.AttributeContainerCPUStateSystem)
+		metadata.AttributeStateSystem)
 }
 
 func (r *metricsReceiver) recordNetworkMetrics(now pcommon.Timestamp, stats *containerStats) {
 	r.mb.RecordContainerNetworkIoUsageRxBytesDataPoint(now, int64(stats.NetInput))
 	r.mb.RecordContainerNetworkIoUsageTxBytesDataPoint(now, int64(stats.NetOutput))
 
-	r.mb.RecordContainerNetworkIoDataPoint(now, int64(stats.NetOutput), metadata.AttributeNetworkIoDirectionTransmit)
-	r.mb.RecordContainerNetworkIoDataPoint(now, int64(stats.NetInput), metadata.AttributeNetworkIoDirectionReceive)
+	r.mb.RecordContainerNetworkIoDataPoint(now, int64(stats.NetOutput), metadata.AttributeDirectionTransmit)
+	r.mb.RecordContainerNetworkIoDataPoint(now, int64(stats.NetInput), metadata.AttributeDirectionReceive)
 }
 
 func (r *metricsReceiver) recordMemoryMetrics(now pcommon.Timestamp, stats *containerStats) {

diff --git a/receiver/podmanreceiver/record_metrics_test.go b/receiver/podmanreceiver/record_metrics_test.go
@@ -61,16 +61,12 @@ func assertStatsEqualToMetrics(t *testing.T, podmanStats *containerStats, md pme
 		case "container.network.io":
 			assertMetricEqual(t, m, pmetric.MetricTypeSum, []point{
 				{
-					intVal: podmanStats.NetOutput,
-					attributes: map[string]string{
-						"network.io.direction": metadata.AttributeNetworkIoDirectionTransmit.String(),
-					},
+					intVal:     podmanStats.NetOutput,
+					attributes: map[string]string{"direction": metadata.AttributeDirectionTransmit.String()},
 				},
 				{
-					intVal: podmanStats.NetInput,
-					attributes: map[string]string{
-						"network.io.direction": metadata.AttributeNetworkIoDirectionReceive.String(),
-					},
+					intVal:     podmanStats.NetInput,
+					attributes: map[string]string{"direction": metadata.AttributeDirectionReceive.String()},
 				},
 			})
 
@@ -94,18 +90,14 @@ func assertStatsEqualToMetrics(t *testing.T, podmanStats *containerStats, md pme
 		case "container.cpu.time":
 			assertMetricEqual(t, m, pmetric.MetricTypeSum, []point{
 				{
-					doubleVal: float64(podmanStats.CPUNano-podmanStats.CPUSystemNano) / 1e9,
-					epsilon:   1e-9,
-					attributes: map[string]string{
-						"container.cpu.state": metadata.AttributeContainerCPUStateUser.String(),
-					},
+					doubleVal:  float64(podmanStats.CPUNano-podmanStats.CPUSystemNano) / 1e9,
+					epsilon:    1e-9,
+					attributes: map[string]string{"state": metadata.AttributeStateUser.String()},
 				},
 				{
-					doubleVal: float64(podmanStats.CPUSystemNano) / 1e9,
-					epsilon:   1e-9,
-					attributes: map[string]string{
-						"container.cpu.state": metadata.AttributeContainerCPUStateSystem.String(),
-					},
+					doubleVal:  float64(podmanStats.CPUSystemNano) / 1e9,
+					epsilon:    1e-9,
+					attributes: map[string]string{"state": metadata.AttributeStateSystem.String()},
 				},
 			})