Merge branch 'release-v56.1.0' into release

mozilla · Jan 16, 2024 · fb55e96 · fb55e96
2 parents 2e49482 + babe316
commit fb55e96
Show file tree

Hide file tree

Showing 55 changed files with 520 additions and 577 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 56.0.0
+libraryVersion: 56.1.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,7 +44,6 @@ commands:
           command: |
             echo "export RUST_BACKTRACE=1" >> $BASH_ENV
             echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV
-            echo "export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse" >> $BASH_ENV
             echo "export CARGO_INCREMENTAL=0" >> $BASH_ENV
       - run:
           name: Setup Rust toolchain
@@ -353,7 +352,7 @@ jobs:
     resource_class: "medium+"
     steps:
       - test-rust:
-          rust-version: "1.65.0"
+          rust-version: "1.66.1"
 
   Generate Rust documentation:
     docker:
@@ -477,7 +476,7 @@ jobs:
 
   Check Swift formatting:
     macos:
-      xcode: "14.3"
+      xcode: "15.1"
     resource_class: "macos.x86.medium.gen2"
     steps:
       - checkout
@@ -486,8 +485,10 @@ jobs:
           command: |
             export HOMEBREW_NO_AUTO_UPDATE=1
             export HOMEBREW_NO_INSTALL_CLEANUP=1
-            # swiftlint 0.52.3
-            curl https://raw.githubusercontent.com/Homebrew/homebrew-core/a8712178bbbd19247abab91f3fb2eae240f8249c/Formula/swiftlint.rb > swiftlint.rb
+            # swiftlint 0.53.0
+            SWIFTLINT_SHA256="6e7ca377eb3bbfe43e09825f91ca238382e68d6d1c79f947b0b6eeed79c13650"
+            curl https://raw.githubusercontent.com/Homebrew/homebrew-core/0e4a16c4875adafd3ef2cb39c587d0cbb19c618c/Formula/s/swiftlint.rb > swiftlint.rb
+            echo "${SWIFTLINT_SHA256} *swiftlint.rb" | shasum -a 256 -c -
             brew install ./swiftlint.rb
       - run:
           name: Run swiftlint
@@ -497,7 +498,7 @@ jobs:
 
   iOS build and test:
     macos:
-      xcode: "14.3"
+      xcode: "15.1"
     resource_class: "macos.x86.medium.gen2"
     steps:
       - checkout
@@ -510,16 +511,16 @@ jobs:
       - setup-rust-toolchain
       - restore_cache:
           name: Restore rubygems cache
-          key: swift-docs-gems-v15
+          key: swift-docs-gems-v19
       - run:
           name: Install jazzy
           command: gem install jazzy
       - save_cache:
           name: Save rubygems cache
           # NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
-          key: swift-docs-gems-v15
+          key: swift-docs-gems-v19
           paths:
-            - ~/.gem/ruby/2.7.6
+            - ~/.rbenv/versions/3.1.4/lib/ruby/gems/3.1.0
       - run:
           name: Setup build environment
           command: |
@@ -535,7 +536,7 @@ jobs:
             DEVICES=$(xcrun xctrace list devices 2>&1)
             echo "$DEVICES"
             # Pick a device and start it
-            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 14 Simulator (16' | awk -F'[()]' '{print $4}')
+            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 15 Simulator (17' | awk -F'[()]' '{print $4}')
             xcrun simctl boot "$UUID"
             # Store build type for use in cache key
             if [ -z "${CIRCLE_TAG}" ]; then
@@ -554,10 +555,6 @@ jobs:
             - /Users/distiller/.cargo/registry
             - target
           key: v2-cargo-cache-{{arch}}-{{checksum "buildtype.txt"}}-{{checksum "Cargo.lock"}}
-      - run:
-          name: Configure device logging
-          command: |
-            xcrun simctl spawn booted log config --mode "level:debug" --subsystem org.mozilla.glean-sample-app
       - run:
           name: Run iOS tests
           command: |
@@ -568,25 +565,22 @@ jobs:
             fi
       - run:
           name: Generate Swift documentation
-          command: bash bin/build-swift-docs.sh
+          command: |
+            # Skip doc generation for pull requests.
+            if [ "$CIRCLE_BRANCH" = "main" ]; then
+              bash bin/build-swift-docs.sh
+            else
+              mkdir -p build/docs/swift
+            fi
       - store_artifacts:
           path: raw_xcodebuild.log
           destination: raw_xcodebuild.log
       - store_artifacts:
           path: raw_xcodetest.log
           destination: raw_xcodetest.log
-      - run:
-          name: Collect device logs
-          command: |
-            xcrun simctl spawn booted log collect --output $(pwd)/ios-tests.logarchive
-            zip -r $(pwd)/device_logs.zip $(pwd)/ios-tests.logarchive
-      - store_artifacts:
-          path: device_logs.zip
-          destination: device_logs.zip
       - persist_to_workspace:
           root: build/
           paths: docs/swift
-      - skip-if-doc-only
       - run:
           name: Build XCFramework archive
           no_output_timeout: 20m
@@ -604,7 +598,7 @@ jobs:
 
   iOS integration test:
     macos:
-      xcode: "14.3"
+      xcode: "15.1"
     resource_class: "macos.x86.medium.gen2"
     steps:
       - checkout
@@ -626,7 +620,7 @@ jobs:
             DEVICES=$(xcrun xctrace list devices 2>&1)
             echo "$DEVICES"
             # Pick a device and start it
-            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 14 Simulator (16' | awk -F'[()]' '{print $4}')
+            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 15 Simulator (17' | awk -F'[()]' '{print $4}')
             xcrun simctl boot "$UUID"
       - run:
           name: Build XCFramework archive
@@ -639,30 +633,17 @@ jobs:
       - store_artifacts:
           path: raw_sample_xcodebuild.log
           destination: raw_sample_xcodebuild.log
-      - run:
-          name: Configure device logging
-          command: |
-            xcrun simctl spawn booted log config --mode "level:debug" --subsystem org.mozilla.glean-sample-app
       - run:
           name: Run sample app tests
           command: |
             bash bin/run-ios-sample-app-test.sh
       - store_artifacts:
           path: raw_sample_xcodetest.log
           destination: raw_sample_xcodetest.log
-      - run:
-          name: Collect device logs
-          command: |
-            xcrun simctl spawn booted log collect --output $(pwd)/ios-integration-test.logarchive
-            zip -r $(pwd)/device_logs.zip $(pwd)/ios-integration-test.logarchive
-          when: always
-      - store_artifacts:
-          path: device_logs.zip
-          destination: device_logs.zip
 
   iOS Framework release:
     macos:
-      xcode: "14.3"
+      xcode: "15.1"
     resource_class: "macos.x86.medium.gen2"
     steps:
       - checkout
@@ -704,14 +685,6 @@ jobs:
           name: Python lints
           command: make lint-python
 
-  Python 3_7 tests:
-    docker:
-      - image: cimg/python:3.7
-    steps:
-      - checkout
-      - skip-if-doc-only
-      - test-python
-
   Python 3_8 tests:
     docker:
       - image: cimg/python:3.8
@@ -750,6 +723,20 @@ jobs:
           root: .
           paths: .venv3.10
 
+  Python 3_11 tests:
+    docker:
+      - image: cimg/python:3.11
+    steps:
+      - checkout
+      - test-python
+
+  Python 3_12 tests:
+    docker:
+      - image: cimg/python:3.12
+    steps:
+      - checkout
+      - test-python
+
   Python Windows x86_64 tests:
     docker:
       - image: cimg/python:3.8
@@ -882,7 +869,7 @@ jobs:
 
   pypi-macos-release:
     macos:
-      xcode: "14.3"
+      xcode: "15.1"
     resource_class: "macos.x86.medium.gen2"
     steps:
       - install-rustup
@@ -1080,8 +1067,6 @@ workflows:
           filters:
             branches:
               only: main
-      - Python 3_7 tests:
-          filters: *ci-filters
       - Python 3_8 tests:
           filters: *ci-filters
       - Python 3_9 tests:
@@ -1090,6 +1075,10 @@ workflows:
           filters: *ci-filters
       - Python 3_10 tests:
           filters: *ci-filters
+      - Python 3_11 tests:
+          filters: *ci-filters
+      - Python 3_12 tests:
+          filters: *ci-filters
       - Python Windows x86_64 tests:
           filters: *ci-filters
       - Python Windows i686 tests:

diff --git a/.github/workflows/cargo-vet.yml b/.github/workflows/cargo-vet.yml
@@ -9,7 +9,7 @@ jobs:
     name: Vet Dependencies
     runs-on: ubuntu-latest
     env:
-      CARGO_VET_VERSION: 0.8.0
+      CARGO_VET_VERSION: 0.9.0
     steps:
     - uses: actions/checkout@master
     - name: Install Rust

diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -223,14 +223,15 @@ tasks:
                                           ACTION_TASK_ID: {$json: {$eval: 'taskId'}}  # taskId of the target task (JSON-encoded)
                                           ACTION_INPUT: {$json: {$eval: 'input'}}
                                           ACTION_CALLBACK: '${action.cb_name}'
-
+                            cache:
+                                "${trustDomain}-project-${project}-level-${level}-checkouts-sparse-v1": /builds/worker/checkouts
                             features:
                                 taskclusterProxy: true
                                 chainOfTrust: true
                             # Note: This task is built server side without the context or tooling that
                             # exist in tree so we must hard code the hash
                             image:
-                                mozillareleases/taskgraph:decision-10068f116a3800a829ddba367136a95bef5634e06f77e051859586202c93b18a@sha256:a74ed430fd80ebb647bb4a5b019523cf5f69246ed2c2603386dbc8f7200c8140
+                                mozillareleases/taskgraph:decision-c4ac262880970ca484105929e02dd12f00214d5f2603ab6ce4c0d17de5cd0280@sha256:2dd667994aa13fccdcdcede85c570a5eb4a5247e42875a9e95a135ef774ee469
 
                             maxRunTime: 1800
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v56.0.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v56.1.0...main)
+
+# v56.1.0 (2024-01-16)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v56.0.0...v56.1.0)
+
+* General
+  * Errors are now recorded in cases where we had to create a new data store for Glean due to a failure ([bug 1815253](https://bugzilla.mozilla.org/show_bug.cgi?id=1815253))
+  * Update `glean_parser` to v11.0.0 ([release notes](https://github.com/mozilla/glean_parser/releases/tag/v11.0.0))
+  * Event metrics can now record a maximum of 50 keys in the event extra object ([Bug 1869429](https://bugzilla.mozilla.org/show_bug.cgi?id=1869429))
+* iOS
+  * Glean for iOS is now being built with Xcode 15.1 ([#2669](https://github.com/mozilla/glean/pull/2669))
+* Android
+  * Replaced `whenTaskAdded` with `configureEach` in `GleanGradlePlugin` to avoid unnecessary configuration. ([#2697](https://github.com/mozilla/glean/pull/2697))
 
 # v56.0.0 (2023-11-30)
 
@@ -13,6 +26,9 @@
 
 # v55.0.0 (2023-10-23)
 
+* Python
+  * BREAKING CHANGE: Dropped support for Python 3.7 ([#]())
+
 [Full changelog](https://github.com/mozilla/glean/compare/v54.0.0...v55.0.0)
 
 * General