From 14dbc6ff1d16a8df24ff286c2f3cb30b819033fa Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Wed, 15 Jun 2022 12:00:21 +0200 Subject: [PATCH] Bumped version to 50.1.0 --- .buildconfig.yml | 2 +- CHANGELOG.md | 15 ++++++++++++--- Cargo.lock | 4 ++-- DEPENDENCIES.md | 13 +++++-------- docs/user/user/collected-metrics/metrics.md | 6 +++--- glean-core/Cargo.toml | 2 +- glean-core/android/dependency-licenses.xml | 12 ------------ glean-core/python/setup.py | 2 +- glean-core/rlb/Cargo.toml | 4 ++-- .../glean-gradle-plugin/GleanGradlePlugin.groovy | 2 +- 10 files changed, 28 insertions(+), 34 deletions(-) diff --git a/.buildconfig.yml b/.buildconfig.yml index 97a6624655..1b6c5f30ed 100644 --- a/.buildconfig.yml +++ b/.buildconfig.yml @@ -1,4 +1,4 @@ -libraryVersion: 50.0.1 +libraryVersion: 50.1.0 groupId: org.mozilla.telemetry projects: glean: diff --git a/CHANGELOG.md b/CHANGELOG.md index 019c3f562e..8fead3cd8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,18 @@ # Unreleased changes -[Full changelog](https://github.com/mozilla/glean/compare/v50.0.1...main) +[Full changelog](https://github.com/mozilla/glean/compare/v50.1.0...main) -* iOS - * Dropped usage of Carthage for internal dependencies. +# v50.1.0 (2022-06-15) + +[Full changelog](https://github.com/mozilla/glean/compare/v50.0.1...v50.1.0) + +* General + * Updated to `glean_parser` v6.1.1 ([#2092](https://github.com/mozilla/glean/pull/2092)) +* Swift + * Dropped usage of Carthage for internal dependencies ([#2089](https://github.com/mozilla/glean/pull/2089)) + * Implement the text metric ([#2073](https://github.com/mozilla/glean/pull/2073)) +* Kotlin + * Implement the text metric ([#2073](https://github.com/mozilla/glean/pull/2073)) * Rust * Derive `serde::{Deserialize, Serialize}` on `Lifetime` and `CommonMetricData` ([bug 1772156](https://bugzilla.mozilla.org/show_bug.cgi?id=1772156)) diff --git a/Cargo.lock b/Cargo.lock index 1c23891748..ff9c269e6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,7 +351,7 @@ dependencies = [ [[package]] name = "glean" -version = "50.0.1" +version = "50.1.0" dependencies = [ "chrono", "crossbeam-channel", @@ -387,7 +387,7 @@ dependencies = [ [[package]] name = "glean-core" -version = "50.0.1" +version = "50.1.0" dependencies = [ "android_logger", "bincode", diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 5f8082315e..1c36c6f3c0 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -661,7 +661,7 @@ The following text applies to code linked from these dependencies: * [crossbeam-utils 0.8.8]( https://github.com/crossbeam-rs/crossbeam ) * [env_logger 0.8.4]( https://github.com/env-logger-rs/env_logger/ ) * [ffi-support 0.4.4]( https://github.com/mozilla/ffi-support ) -* [flate2 1.0.23]( https://github.com/rust-lang/flate2-rs ) +* [flate2 1.0.24]( https://github.com/rust-lang/flate2-rs ) * [form_urlencoded 1.0.1]( https://github.com/servo/rust-url ) * [glob 0.3.0]( https://github.com/rust-lang/glob ) * [hashbrown 0.11.2]( https://github.com/rust-lang/hashbrown ) @@ -677,12 +677,9 @@ The following text applies to code linked from these dependencies: * [num-traits 0.2.15]( https://github.com/rust-num/num-traits ) * [num_cpus 1.13.1]( https://github.com/seanmonstar/num_cpus ) * [once_cell 1.12.0]( https://github.com/matklad/once_cell ) -* [paste 0.1.18]( https://github.com/dtolnay/paste ) * [paste 1.0.7]( https://github.com/dtolnay/paste ) -* [paste-impl 0.1.18]( https://github.com/dtolnay/paste ) * [percent-encoding 2.1.0]( https://github.com/servo/rust-url/ ) * [pest 2.1.3]( https://github.com/pest-parser/pest ) -* [proc-macro-hack 0.5.19]( https://github.com/dtolnay/proc-macro-hack ) * [proc-macro2 1.0.37]( https://github.com/dtolnay/proc-macro2 ) * [quote 1.0.18]( https://github.com/dtolnay/quote ) * [serde 1.0.137]( https://github.com/serde-rs/serde ) @@ -3543,7 +3540,7 @@ limitations under the License. The following text applies to code linked from these dependencies: -* [rkv 0.17.0]( https://github.com/mozilla/rkv ) +* [rkv 0.17.1]( https://github.com/mozilla/rkv ) * [static_assertions 1.1.0]( https://github.com/nvzqz/static-assertions-rs ) @@ -4519,7 +4516,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. The following text applies to code linked from these dependencies: -* [ordered-float 1.1.1]( https://github.com/reem/rust-ordered-float ) +* [ordered-float 3.0.0]( https://github.com/reem/rust-ordered-float ) ``` @@ -4903,8 +4900,8 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice The following text applies to code linked from these dependencies: -* [glean 50.0.1]( https://github.com/mozilla/glean ) -* [glean-core 50.0.1]( https://github.com/mozilla/glean ) +* [glean 50.1.0]( https://github.com/mozilla/glean ) +* [glean-core 50.1.0]( https://github.com/mozilla/glean ) * [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel ) diff --git a/docs/user/user/collected-metrics/metrics.md b/docs/user/user/collected-metrics/metrics.md index ddc959a15c..b2eb197c1c 100644 --- a/docs/user/user/collected-metrics/metrics.md +++ b/docs/user/user/collected-metrics/metrics.md @@ -4,7 +4,7 @@ > If you are looking for the metrics collected by Glean.js, > refer to the documentation over on the [`@mozilla/glean.js`](https://github.com/mozilla/glean.js/blob/main/docs/reference/metrics.md) repository. - + # Metrics @@ -161,7 +161,7 @@ In addition to those built-in metrics, the following metrics are added to the pi | --- | --- | --- | --- | --- | --- | --- | | glean.database.size |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |The size of the database file at startup. |[Bug 1656589](https://bugzilla.mozilla.org/show_bug.cgi?id=1656589#c7)||never |1 | | glean.error.io |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of times we encountered an IO error when writing a pending ping to disk. |[Bug 1686233](https://bugzilla.mozilla.org/show_bug.cgi?id=1686233#c2)||never |1 | -| glean.error.preinit_tasks_overflow |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of tasks queued in the pre-initialization buffer. Only sent if the buffer overflows. |[Bug 1609482](https://bugzilla.mozilla.org/show_bug.cgi?id=1609482#c3)||never |1 | +| glean.error.preinit_tasks_overflow |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of tasks that overflowed the pre-initialization buffer. Only sent if the buffer ever overflows. In Version 0 this reported the total number of tasks enqueued. |[Bug 1609482](https://bugzilla.mozilla.org/show_bug.cgi?id=1609482#c3)||never |1 | | glean.upload.deleted_pings_after_quota_hit |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The number of pings deleted after the quota for the size of the pending pings directory or number of files is hit. Since quota is only calculated for the pending pings directory, and deletion request ping live in a different directory, deletion request pings are never deleted. |[Bug 1601550](https://bugzilla.mozilla.org/show_bug.cgi?id=1601550#c3)||never |1 | | glean.upload.discarded_exceeding_pings_size |[memory_distribution](https://mozilla.github.io/glean/book/user/metrics/memory_distribution.html) |The size of pings that exceeded the maximum ping size allowed for upload. |[Bug 1597761](https://bugzilla.mozilla.org/show_bug.cgi?id=1597761#c10)||never |1 | | glean.upload.pending_pings |[counter](https://mozilla.github.io/glean/book/user/metrics/counter.html) |The total number of pending pings at startup. This does not include deletion-request pings. |[Bug 1665041](https://bugzilla.mozilla.org/show_bug.cgi?id=1665041#c23)||never |1 | @@ -173,5 +173,5 @@ In addition to those built-in metrics, the following metrics are added to the pi Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection). - + diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml index df3cf6aa56..36bd1e07dc 100644 --- a/glean-core/Cargo.toml +++ b/glean-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean-core" -version = "50.0.1" +version = "50.1.0" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "A modern Telemetry library" repository = "https://github.com/mozilla/glean" diff --git a/glean-core/android/dependency-licenses.xml b/glean-core/android/dependency-licenses.xml index 8517e8252b..b47866a6f2 100644 --- a/glean-core/android/dependency-licenses.xml +++ b/glean-core/android/dependency-licenses.xml @@ -120,14 +120,6 @@ the details of which are reproduced below. Apache License 2.0: paste https://github.com/dtolnay/paste - - Apache License 2.0: paste - https://github.com/dtolnay/paste - - - Apache License 2.0: paste-impl - https://github.com/dtolnay/paste - Apache License 2.0: percent-encoding https://github.com/servo/rust-url/ @@ -136,10 +128,6 @@ the details of which are reproduced below. Apache License 2.0: pest https://github.com/pest-parser/pest - - Apache License 2.0: proc-macro-hack - https://github.com/dtolnay/proc-macro-hack - Apache License 2.0: proc-macro2 https://github.com/dtolnay/proc-macro2 diff --git a/glean-core/python/setup.py b/glean-core/python/setup.py index 67cb6c9ee3..aee26304d8 100644 --- a/glean-core/python/setup.py +++ b/glean-core/python/setup.py @@ -56,7 +56,7 @@ history = history_file.read() # glean version. Automatically updated by the bin/prepare_release.sh script -version = "50.0.1" +version = "50.1.0" requirements = [ "cffi>=1.13.0", diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml index 3e0aa53dd5..c2f43f21e0 100644 --- a/glean-core/rlb/Cargo.toml +++ b/glean-core/rlb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "glean" -version = "50.0.1" +version = "50.1.0" authors = ["Jan-Erik Rediger ", "The Glean Team "] description = "Glean SDK Rust language bindings" repository = "https://github.com/mozilla/glean" @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" } [dependencies.glean-core] path = ".." -version = "50.0.1" +version = "50.1.0" [dependencies] crossbeam-channel = "0.5" diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy index fd020fe933..e298872a7d 100644 --- a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy +++ b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy @@ -529,7 +529,7 @@ except: void apply(Project project) { isOffline = project.gradle.startParameter.offline - project.ext.glean_version = "50.0.1" + project.ext.glean_version = "50.1.0" def parserVersion = gleanParserVersion(project) // Print the required glean_parser version to the console. This is