Merge branch 'release-v52.1.0' into release

mozilla · Jan 26, 2023 · b4fd547 · b4fd547
2 parents ab11824 + ffa9cc9
commit b4fd547
Show file tree

Hide file tree

Showing 72 changed files with 1,372 additions and 1,338 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 52.0.1
+libraryVersion: 52.1.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,8 +39,8 @@ commands:
       - run:
           name: Turn on RUST_BACKTRACE and RUST_LOG for any job that installs rustc
           command: |
-              echo "export RUST_BACKTRACE=1" >> $BASH_ENV
-              echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV
+            echo "export RUST_BACKTRACE=1" >> $BASH_ENV
+            echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV
       - run:
           name: Setup Rust toolchain
           command: |
@@ -91,16 +91,16 @@ commands:
       - run:
           name: Setup custom environment variables
           command: |
-              echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV
+            echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV
 
   install-android-ndk:
     steps:
       - run:
           name: Install missing Android SDK & NDK
           command: |
-              sdkmanager \
-                "build-tools;33.0.0" \
-                "ndk;25.1.8937393"
+            sdkmanager \
+              "build-tools;33.0.0" \
+              "ndk;25.1.8937393"
 
   android-setup:
     steps:
@@ -111,7 +111,7 @@ commands:
       - run:
           name: Restrict to Linux builds only
           command: |
-              echo "rust.targets=linux-x86-64" > local.properties
+            echo "rust.targets=linux-x86-64" > local.properties
 
   test-python:
     steps:
@@ -120,8 +120,8 @@ commands:
       - run:
           name: Remove coredump file restriction
           command: |
-              # tell the operating system to remove the file size limit on core dump files
-              ulimit -c unlimited
+            # tell the operating system to remove the file size limit on core dump files
+            ulimit -c unlimited
       - run:
           name: Python tests
           command: |
@@ -131,9 +131,9 @@ commands:
           name: Detect and gather coredump files
           when: always
           command: |
-              mkdir -p ~/coredumps
-              # Try to copy the core file(s). Don't fail if they don't exist.
-              cp core.* ~/coredumps || true
+            mkdir -p ~/coredumps
+            # Try to copy the core file(s). Don't fail if they don't exist.
+            cp core.* ~/coredumps || true
       - store_artifacts:
           path: ~/coredumps
           destination: coredumps
@@ -417,8 +417,8 @@ jobs:
       - run:
           name: Remove coredump file restriction
           command: |
-              # tell the operating system to remove the file size limit on core dump files
-              ulimit -c unlimited
+            # tell the operating system to remove the file size limit on core dump files
+            ulimit -c unlimited
       - run:
           name: Android tests
           command: ./gradlew --no-daemon :glean:testDebugUnitTest
@@ -428,22 +428,22 @@ jobs:
       - run:
           name: Save test results
           command: |
-              mkdir -p ~/test-results/junit/
-              mkdir -p ~/test-results/tests/
-              cp -a glean-core/android/build/reports/tests ~/test-results/
-              find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+            mkdir -p ~/test-results/junit/
+            mkdir -p ~/test-results/tests/
+            cp -a glean-core/android/build/reports/tests ~/test-results/
+            find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
           when: always
       - store_artifacts:
           path: ~/test-results/tests
           destination: test-results
       - run:
           name: Detect and gather coredump files
           command: |
-              mkdir -p ~/coredumps
-              # Try to copy the core file from a default location. Don't fail if it doesn't exist.
-              cp -a glean-core/android/core ~/coredumps || true
-              # The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well
-              find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/%
+            mkdir -p ~/coredumps
+            # Try to copy the core file from a default location. Don't fail if it doesn't exist.
+            cp -a glean-core/android/core ~/coredumps || true
+            # The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well
+            find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/%
       - store_artifacts:
           path: ~/coredumps
           destination: coredumps
@@ -452,7 +452,7 @@ jobs:
       - run:
           name: Build Android Sample App
           command: |
-              ./gradlew :glean-sample-app:assembleAndroidTest
+            ./gradlew :glean-sample-app:assembleAndroidTest
           environment:
             GRADLE_OPTS: -Xmx2048m
             TARGET_CFLAGS: -DNDEBUG
@@ -612,7 +612,7 @@ jobs:
       - run:
           name: Build XCFramework archive
           command: |
-              bash bin/build-xcframework.sh
+            bash bin/build-xcframework.sh
       - run:
           name: Build sample app
           command: |
@@ -664,9 +664,9 @@ jobs:
       - run:
           name: Release glean-swift
           command: |
-              git config --global user.email "[email protected]"
-              git config --global user.name "Glean automated release"
-              ./bin/publish-glean-swift.sh "${CIRCLE_TAG}"
+            git config --global user.email "[email protected]"
+            git config --global user.name "Glean automated release"
+            ./bin/publish-glean-swift.sh "${CIRCLE_TAG}"
 
   ###########################################################################
   # Python
@@ -700,7 +700,7 @@ jobs:
       - skip-if-doc-only
       - run:
           command: |
-              echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
+            echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
       - test-python
 
   Python 3_7 tests:
@@ -736,7 +736,7 @@ jobs:
       - skip-if-doc-only
       - run:
           command: |
-              echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
+            echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
       - test-python
 
   Python 3_9 on Alpine tests:
@@ -921,10 +921,11 @@ jobs:
             GLEAN_BUILD_VARIANT: release
       - run:
           name: Upload wheels to PyPI
-          command:
+          command: |
+            cd glean-core/python
             # Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
             # variables are configured in CircleCI's environment variables.
-            .venv3.9/bin/python3 -m twine upload glean-core/python/dist/*
+            .venv3.9/bin/python3 -m twine upload dist/*
       - install-ghr-darwin
       - run:
           name: Publish to Github

diff --git a/.dictionary b/.dictionary
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 253 utf-8
+personal_ws-1.1 en 254 utf-8
 AAR
 AARs
 ABI

diff --git a/.flake8 b/.flake8
@@ -1,3 +1,5 @@
 [flake8]
 max-line-length = 100
 exclude = glean-core/python/glean/_uniffi.py
+# W503 - line break before binary operator - black formats it that way
+ignore = W503
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v52.0.1...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v52.1.0...main)
+
+# v52.1.0 (2023-01-26)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v52.0.1...v52.1.0)
+
+* General
+  * BUGFIX: Custom Pings with events should no longer erroneously post `InvalidState` errors ([bug 1811872](https://bugzilla.mozilla.org/show_bug.cgi?id=1811872))
+  * Upgrade to `glean_parser` v7.0.0 ([#2346](https://github.com/mozilla/glean/pull/2346))
+* Kotlin
+  * Update to Gradle v7.6 ([#2317](https://github.com/mozilla/glean/pull/2317))
+* Rust
+  * Added a new `client_info` field `windows_build_number` (Windows only) ([#2325](https://github.com/mozilla/glean/pull/2325))
+  * A new `ConfigurationBuilder` allows to create the Glean configuration before initialization ([#2313](https://github.com/mozilla/glean/pull/2313))
+  * Drop dependency on `env_logger` for regular builds ([#2312](https://github.com/mozilla/glean/pull/2312))
 
 # v52.0.1 (2023-01-19)