glean-parser 14.1.2__tar.gz → 14.2.0__tar.gz

{glean_parser-14.1.2 → glean_parser-14.2.0}/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 14.2.0
+
+- New Metric Types: `labeled_{custom|memory|timing}_distribution` ([bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947))
+
+## 14.1.3
+
+- Fix Kotlin/Swift code generation for object metrics, now generating top-level typealiases where needed ([#722](https://github.com/mozilla/glean_parser/pull/722))
+
 ## 14.1.2
 
 - ping schedule: Gracefully handle missing ping ([#705](https://github.com/mozilla/glean_parser/pull/705))

{glean_parser-14.1.2/glean_parser.egg-info → glean_parser-14.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glean_parser
-Version: 14.1.2
+Version: 14.2.0
 Summary: Parser tools for Mozilla's Glean telemetry
 Home-page: https://github.com/mozilla/glean_parser
 Author: The Glean Team
@@ -79,6 +79,14 @@ $ glean_parser check < ping.json
 
 ## Unreleased
 
+## 14.2.0
+
+- New Metric Types: `labeled_{custom|memory|timing}_distribution` ([bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947))
+
+## 14.1.3
+
+- Fix Kotlin/Swift code generation for object metrics, now generating top-level typealiases where needed ([#722](https://github.com/mozilla/glean_parser/pull/722))
+
 ## 14.1.2
 
 - ping schedule: Gracefully handle missing ping ([#705](https://github.com/mozilla/glean_parser/pull/705))

{glean_parser-14.1.2 → glean_parser-14.2.0}/docs/history.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 14.2.0
+
+- New Metric Types: `labeled_{custom|memory|timing}_distribution` ([bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947))
+
+## 14.1.3
+
+- Fix Kotlin/Swift code generation for object metrics, now generating top-level typealiases where needed ([#722](https://github.com/mozilla/glean_parser/pull/722))
+
 ## 14.1.2
 
 - ping schedule: Gracefully handle missing ping ([#705](https://github.com/mozilla/glean_parser/pull/705))

{glean_parser-14.1.2 → glean_parser-14.2.0}/glean_parser/metrics.py

@@ -416,6 +416,15 @@ class LabeledString(Labeled, String):
 class LabeledCounter(Labeled, Counter):
     typename = "labeled_counter"
 
+class LabeledCustomDistribution(Labeled, CustomDistribution):
+    typename = "labeled_custom_distribution"
+
+class LabeledMemoryDistribution(Labeled, MemoryDistribution):
+    typename = "labeled_memory_distribution"
+
+class LabeledTimingDistribution(Labeled, TimingDistribution):
+    typename = "labeled_timing_distribution"
+
 
 class Rate(Metric):
     typename = "rate"

{glean_parser-14.1.2 → glean_parser-14.2.0}/glean_parser/schemas/metrics.2-0-0.schema.yaml

@@ -115,7 +115,9 @@ definitions:
               of the metric to be stored at a given set of labels. The labeled
               metric types include:
 
-                `labeled_boolean`, `labeled_string`, `labeled_counter`.
+                `labeled_boolean`, `labeled_string`, `labeled_counter`,
+                `labeled_custom_distribution`, `labeled_memory_distribution`,
+                `labeled_timing_distribution`.
 
             - `text`: Record long text data.
 
@@ -141,6 +143,9 @@ definitions:
           - labeled_boolean
           - labeled_string
           - labeled_counter
+          - labeled_custom_distribution
+          - labeled_memory_distribution
+          - labeled_timing_distribution
           - rate
           - text
           - object

{glean_parser-14.1.2 → glean_parser-14.2.0}/glean_parser/templates/kotlin.jinja2

@@ -121,6 +121,24 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
 
 {% endmacro %}
 
+{%- macro generate_structure_typealias(name, struct) %}
+{%- if struct.type == "array" -%}
+    {{ generate_structure_typealias(name ~ "Item", struct["items"]) }}
+{%- elif struct.type == "object" -%}
+    {% for itemname, val in struct.properties.items() %}
+        {% if val.type == "array" %}
+        {% set nested_name = name ~ "Item" ~ itemname|Camelize %}
+        {{ generate_structure_typealias(nested_name, val) }}
+        {% elif val.type == "object" %}
+        {% set nested_name = name ~ "Item" ~ itemname|Camelize ~ "Object" %}
+        {{ generate_structure_typealias(nested_name, val) }}
+        {% endif %}
+    {% endfor %}
+{%- else -%}
+    typealias {{ name }} = {{ struct.type|structure_type_name }}
+{% endif %}
+{% endmacro %}
+
 /* ktlint-disable no-blank-line-before-rbrace */
 @file:Suppress("PackageNaming", "MaxLineLength")
 package {{ namespace }}
@@ -147,6 +165,13 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 {% endif %}
 
+{# HACK HACK HACK -- typealiases MUST BE top-level #}
+{% for obj in objs.values() %}
+{% if obj|attr("_generate_structure") %}
+{{ generate_structure_typealias(obj.name|Camelize ~ "Object", obj._generate_structure) }}
+{%- endif %}
+{% endfor %}
+{# HACK end #}
 internal object {{ category_name|Camelize }} {
 {% for obj in objs.values() %}
     {% if obj.type == "ping" %}

{glean_parser-14.1.2 → glean_parser-14.2.0}/glean_parser/templates/swift.jinja2

@@ -80,7 +80,11 @@ struct {{ obj.name|Camelize }}{{ suffix }}: EventExtras {
         {% endif %}
     {% endfor %}
 
-{%- endif -%}
+{%- else -%}
+
+    typealias {{ name }} = {{ struct.type|structure_type_name }}
+
+{% endif -%}
 
 {% endmacro %}
 

{glean_parser-14.1.2 → glean_parser-14.2.0/glean_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glean_parser
-Version: 14.1.2
+Version: 14.2.0
 Summary: Parser tools for Mozilla's Glean telemetry
 Home-page: https://github.com/mozilla/glean_parser
 Author: The Glean Team
@@ -79,6 +79,14 @@ $ glean_parser check < ping.json
 
 ## Unreleased
 
+## 14.2.0
+
+- New Metric Types: `labeled_{custom|memory|timing}_distribution` ([bug 1657947](https://bugzilla.mozilla.org/show_bug.cgi?id=1657947))
+
+## 14.1.3
+
+- Fix Kotlin/Swift code generation for object metrics, now generating top-level typealiases where needed ([#722](https://github.com/mozilla/glean_parser/pull/722))
+
 ## 14.1.2
 
 - ping schedule: Gracefully handle missing ping ([#705](https://github.com/mozilla/glean_parser/pull/705))

{glean_parser-14.1.2 → glean_parser-14.2.0}/requirements_dev.txt

@@ -1,10 +1,10 @@
-coverage==7.5.0
+coverage==7.5.3
 mypy==1.4.1
 pip
 pytest-runner==5.3.2
-pytest==8.2.0
+pytest==8.2.2
 recommonmark==0.7.1
-ruff==0.4.2
+ruff==0.5.0
 Sphinx==7.3.7; python_version > '3.8'
 twine==5.0.0
 types-Jinja2==2.11.9

{glean_parser-14.1.2 → glean_parser-14.2.0}/tests/data/all_metrics.yaml

@@ -118,3 +118,30 @@ all_metrics:
   text:
     <<: *defaults
     type: text
+
+  labeled_custom_distribution:
+    <<: *defaults
+    type: labeled_custom_distribution
+    range_min: 0
+    range_max: 100
+    bucket_count: 10
+    histogram_type: linear
+    labels:
+      - aLabel
+      - 2label
+
+  labeled_memory_distribution:
+    <<: *defaults
+    type: labeled_memory_distribution
+    memory_unit: kilobyte
+    labels:
+      - aLabel
+      - 2label
+
+  labeled_timing_distribution:
+    <<: *defaults
+    type: labeled_timing_distribution
+    time_unit: millisecond
+    labels:
+      - aLabel
+      - 2label

{glean_parser-14.1.2 → glean_parser-14.2.0}/tests/test_kotlin.py

@@ -472,6 +472,13 @@ def test_object_metric(tmp_path):
         ["ActivityStream.kt", "ComplexTypes.kt", "CrashStack.kt", "GleanBuildInfo.kt"]
     )
 
+    with (tmp_path / "ComplexTypes.kt").open("r", encoding="utf-8") as fd:
+        content = fd.read()
+        content = " ".join(content.split())
+
+        assert "typealias ArrayInArrayObjectItemItem = Boolean" in content
+        assert "typealias NumberArrayObjectItem = Int" in content
+
     with (tmp_path / "CrashStack.kt").open("r", encoding="utf-8") as fd:
         content = fd.read()
         content = " ".join(content.split())

{glean_parser-14.1.2 → glean_parser-14.2.0}/tests/test_swift.py

@@ -363,6 +363,9 @@ def test_object_metric(tmp_path):
         content = fd.read()
         content = " ".join(content.split())
 
+        assert "typealias ArrayInArrayObjectItemItem = Bool" in content
+        assert "typealias NumberArrayObjectItem = Int64" in content
+
         assert "ObjectMetricType<ThreadsObject>" in content
         assert "typealias ThreadsObject = [ThreadsObjectItem]" in content
         assert "struct ThreadsObjectItem: Codable, Equatable, ObjectSerialize {" in content