Skip to content

Update to 2.0.0 glean_parser schemas #1586

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 2 commits into from
Apr 14, 2021
Merged

Update to 2.0.0 glean_parser schemas #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22b3e1
Update to 2.0.0 glean_parser schemas
mdboom Apr 5, 2021
79148df
Update glean_parser to 3.0
badboy Apr 13, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ python-docs: build-python ## Build the Python documentation
.PHONY: docs rust-docs kotlin-docs swift-docs

metrics-docs: python-setup ## Build the internal metrics documentation
$(GLEAN_PYENV)/bin/pip install glean_parser==2.5.0
$(GLEAN_PYENV)/bin/pip install glean_parser==3.0.0
$(GLEAN_PYENV)/bin/glean_parser translate --allow-reserved \
-f markdown \
-o ./docs/user/user/collected-metrics \
Expand Down
2 changes: 1 addition & 1 deletion docs/user/user/adding-new-metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ The overall organization is:

```YAML
# Required to indicate this is a `metrics.yaml` file
$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

toolbar:
click:
Expand Down
4 changes: 2 additions & 2 deletions docs/user/user/instrument-android-crashes-example.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ definition and event metric definition, the `metrics.yaml` should look like this

```YAML
# Required to indicate this is a `metrics.yaml` file
$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

crash:
exception:
Expand Down Expand Up @@ -77,7 +77,7 @@ The name of the ping will be `crash`, so the `pings.yaml` file should look like

```YAML
# Required to indicate this is a `pings.yaml` file
$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

crash:
description: >
Expand Down
2 changes: 1 addition & 1 deletion docs/user/user/pings/custom.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ For example, to define a custom ping called `search` specifically for search inf

```YAML
# Required to indicate this is a `pings.yaml` file
$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

search:
description: >
Expand Down
4 changes: 2 additions & 2 deletions docs/user/user/pings/testing-custom-pings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ One possible strategy could be to wrap the Glean SDK API call to send the ping i
Let us start by defining a custom ping with a sample metric in it. Here is the `pings.yaml` file:

```yaml
$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

my-custom-ping:
description: >
Expand All @@ -32,7 +32,7 @@ my-custom-ping:
And here is the `metrics.yaml`

```yaml
$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

custom_ping_data:
sample_string:
Expand Down
2 changes: 1 addition & 1 deletion glean-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include = [
]

[package.metadata.glean]
glean-parser = "2.5.0"
glean-parser = "3.0.0"

[badges]
circle-ci = { repository = "mozilla/glean", branch = "main" }
Expand Down
2 changes: 1 addition & 1 deletion glean-core/android/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# for additional information.

---
$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

glean.internal.metrics:
android_sdk_version:
Expand Down
2 changes: 1 addition & 1 deletion glean-core/csharp/Glean/GleanParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class GleanParser : ToolTask
private const string DefaultVirtualEnvDir = ".venv";

// The glean_parser pypi package version
private const string GleanParserVersion = "2.5.0";
private const string GleanParserVersion = "3.0.0";

// This script runs a given Python module as a "main" module, like
// `python -m module`. However, it first checks that the installed
Expand Down
2 changes: 1 addition & 1 deletion glean-core/ios/sdk_generator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

set -e

GLEAN_PARSER_VERSION=2.5.0
GLEAN_PARSER_VERSION=3.0.0

# CMDNAME is used in the usage text below.
# shellcheck disable=SC2034
Expand Down
2 changes: 1 addition & 1 deletion glean-core/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# for additional information.

---
$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

glean.baseline:
duration:
Expand Down
2 changes: 1 addition & 1 deletion glean-core/pings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# the `glean_parser` PyPI package.

---
$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

baseline:
description: |
Expand Down
2 changes: 1 addition & 1 deletion glean-core/python/glean/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
__email__ = "glean-team@mozilla.com"


GLEAN_PARSER_VERSION = "2.5.0"
GLEAN_PARSER_VERSION = "3.0.0"


if glean_parser.__version__ != GLEAN_PARSER_VERSION:
Expand Down
2 changes: 1 addition & 1 deletion glean-core/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

requirements = [
"cffi>=1.13.0",
"glean_parser==2.5.0",
"glean_parser==3.0.0",
"iso8601>=0.1.10; python_version<='3.6'",
]

Expand Down
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class GleanMetricsYamlTransform extends ArtifactTransform {
@SuppressWarnings("GrPackage")
class GleanPlugin implements Plugin<Project> {
// The version of glean_parser to install from PyPI.
private String GLEAN_PARSER_VERSION = "2.5.0"
private String GLEAN_PARSER_VERSION = "3.0.0"
// The version of Miniconda is explicitly specified.
// Miniconda3-4.5.12 is known to not work on Windows.
private String MINICONDA_VERSION = "4.5.11"
Expand Down
2 changes: 1 addition & 1 deletion samples/android/app/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

browser.engagement:
click:
Expand Down
2 changes: 1 addition & 1 deletion samples/android/app/pings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

sample:
description: |
Expand Down
2 changes: 1 addition & 1 deletion samples/csharp/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

csharp.test:
mystring:
Expand Down
2 changes: 1 addition & 1 deletion samples/csharp/pings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

sample:
description: |
Expand Down
2 changes: 1 addition & 1 deletion samples/ios/app/metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
$schema: moz://mozilla.org/schemas/glean/metrics/2-0-0

browser.engagement:
click:
Expand Down
2 changes: 1 addition & 1 deletion samples/ios/app/pings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

---

$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
$schema: moz://mozilla.org/schemas/glean/pings/2-0-0

sample:
description: |
Expand Down