Bug 1932210 - Add labeled_quantity glean metric type (#831)

mozilla-services · Nov 19, 2024 · 8648085 · 8648085 · dataops-ci-bot · Nov 19, 2024
1 parent 7eeb9eb
commit 8648085
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 0 deletions.
diff --git a/schemas/glean/glean/glean-min.1.schema.json b/schemas/glean/glean/glean-min.1.schema.json
@@ -247,6 +247,25 @@
           },
           "type": "object"
         },
+        "labeled_quantity": {
+          "additionalProperties": {
+            "additionalProperties": {
+              "type": "integer"
+            },
+            "propertyNames": {
+              "comment": "This must be at least the length of 'category.name' metric names to support error reporting",
+              "maxLength": 71,
+              "type": "string"
+            },
+            "type": "object"
+          },
+          "propertyNames": {
+            "maxLength": 111,
+            "pattern": "^[a-z_][a-z0-9_\\.]+$",
+            "type": "string"
+          },
+          "type": "object"
+        },
         "labeled_rate": {
           "additionalProperties": {
             "additionalProperties": {

diff --git a/schemas/glean/glean/glean.1.schema.json b/schemas/glean/glean/glean.1.schema.json
@@ -333,6 +333,25 @@
           },
           "type": "object"
         },
+        "labeled_quantity": {
+          "additionalProperties": {
+            "additionalProperties": {
+              "type": "integer"
+            },
+            "propertyNames": {
+              "comment": "This must be at least the length of 'category.name' metric names to support error reporting",
+              "maxLength": 71,
+              "type": "string"
+            },
+            "type": "object"
+          },
+          "propertyNames": {
+            "maxLength": 111,
+            "pattern": "^[a-z_][a-z0-9_\\.]+$",
+            "type": "string"
+          },
+          "type": "object"
+        },
         "labeled_rate": {
           "additionalProperties": {
             "additionalProperties": {

diff --git a/templates/include/glean/CHANGELOG.md b/templates/include/glean/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Version 1
 
+- New metric type `labeled_quantity` [Bug 1932210](https://bugzilla.mozilla.org/show_bug.cgi?id=1932210)
+
 - Increase maximum character limit for metric labels from 61 to 71 [Bug 1929078](https://bugzilla.mozilla.org/show_bug.cgi?id=1929078)
 
 - New metric types `labeled_{custom|memory|timing}_distribution` [bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947).

diff --git a/templates/include/glean/metrics.1.schema.json b/templates/include/glean/metrics.1.schema.json
@@ -42,6 +42,13 @@
         @GLEAN_BASE_OBJECT_1_JSON@,
       "additionalProperties": @GLEAN_QUANTITY_1_JSON@
     },
+    "labeled_quantity": {
+        @GLEAN_BASE_OBJECT_1_JSON@,
+      "additionalProperties": {
+        @GLEAN_LABELED_GROUP_1_JSON@,
+        "additionalProperties": @GLEAN_QUANTITY_1_JSON@
+      }
+    },
     "timespan": {
         @GLEAN_BASE_OBJECT_1_JSON@,
       "additionalProperties": @GLEAN_TIMESPAN_1_JSON@