glean-parser 20.1.0__tar.gz → 20.2.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (153) hide show
  1. {glean_parser-20.1.0 → glean_parser-20.2.0}/PKG-INFO +1 -1
  2. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/metrics.py +18 -5
  3. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_parser.py +82 -0
  4. {glean_parser-20.1.0 → glean_parser-20.2.0}/.gitignore +0 -0
  5. {glean_parser-20.1.0 → glean_parser-20.2.0}/AUTHORS.md +0 -0
  6. {glean_parser-20.1.0 → glean_parser-20.2.0}/LICENSE +0 -0
  7. {glean_parser-20.1.0 → glean_parser-20.2.0}/README.md +0 -0
  8. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/__init__.py +0 -0
  9. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/__main__.py +0 -0
  10. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/data_review.py +0 -0
  11. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/go_server.py +0 -0
  12. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/javascript.py +0 -0
  13. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/javascript_server.py +0 -0
  14. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/kotlin.py +0 -0
  15. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/lint.py +0 -0
  16. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/markdown.py +0 -0
  17. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/parser.py +0 -0
  18. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/pings.py +0 -0
  19. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/python_server.py +0 -0
  20. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/ruby_server.py +0 -0
  21. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/rust.py +0 -0
  22. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/rust_server.py +0 -0
  23. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/rust_sym.py +0 -0
  24. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/schemas/metrics.1-0-0.schema.yaml +0 -0
  25. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/schemas/metrics.2-0-0.schema.yaml +0 -0
  26. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/schemas/pings.1-0-0.schema.yaml +0 -0
  27. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/schemas/pings.2-0-0.schema.yaml +0 -0
  28. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/schemas/tags.1-0-0.schema.yaml +0 -0
  29. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/swift.py +0 -0
  30. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/tags.py +0 -0
  31. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/data_review.jinja2 +0 -0
  32. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/go_server.jinja2 +0 -0
  33. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/javascript.buildinfo.jinja2 +0 -0
  34. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/javascript.jinja2 +0 -0
  35. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/javascript_server.jinja2 +0 -0
  36. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/kotlin.buildinfo.jinja2 +0 -0
  37. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/kotlin.jinja2 +0 -0
  38. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/markdown.jinja2 +0 -0
  39. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/python_server.jinja2 +0 -0
  40. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/qmldir.jinja2 +0 -0
  41. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/ruby_server.jinja2 +0 -0
  42. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/rust.jinja2 +0 -0
  43. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/rust_server.jinja2 +0 -0
  44. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/rust_sym.jinja2 +0 -0
  45. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/templates/swift.jinja2 +0 -0
  46. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/translate.py +0 -0
  47. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/translation_options.py +0 -0
  48. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/util.py +0 -0
  49. {glean_parser-20.1.0 → glean_parser-20.2.0}/glean_parser/validate_ping.py +0 -0
  50. {glean_parser-20.1.0 → glean_parser-20.2.0}/pyproject.toml +0 -0
  51. {glean_parser-20.1.0 → glean_parser-20.2.0}/server_telemetry/sdk-metrics-compat.yaml +0 -0
  52. {glean_parser-20.1.0 → glean_parser-20.2.0}/server_telemetry/server-side-pings.yaml +0 -0
  53. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/conftest.py +0 -0
  54. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/all_metrics.yaml +0 -0
  55. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/all_pings.yaml +0 -0
  56. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/attribution.yaml +0 -0
  57. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/bad_attribution.yamlx +0 -0
  58. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/bad_ping.yamlx +0 -0
  59. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/core.yaml +0 -0
  60. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/custom_ping_no_event_metrics.yaml +0 -0
  61. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/custom_ping_no_event_pings.yaml +0 -0
  62. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/dual_labeled.yaml +0 -0
  63. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/dual_labeled_invalid.yaml +0 -0
  64. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/duplicate_labeled.yaml +0 -0
  65. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/duplicate_send_in_ping.yaml +0 -0
  66. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/empty.yaml +0 -0
  67. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/event_key_ordering.yaml +0 -0
  68. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/events_data_sensitivity.yaml +0 -0
  69. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/events_with_types.yaml +0 -0
  70. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/fxa-server-metrics.yaml +0 -0
  71. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/fxa-server-pings.yaml +0 -0
  72. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_custom_ping_only_metrics.yaml +0 -0
  73. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_custom_ping_only_pings.yaml +0 -0
  74. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_events_and_custom_ping_metrics.yaml +0 -0
  75. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_events_and_custom_ping_pings.yaml +0 -0
  76. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_events_only_metrics.yaml +0 -0
  77. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_labeled_boolean_metrics.yaml +0 -0
  78. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/go_server_metrics_unsupported.yaml +0 -0
  79. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/invalid-ping-names.yaml +0 -0
  80. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/invalid.yamlx +0 -0
  81. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/jwe.yaml +0 -0
  82. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/metric-with-tags.yaml +0 -0
  83. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/mixed-expirations.yaml +0 -0
  84. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/name_too_similar.yaml +0 -0
  85. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/object.yaml +0 -0
  86. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/old_event_api.yamlx +0 -0
  87. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/ordering.yaml +0 -0
  88. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/pings.yaml +0 -0
  89. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/python_server_metrics_unsupported.yaml +0 -0
  90. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rate.yaml +0 -0
  91. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/redefined_category.yamlx +0 -0
  92. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/redefined_metric.yamlx +0 -0
  93. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/redefined_ping.yamlx +0 -0
  94. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/reserved_categories.yamlx +0 -0
  95. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/ruby_server_metrics_unsupported.yaml +0 -0
  96. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/ruby_server_pings_unsupported.yaml +0 -0
  97. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_custom_ping_only_metrics.yaml +0 -0
  98. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_custom_ping_only_pings.yaml +0 -0
  99. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_events_and_custom_ping_metrics.yaml +0 -0
  100. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_events_and_custom_ping_pings.yaml +0 -0
  101. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_events_only_metrics.yaml +0 -0
  102. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/rust_server_metrics_unsupported.yaml +0 -0
  103. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/same_name_different_category.yaml +0 -0
  104. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/schema-violation.yaml +0 -0
  105. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/send_if_empty_with_metrics.yaml +0 -0
  106. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_custom_ping_only_compare.go +0 -0
  107. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_custom_ping_only_compare.rs +0 -0
  108. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_events_and_custom_ping_compare.go +0 -0
  109. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_events_and_custom_ping_compare.rs +0 -0
  110. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_events_compare.rb +0 -0
  111. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_events_only_compare.go +0 -0
  112. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_events_only_compare.rs +0 -0
  113. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_metrics_no_events_no_pings.yaml +0 -0
  114. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_metrics_with_event.yaml +0 -0
  115. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/server_pings.yaml +0 -0
  116. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/single_labeled.yaml +0 -0
  117. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/smaller.yaml +0 -0
  118. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/tags.yaml +0 -0
  119. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/telemetry_mirror.yaml +0 -0
  120. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/text.yaml +0 -0
  121. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/text_invalid.yaml +0 -0
  122. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/unknown_ping_used.yaml +0 -0
  123. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/wrong_key.yamlx +0 -0
  124. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/data/yaml_nits.yamlx +0 -0
  125. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/detekt.yml +0 -0
  126. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-go/test.go.tmpl +0 -0
  127. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-go/test_publisher.go.tmpl +0 -0
  128. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-js/package.json +0 -0
  129. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-js/test.js.tmpl +0 -0
  130. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-py/test.py +0 -0
  131. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-rb/test.rb.tmpl +0 -0
  132. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test-rs/test.rs.tmpl +0 -0
  133. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_cli.py +0 -0
  134. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_go_server.py +0 -0
  135. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_go_server_pubsub.py +0 -0
  136. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_javascript.py +0 -0
  137. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_javascript_server.py +0 -0
  138. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_kotlin.py +0 -0
  139. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_lint.py +0 -0
  140. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_markdown.py +0 -0
  141. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_metrics.py +0 -0
  142. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_pings.py +0 -0
  143. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_python_server.py +0 -0
  144. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_ruby_server.py +0 -0
  145. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_rust.py +0 -0
  146. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_rust_server.py +0 -0
  147. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_rust_sym.py +0 -0
  148. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_swift.py +0 -0
  149. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_tags.py +0 -0
  150. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_translate.py +0 -0
  151. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_utils.py +0 -0
  152. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/test_validate_ping.py +0 -0
  153. {glean_parser-20.1.0 → glean_parser-20.2.0}/tests/util.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: glean-parser
3
- Version: 20.1.0
3
+ Version: 20.2.0
4
4
  Summary: Parser tools for Mozilla's Glean telemetry
5
5
  Project-URL: Homepage, https://mozilla.github.io/glean
6
6
  Project-URL: Repository, https://github.com/mozilla/glean_parser
@@ -165,7 +165,9 @@ class Metric:
165
165
  **metric_info,
166
166
  )
167
167
 
168
- def serialize(self) -> Dict[str, util.JSONType]:
168
+ def serialize(
169
+ self, rename_fields: Optional[Dict[str, str]] = None
170
+ ) -> Dict[str, util.JSONType]:
169
171
  """
170
172
  Serialize the metric back to JSON object model.
171
173
  """
@@ -178,6 +180,13 @@ class Metric:
178
180
  d[key] = sorted(list(val))
179
181
  if isinstance(val, list) and len(val) and isinstance(val[0], enum.Enum):
180
182
  d[key] = [x.name for x in val]
183
+
184
+ if rename_fields is not None:
185
+ for key, val in rename_fields.items():
186
+ if key in d:
187
+ d[val] = d[key]
188
+ del d[key]
189
+
181
190
  del d["name"]
182
191
  del d["category"]
183
192
  if not d["unit"]:
@@ -399,11 +408,13 @@ class Labeled(Metric):
399
408
  self.labels = None
400
409
  super().__init__(*args, **kwargs)
401
410
 
402
- def serialize(self) -> Dict[str, util.JSONType]:
411
+ def serialize(
412
+ self, rename_fields: Optional[Dict[str, str]] = None
413
+ ) -> Dict[str, util.JSONType]:
403
414
  """
404
415
  Serialize the metric back to JSON object model.
405
416
  """
406
- d = super().serialize()
417
+ d = super().serialize(rename_fields=rename_fields)
407
418
  d["labels"] = self.ordered_labels
408
419
  del d["ordered_labels"]
409
420
  return d
@@ -604,11 +615,13 @@ class DualLabeledCounter(Metric):
604
615
  self.categories = None
605
616
  super().__init__(*args, **kwargs)
606
617
 
607
- def serialize(self) -> Dict[str, util.JSONType]:
618
+ def serialize(
619
+ self, rename_fields: Optional[Dict[str, str]] = None
620
+ ) -> Dict[str, util.JSONType]:
608
621
  """
609
622
  Serialize the metric back to JSON object model.
610
623
  """
611
- d = super().serialize()
624
+ d = super().serialize(rename_fields=rename_fields)
612
625
  d["keys"] = self.ordered_keys
613
626
  d["categories"] = self.ordered_categories
614
627
  del d["ordered_keys"]
@@ -1136,6 +1136,88 @@ def test_no_lint_sorted():
1136
1136
  assert all_objects.value["tags"]["tag"].no_lint == ["lint1", "lint2"]
1137
1137
 
1138
1138
 
1139
+ def test_allow_renaming_of_fields():
1140
+ results = parser.parse_objects(
1141
+ [
1142
+ util.add_required(
1143
+ {
1144
+ "category": {
1145
+ "metric": {
1146
+ "type": "object",
1147
+ "structure": {
1148
+ "type": "array",
1149
+ "items": {
1150
+ "type": "object",
1151
+ "properties": {
1152
+ "prop_a": {
1153
+ "type": "string",
1154
+ },
1155
+ "prop_b": {
1156
+ "type": "boolean",
1157
+ },
1158
+ },
1159
+ },
1160
+ },
1161
+ },
1162
+ },
1163
+ }
1164
+ ),
1165
+ ]
1166
+ )
1167
+ errs = list(results)
1168
+ assert len(errs) == 0
1169
+
1170
+ metrics = {
1171
+ metric.identifier(): metric.serialize(
1172
+ rename_fields={"_generate_structure": "structure"}
1173
+ )
1174
+ for category, probes in results.value.items()
1175
+ for probe_name, metric in probes.items()
1176
+ }
1177
+
1178
+ expected = {
1179
+ "category.metric": {
1180
+ "bugs": ["http://bugzilla.mozilla.org/12345678"],
1181
+ "data_reviews": ["https://example.com/review/"],
1182
+ "defined_in": {"line": 3},
1183
+ "description": "DESCRIPTION...",
1184
+ "disabled": False,
1185
+ "expires": "never",
1186
+ "gecko_datapoint": "",
1187
+ "in_session": False,
1188
+ "lifetime": "ping",
1189
+ "metadata": {},
1190
+ "no_lint": [],
1191
+ "notification_emails": ["nobody@example.com"],
1192
+ "send_in_pings": ["metrics"],
1193
+ "type": "object",
1194
+ "version": 0,
1195
+ "structure": {
1196
+ "type": "array",
1197
+ "items": {
1198
+ "type": "object",
1199
+ "properties": {
1200
+ "prop_a": {
1201
+ "type": "string",
1202
+ },
1203
+ "prop_b": {
1204
+ "type": "boolean",
1205
+ },
1206
+ },
1207
+ },
1208
+ },
1209
+ },
1210
+ }
1211
+ expected_json = json.dumps(expected, sort_keys=True, indent=2)
1212
+
1213
+ out_json = json.dumps(
1214
+ metrics,
1215
+ sort_keys=True,
1216
+ indent=2,
1217
+ )
1218
+ assert expected_json == out_json
1219
+
1220
+
1139
1221
  def test_no_internal_fields_exposed():
1140
1222
  """
1141
1223
  We accidentally exposed fields like `_config` and `_generate_enums` before.
File without changes
File without changes
File without changes
File without changes