[receiver/postgresql] Fix unit field in metadata.yaml

open-telemetry · Dec 1, 2021 · 1ea5733 · 1ea5733
1 parent 4f24c27
commit 1ea5733
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/receiver/postgresqlreceiver/documentation.md b/receiver/postgresqlreceiver/documentation.md
@@ -8,13 +8,13 @@ These are the metrics available for this scraper.
 
 | Name | Description | Unit | Type | Attributes |
 | ---- | ----------- | ---- | ---- | ---------- |
-| postgresql.backends | The number of backends. |  | Sum | <ul> <li>database</li> </ul> |
-| postgresql.blocks_read | The number of blocks read. |  | Sum | <ul> <li>database</li> <li>table</li> <li>source</li> </ul> |
-| postgresql.commits | The number of commits. |  | Sum | <ul> <li>database</li> </ul> |
-| postgresql.db_size | The database disk usage. |  | Sum | <ul> <li>database</li> </ul> |
-| postgresql.operations | The number of db row operations. |  | Sum | <ul> <li>database</li> <li>table</li> <li>operation</li> </ul> |
-| postgresql.rollbacks | The number of rollbacks. |  | Sum | <ul> <li>database</li> </ul> |
-| postgresql.rows | The number of rows in the database. |  | Sum | <ul> <li>database</li> <li>table</li> <li>state</li> </ul> |
+| postgresql.backends | The number of backends. | 1 | Sum | <ul> <li>database</li> </ul> |
+| postgresql.blocks_read | The number of blocks read. | 1 | Sum | <ul> <li>database</li> <li>table</li> <li>source</li> </ul> |
+| postgresql.commits | The number of commits. | 1 | Sum | <ul> <li>database</li> </ul> |
+| postgresql.db_size | The database disk usage. | By | Sum | <ul> <li>database</li> </ul> |
+| postgresql.operations | The number of db row operations. | 1 | Sum | <ul> <li>database</li> <li>table</li> <li>operation</li> </ul> |
+| postgresql.rollbacks | The number of rollbacks. | 1 | Sum | <ul> <li>database</li> </ul> |
+| postgresql.rows | The number of rows in the database. | 1 | Sum | <ul> <li>database</li> <li>table</li> <li>state</li> </ul> |
 
 ## Attributes
 

diff --git a/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go b/receiver/postgresqlreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/postgresqlreceiver/metadata.yaml b/receiver/postgresqlreceiver/metadata.yaml
@@ -19,49 +19,49 @@ attributes:
 metrics:
   postgresql.blocks_read:
     description: The number of blocks read.
-    units: 1
+    unit: 1
     sum:
       monotonic: true
       aggregation: cumulative
     attributes: [ database, table, source ]
   postgresql.commits:
     description: The number of commits.
-    units: 1
+    unit: 1
     sum:
       monotonic: true
       aggregation: cumulative
     attributes: [ database ]
   postgresql.db_size:
     description: The database disk usage.
-    units: By
+    unit: By
     sum:
       monotonic: false
       aggregation: cumulative
     attributes: [ database ]
   postgresql.backends:
     description: The number of backends.
-    units: 1
+    unit: 1
     sum:
       monotonic: false
       aggregation: cumulative
     attributes: [ database ]
   postgresql.rows:
     description: The number of rows in the database.
-    units: 1
+    unit: 1
     sum:
       monotonic: false
       aggregation: cumulative
     attributes: [ database, table, state ]
   postgresql.operations:
     description: The number of db row operations.
-    units: 1
+    unit: 1
     sum:
       monotonic: true
       aggregation: cumulative
     attributes: [ database, table, operation ]
   postgresql.rollbacks:
     description: The number of rollbacks.
-    units: 1
+    unit: 1
     sum:
       monotonic: true
       aggregation: cumulative

diff --git a/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.json b/receiver/postgresqlreceiver/testdata/scraper/multiple/expected.json
@@ -10,6 +10,7 @@
                   {
                      "description": "The number of blocks read.",
                      "name": "postgresql.blocks_read",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -1172,6 +1173,7 @@
                   {
                      "description": "The number of commits.",
                      "name": "postgresql.commits",
+                     "unit":  "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -1218,6 +1220,7 @@
                   {
                      "description": "The database disk usage.",
                      "name": "postgresql.db_size",
+                     "unit":  "By",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -1263,6 +1266,7 @@
                   {
                      "description": "The number of backends.",
                      "name": "postgresql.backends",
+                     "unit":  "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -1308,6 +1312,7 @@
                   {
                      "description": "The number of rows in the database.",
                      "name": "postgresql.rows",
+                     "unit":  "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -1605,6 +1610,7 @@
                   {
                      "description": "The number of db row operations.",
                      "name": "postgresql.operations",
+                     "unit":  "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -2191,6 +2197,7 @@
                   {
                      "description": "The number of rollbacks.",
                      "name": "postgresql.rollbacks",
+                     "unit":  "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [

diff --git a/receiver/postgresqlreceiver/testdata/scraper/otel/expected.json b/receiver/postgresqlreceiver/testdata/scraper/otel/expected.json
@@ -10,6 +10,7 @@
                   {
                      "description": "The number of blocks read.",
                      "name": "postgresql.blocks_read",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -404,6 +405,7 @@
                   {
                      "description": "The number of commits.",
                      "name": "postgresql.commits",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -426,6 +428,7 @@
                   {
                      "description": "The database disk usage.",
                      "name": "postgresql.db_size",
+                     "unit": "By",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -447,6 +450,7 @@
                   {
                      "description": "The number of backends.",
                      "name": "postgresql.backends",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -468,6 +472,7 @@
                   {
                      "description": "The number of rows in the database.",
                      "name": "postgresql.rows",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -573,6 +578,7 @@
                   {
                      "description": "The number of db row operations.",
                      "name": "postgresql.operations",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [
@@ -775,6 +781,7 @@
                   {
                      "description": "The number of rollbacks.",
                      "name": "postgresql.rollbacks",
+                     "unit": "1",
                      "sum": {
                         "aggregationTemporality": "AGGREGATION_TEMPORALITY_CUMULATIVE",
                         "dataPoints": [