This commit is contained in:
Jan-Erik Rediger 2022-05-19 12:05:10 +02:00
Родитель 2f01ac23b6
Коммит 5e5f03257c
10 изменённых файлов: 7 добавлений и 11 удалений

Просмотреть файл

@ -144,7 +144,7 @@ python-docs: build-python ## Build the Python documentation
.PHONY: docs rust-docs swift-docs
metrics-docs: python-setup ## Build the internal metrics documentation
$(GLEAN_PYENV)/bin/pip install glean_parser==5.0.1
$(GLEAN_PYENV)/bin/pip install glean_parser==6.0.0
$(GLEAN_PYENV)/bin/glean_parser translate --allow-reserved \
-f markdown \
-o ./docs/user/user/collected-metrics \

Просмотреть файл

@ -20,7 +20,7 @@ include = [
]
[package.metadata.glean]
glean-parser = "5.0.1"
glean-parser = "6.0.0"
[badges]
circle-ci = { repository = "mozilla/glean", branch = "main" }

Просмотреть файл

@ -26,7 +26,6 @@ File GLEAN_PING_SCHEMA_PATH = file("$rootDir/glean.1.schema.json")
// Set configuration for the glean_parser
ext.allowGleanInternal = true
ext.gleanNamespace = "mozilla.telemetry.glean"
ext.gleanParserOverride = "git+https://github.com/badboy/glean_parser@uniffi-preparation#glean-parser"
android {
compileSdkVersion rootProject.ext.build.compileSdkVersion

Просмотреть файл

@ -289,8 +289,6 @@ public class Glean {
/// return `false`.
/// If Glean is not initialized yet, tags will not be validated at this point.
///
/// This is only meant to be used internally by the `GleanDebugActivity`.
///
/// - parameters:
/// * tags: A list of tags, which must be valid HTTP header values.
public func setSourceTags(_ tags: [String]) -> Bool {

Просмотреть файл

@ -25,7 +25,7 @@
set -e
GLEAN_PARSER_VERSION=5.0.1
GLEAN_PARSER_VERSION=6.0.0
# CMDNAME is used in the usage text below.
# shellcheck disable=SC2034

Просмотреть файл

@ -30,7 +30,7 @@ __author__ = "The Glean Team"
__email__ = "glean-team@mozilla.com"
GLEAN_PARSER_VERSION = "5.0.1"
GLEAN_PARSER_VERSION = "6.0.0"
if glean_parser.__version__ != GLEAN_PARSER_VERSION:

Просмотреть файл

@ -60,7 +60,7 @@ version = "44.2.0"
requirements = [
"cffi>=1.13.0",
"glean_parser==5.0.1",
"glean_parser==6.0.0",
]
setup_requirements = ["cffi>=1.13.0"]

Просмотреть файл

@ -41,7 +41,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 = "5.0.1"
private String GLEAN_PARSER_VERSION = "6.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"

Просмотреть файл

@ -65,7 +65,6 @@ ext.gleanBuildDate = "2020-11-06T11:30:50+00:00"
// Enable expiration by major version. The sample is at version 1,
// see versionName.
ext.gleanExpireByVersion = 1
ext.gleanParserOverride = "git+https://github.com/badboy/glean_parser@uniffi-preparation#glean-parser"
// Include the glean-gradle-plugin. This is slightly different than what is
// recommended for external users since we are loading it from the same root Gradle

Просмотреть файл

@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
print("using a mock server, setting address: \(address)")
let cfg = Configuration(serverEndpoint: address)
glean.setSourceTags(["automation"])
_ = glean.setSourceTags(["automation"])
glean.initialize(uploadEnabled: true, configuration: cfg, buildInfo: GleanMetrics.GleanBuild.info)
} else {
print("using default config for Glean")