Merge branch 'release-v30.1.0' into release

.buildconfig.yml

@@ -1,4 +1,4 @@
-libraryVersion: 30.0.0
+libraryVersion: 30.1.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

.circleci/config.yml

@@ -232,7 +232,7 @@ jobs:
       - run:
           name: Check vendored schema for upstream updates
           command: |
-            bin/update-schema.sh latest
+            bin/update-schema.sh master
             if ! git diff --exit-code HEAD -- glean-core/preview/tests/glean.1.schema.json; then
               echo "===================================="
               echo "Latest schema from upstream changed."
@@ -346,10 +346,10 @@ jobs:
       - run:
           name: Install mdbook-dtmo
           command: |
-              MDBOOK_VERSION=0.5.0
+              MDBOOK_VERSION=0.6.1
               MDBOOK="mdbook-dtmo-${MDBOOK_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
-              MDBOOK_SHA256=ce96727a7d066dc69b9148db46b737f45f79bec738446177806e645673ed8a4e
-              curl -sfSL --retry 5 --retry-delay 10 -O "https://github.com/badboy/mdbook-dtmo/releases/download/${MDBOOK_VERSION}/${MDBOOK}"
+              MDBOOK_SHA256=775124f302e633db91696ff955509e8567305949c79a76ef51649b9871fdd590
+              curl -sfSL --retry 5 -O "https://github.com/badboy/mdbook-dtmo/releases/download/${MDBOOK_VERSION}/${MDBOOK}"
               echo "${MDBOOK_SHA256} *${MDBOOK}" | shasum -a 256 -c -
               tar -xvf "${MDBOOK}"
               # We rename it to mdbook here, so other tools keep working as expected
@@ -571,7 +571,7 @@ jobs:
             rustup target add aarch64-apple-ios x86_64-apple-ios
             bin/bootstrap.sh
             # See https://circleci.com/docs/2.0/testing-ios/#pre-starting-the-simulator
-            xcrun instruments -w "iPhone 11 (13.4) [" || true
+            xcrun instruments -w "iPhone 11 (13" || true
             # Store build type for use in cache key
             if [ -z "${CIRCLE_TAG}" ]; then
               echo "release" > buildtype.txt
@@ -663,7 +663,7 @@ jobs:
           command: |
             rustup target add aarch64-apple-ios x86_64-apple-ios
             # See https://circleci.com/docs/2.0/testing-ios/#pre-starting-the-simulator
-            xcrun instruments -w "iPhone 11 (13.4) [" || true
+            xcrun instruments -w "iPhone 11 (13" || true
       - attach_workspace:
           at: .
       - run:
@@ -683,12 +683,15 @@ jobs:
             sed -i.bak "/mozilla\/glean/s#.*#binary \"$JSON_URL\" ~> 0.0.1-SNAPSHOT#" "$CARTFILE_PATH"
             cat "${CARTFILE_PATH}"
       - run:
-          name: Build sample app
+          name: Bootstrap dependencies
           command: |
-            # Build in Debug mode to speed it all up
+            # We need release mode to correctly ship bitcode for dependencies
             pushd samples/ios/app
-            carthage bootstrap --platform iOS --cache-builds --configuration Debug --verbose
+            carthage bootstrap --platform iOS --cache-builds --configuration Release --verbose
             popd
+      - run:
+          name: Build sample app
+          command: |
             bash bin/run-ios-sample-app-build.sh
       - store_artifacts:
           path: raw_sample_xcodebuild.log

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = glean

.dictionary

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 172 utf-8
+personal_ws-1.1 en 173 utf-8
 AAR
 AARs
 APIs
@@ -105,6 +105,7 @@ gfritzsche
 glinter
 gradle
 grcov
+gzip
 hotfix
 html
 init

.gitignore

@@ -20,9 +20,6 @@ raw_xcode*log
 /glean-core/ios/Pipfile.lock
 /glean-core/ios/.venv
 
-# Due to a bug in Carthage, we ignore this file.
-# See `tests-only-Cartfile` for more info.
-/Cartfile
 # Carthage build artifacts
 Cartfile.resolved
 Carthage

CHANGELOG.md

@@ -1,6 +1,21 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v30.0.0...master)
+[Full changelog](https://github.com/mozilla/glean/compare/v30.1.0...master)
+
+# v30.1.0 (2020-05-22)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v30.0.0...v30.1.0)
+
+* Android & iOS
+  * Ping payloads are now compressed using gzip.
+* iOS
+  * `Glean.initialize` is now a no-op if called from an embedded extension. This means that Glean will only run in the base application process in order to prevent extensions from behaving like separate applications with different client ids from the base application. Applications are responsible for ensuring that extension metrics are only collected within the base application.
+* Python
+  * `lifetime: application` metrics are now cleared after the Glean-owned pings are sent,
+    after the product starts.
+  * Glean Python bindings now build in a native Windows environment.
+  * BUGFIX: `MemoryDistributionMetric` now parses correctly in `metrics.yaml` files.
+  * BUGFIX: Glean will no longer crash if run as part of another library's coverage testing.
 
 # v30.0.0 (2020-05-13)
 
@@ -18,6 +33,13 @@
 * iOS:
   * Refactor the ping uploader to use the new upload mechanism.
 
+# v29.1.1 (2020-05-22)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v29.1.0...v29.1.1)
+
+* Android
+  * BUGFIX: Fix a race condition that leads to a `ConcurrentModificationException`. [Bug 1635865](https://bugzilla.mozilla.org/1635865)
+
 # v29.1.0 (2020-05-11)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v29.0.0...v29.1.0)
@@ -109,7 +131,7 @@
     were unintentionally public, have been made private.
   * Most Glean work and I/O is now done on its own worker thread. This brings the parallelism Python in line with the other platforms.
   * The timing distribution, memory distribution, string list, labeled boolean and labeled string metric types are now supported in Python ([#762](https://github.com/mozilla/glean/pull/762), [#763](https://github.com/mozilla/glean/pull/763), [#765](https://github.com/mozilla/glean/pull/765), [#766](https://github.com/mozilla/glean/pull/766))
-  
+
 # v25.1.0 (2020-02-26)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v25.0.0...v25.1.0)

Cartfile.private

@@ -1 +1,2 @@
 github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "1024jp/GzipSwift" "5.1.1"

Makefile

@@ -178,7 +178,7 @@ rust-coverage: ## Generate code coverage information for Rust code
 .PHONY: rust-coverage
 
 python-coverage: build-python ## Generate a code coverage report for Python
-	$(GLEAN_PYENV)/bin/python3 -m coverage run --parallel-mode -m pytest
+	GLEAN_COVERAGE=1 $(GLEAN_PYENV)/bin/python3 -m coverage run --parallel-mode -m pytest
 	$(GLEAN_PYENV)/bin/python3 -m coverage combine
 	$(GLEAN_PYENV)/bin/python3 -m coverage html
 .PHONY: python-coverage

bin/build-rust-docs.sh

@@ -7,7 +7,7 @@
 # Build all docs with one command
 # Documentation will be placed in `build/docs`.
 
-set -e
+set -xe
 
 CRATE_NAME=glean_core
 

bin/prepare-release.sh

@@ -144,6 +144,11 @@ ${CHANGELOG}
 EOL
 fi
 
+### Dependency summary ###
+
+echo "Updating dependency summary"
+run "${WORKSPACE_ROOT}"/bin/dependency-summary.sh
+
 echo "Everything prepared for v${NEW_VERSION}"
 echo
 echo "Changed files:"

bin/run-ios-sample-app-test.sh

@@ -9,7 +9,7 @@ set -euvx
 set -o pipefail && \
 xcodebuild \
   -workspace ./samples/ios/app/glean-sample-app.xcodeproj/project.xcworkspace \
-  -scheme glean-sample-appUITests \
+  -scheme glean-sample-app \
   -sdk iphonesimulator \
   -destination 'platform=iOS Simulator,name=iPhone 11' \
   test | \

bin/update-schema.sh

@@ -16,18 +16,13 @@
 #
 # Environment:
 #
-# DRY_RUN - Do not modify files or run destructive commands when set.
 # VERB    - Log commands that are run when set.
 
 set -eo pipefail
 
 run() {
   [ "${VERB:-0}" != 0 ] && echo "+ $*"
-  if [ "$DOIT" = y ]; then
-      "$@"
-  else
-      true
-  fi
+  "$@"
 }
 
 update() {
@@ -39,38 +34,15 @@ update() {
   run curl --silent --fail --show-error --location --retry 5 --retry-delay 10 "$FULL_URL" --output "$SCHEMA_PATH"
 }
 
-get_latest() {
-  API_URL="https://api.github.com/repos/mozilla-services/mozilla-pipeline-schemas/commits?path=schemas%2Fglean%2Fglean%2Fglean.1.schema.json&page=1&per_page=1"
-  SHA="$(curl --silent --fail --show-error --location --retry 5 --retry-delay 10 "$API_URL" | grep --max-count=1 sha)"
-
-  echo "$SHA" | $SED -E -e 's/.+: "([^"]+)".*/\1/'
-}
-
-SED=sed
-if command -v gsed >/dev/null; then
-    SED=gsed
-fi
-
-DOIT=y
-if [[ -n "$DRY_RUN" ]]; then
-    echo "Dry-run. Not modifying files."
-    DOIT=n
-fi
-
 WORKSPACE_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )"
 SCHEMA_URL="https://raw.githubusercontent.com/mozilla-services/mozilla-pipeline-schemas/%s/schemas/glean/glean/glean.1.schema.json"
 
 if [ -z "$1" ]; then
-    echo "Usage: $(basename $0) <commit hash>"
+    echo "Usage: $(basename $0) <commit hash or branch name>"
     echo
     echo "Update schema version to test"
     exit 1
 fi
 
 COMMIT_HASH="$1"
-
-if [ "$COMMIT_HASH" = "latest" ]; then
-  COMMIT_HASH="$(get_latest)"
-fi
-
 update "$COMMIT_HASH"

build.gradle

@@ -12,7 +12,7 @@ buildscript {
     // versions below must match the ones in that repository.
     ext.versions = [
         android_components: '15.0.0',
-        android_gradle_plugin: '3.4.1',
+        android_gradle_plugin: '3.5.3',
         android_maven_publish_plugin: '3.6.2',
         coroutines: '1.3.0',
         dokka: '0.9.17',

deny.toml

@@ -6,4 +6,5 @@ allow = [
     "Apache-2.0",
     "MIT",
     "BSD-2-Clause",
+    "Zlib",
 ]