Skip to content

Fix #660: Add the rate metric type #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 2, 2021
+70 −8
Merged

Fix #660: Add the rate metric type #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fc25d5
Fix #660: Add the rate metric type
mdboom Mar 1, 2021
a84fea3
Fix validation tests
mdboom Mar 1, 2021
65f92b5
Add minimum
mdboom Mar 1, 2021
6381566
Update labeled_rate
mdboom Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions schemas/glean/glean/glean.1.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,22 @@
"labeled_rate": {
"additionalProperties": {
"additionalProperties": {
"type": "integer"
"additionalProperties": false,
"properties": {
"denominator": {
"minimum": 0,
"type": "integer"
},
"numerator": {
"minimum": 0,
"type": "integer"
}
},
"required": [
"numerator",
"denominator"
],
"type": "object"
},
"propertyNames": {
"comment": "This must be at least the length of 'category.name' metric names to support error reporting",
Expand Down Expand Up @@ -565,7 +580,22 @@
},
"rate": {
"additionalProperties": {
"type": "integer"
"additionalProperties": false,
"properties": {
"denominator": {
"minimum": 0,
"type": "integer"
},
"numerator": {
"minimum": 0,
"type": "integer"
}
},
"required": [
"numerator",
"denominator"
],
"type": "object"
},
"propertyNames": {
"maxLength": 61,
Expand Down
2 changes: 2 additions & 0 deletions templates/include/glean/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@

- Pull client_info definitions from the glean source code (see:
`scripts/extract_glean_client_info_descriptions`)

- The `rate` metric type is an object with a `numerator` and `denominator`.
17 changes: 16 additions & 1 deletion templates/include/glean/rate.1.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
{
"type": "integer"
"type": "object",
"properties": {
"numerator": {
"type": "integer",
"minimum": 0
},
"denominator": {
"type": "integer",
"minimum": 0
}
},
"required": [
"numerator",
"denominator"
],
"additionalProperties": false
}
15 changes: 12 additions & 3 deletions validation/glean/glean.1.baseline.pass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,21 @@
}
},
"rate": {
"examples.rate_example": 23
"examples.rate_example": {
"numerator": 2,
"denominator": 3
}
},
"labeled_rate": {
"examples.labeled_rate_example": {
"a": 12,
"b": 8
"a": {
"numerator": 1,
"denominator": 2
},
"b": {
"numerator": 1,
"denominator": 2
}
}
},
"uuid": {
Expand Down
5 changes: 4 additions & 1 deletion validation/glean/glean.1.invalid_use_counter.fail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@
"examples.usage_example": true
},
"rate": {
"examples.rate_example": 23
"examples.rate_example": {
"numerator": 2,
"denominator": 3
}
}
},
"events": [
Expand Down
5 changes: 4 additions & 1 deletion validation/glean/glean.1.metrics.pass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@
"examples.usage_example": true
},
"rate": {
"examples.rate_example": 23
"examples.rate_example": {
"numerator": 2,
"denominator": 3
}
}
},
"events": [
Expand Down