Merge remote-tracking branch 'origin/master' into snappy2

Author: dconeybe

.github/workflows/analytics.yml

@@ -3,9 +3,8 @@ name: analytics
 on:
   pull_request:
     paths:
-    - 'FirebaseAnalytics.podspec.json'
-    - 'FirebaseAnalyticsSwift**'
-    - 'GoogleAppMeasurement.podspec.json'
+    - 'FirebaseAnalytics**'
+    - 'GoogleAppMeasurement**'
     - '.github/workflows/analytics.yml'
     - 'Gemfile*'
   schedule:
@@ -37,6 +36,11 @@ jobs:
       run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec.json --platforms=${{ matrix.target }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
     - name: FirebaseAnalyticsSwift
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsSwift.podspec --platforms=${{ matrix.target }}
+    # The following steps are only run on `ios` due to product availability.
+    - name: GoogleAppMeasurementOnDeviceConversion
+      run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurementOnDeviceConversion.podspec.json --platforms=ios --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
+    - name: FirebaseAnalyticsOnDeviceConversion
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsOnDeviceConversion.podspec --platforms=ios
 
 # TODO: Consider pushing GoogleAppMeasurement.podspec.json to SpecsDev to enable similar test
 # for FirebaseAnalytics.podspec.json

.github/workflows/generate_issues.yml

@@ -6,8 +6,8 @@ on:
     - '.github/workflows/generate_issues.yml'
     - '.github/actions/testing_report_generation**'
   schedule:
-    # Run every day at 5am (PST) - cron uses UTC times
-    - cron:  '0 13 * * *'
+    # Run every day at 4am (PST) - cron uses UTC times
+    - cron:  '0 12 * * *'
 jobs:
   generate_an_issue:
     # Don't run on private repo.

.github/workflows/notice_generation.yml

@@ -5,10 +5,13 @@ on:
     paths:
     - '.github/workflows/notice_generation.yml'
     - '.github/actions/notices_generation**'
+  schedule:
+    # Run every day at 5am (PST) - cron uses UTC times
+    - cron:  '0 13 * * *'
 jobs:
   generate_a_notice:
     # Don't run on private repo.
-    if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name != 'schedule'
+    if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
     runs-on: macos-12
     name: Generate NOTICES
     env:
@@ -38,12 +41,13 @@ jobs:
         notices-path:  ${{ env.NOTICES_PATH }}
     - name: Create a pull request
       run: |
+        RUN_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
         gem install octokit
         ruby scripts/create_pull_request.rb \
         --repo-root ${GITHUB_WORKSPACE} \
         --repo-token ${{ secrets.GITHUB_TOKEN }} \
         --target-path  ${{ env.NOTICES_PATH }} \
         --pr-title "NOTICES Change" \
-        --pr-body "NOTICES Change is detected." \
+        --pr-body "NOTICES Change is detected in [this GitHub Actions Run](${RUN_URL})." \
         --commit-comment "NOTICES change."
       shell: bash

.github/workflows/prerelease.yml

@@ -6,8 +6,8 @@ on:
     types: [closed]
   workflow_dispatch:
   schedule:
-    # Run every day at 11pm (PST) - cron uses UTC times
-    - cron:  '0 7 * * *'
+    # Run every day at 10pm (PST) - cron uses UTC times
+    - cron:  '0 6 * * *'
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -553,6 +553,9 @@ jobs:
     runs-on: macos-12
     steps:
     - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+      with:
+        ruby-version: '2.7'
     - name: Get token
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
           bot-access.txt "$bot_token_secret"

.github/workflows/release.yml

@@ -7,8 +7,8 @@ on:
     - '.github/workflows/release.yml'
   workflow_dispatch:
   schedule:
-    # Run every day at 11pm (PST) - cron uses UTC times
-    - cron:  '0 7 * * *'
+    # Run every day at 9pm (PST) - cron uses UTC times
+    - cron:  '0 5 * * *'
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

.github/workflows/update-cpp-sdk-on-release.yml

@@ -41,24 +41,41 @@ jobs:
 
       - name: Ensure Cocoapods repo has been updated
         run: |
-          # If the new version is simply vX.Y.Z, wait up to an hour for its podspec to be present.
-          if [[ "$GITHUB_REF" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Checking Cocoapods repo for associated Firebase ${GITHUB_REF:1} podspec."
-            podspec_url="https://github.com/CocoaPods/Specs/blob/master/Specs/0/3/5/Firebase/${GITHUB_REF:1}/Firebase.podspec.json"
+          # If the new version is simply vX.Y.Z or X.Y.Z, wait up to an hour each for its podspec and prebuilt zip file to be present.
+          if [[ "$GITHUB_REF" =~ ^v?[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            version=$(echo "$GITHUB_REF" | sed s/^v//)  # remove leading v if present
+            echo "Checking Cocoapods repo for associated Firebase ${version} podspec."
+            podspec_url="https://github.com/CocoaPods/Specs/blob/master/Specs/0/3/5/Firebase/${version}/Firebase.podspec.json"
             for retry in {1..12} error; do
               # Check every 5 minutes, up to an hour, for the new podspec to be present.
               # If it's still not present, trigger the update anyway.
               if [[ $retry == "error" ]]; then
-                echo "::warning ::Firebase ${GITHUB_REF:1} podspec not found, updating anyway."
+                echo "::warning ::Firebase ${version} podspec not found, updating anyway."
                 exit 0
               fi
               echo -n "Check ${podspec_url} (attempt ${retry}) ..."
-              curl -L -f -o /dev/null "${podspec_url}" 2> /dev/null && echo " success!" && break
+              curl -H 'Authorization: token ${{ github.token }}' -L -f -o /dev/null "${podspec_url}" 2> /dev/null && echo " success!" && break
+              echo " failed."
+              sleep 300
+            done
+            echo "Checking firebase-ios-sdk repo for ${version} prebuilt zip."
+            # Check for the zip file on this actual release URL (which might include the leading v)
+            zipfile_url="https://github.com/firebase/firebase-ios-sdk/releases/download/${GITHUB_REF}/Firebase.zip"
+            for retry in {1..12} error; do
+              # Check every 5 minutes, up to an hour, for the new zip file to be present.
+              # If it's still not present, trigger the update anyway.
+              if [[ $retry == "error" ]]; then
+                echo "::warning ::Firebase ${version} zip file not found, updating anyway."
+                exit 0
+              fi
+              echo -n "Check ${zipfile_url} (attempt ${retry}) ..."
+              # curl's "-r 0-0" option means only download the first byte, this prevents us from downloading 300+ MB.
+              curl -H 'Authorization: token ${{ github.token }}' -L -f -o /dev/null -r 0-0 "${zipfile_url}" 2> /dev/null && echo " success!" && break
               echo " failed."
               sleep 300
             done
           else
-            echo "Tag '$GITHUB_REF' doesn't match the 'vX.Y.Z' format, skipping Cocoapods repo check."
+            echo "Tag '$GITHUB_REF' doesn't match the 'vX.Y.Z' or 'X.Y.Z' format, skipping Cocoapods repo and release zip check."
           fi
 
       - name: Trigger firebase-cpp-sdk update

AddNewPod.md

@@ -68,7 +68,7 @@ For top-level Firebase pods that map to documented products:
 * Make sure the public umbrella header is imported via [Firebase.h](CoreOnly/Sources/Firebase.h)
   wrapped in `__has_include`. Follow the existing examples for details.
 * Update [Firebase.podspec](Firebase.podspec).
-* Register Objective C library via registerInternalLibrary API like this
+* Register Objective-C library via registerInternalLibrary API like this
   [AppCheck example](FirebaseAppCheck/Sources/Core/FIRAppCheck.m).
 * Register Swift library by creating a component like
   [Functions example](FirebaseFunctions/Sources/Internal/FunctionsComponent.swift) and

Crashlytics/CHANGELOG.md

@@ -1,134 +1,134 @@
-# v8.13.0
+# 8.13.0
 - [added] Updated upload-symbols to 3.11 and added logic to process Flutter project information (#9379)
 - [fixed] Added native support for ARM / M1 Macs in upload-symbols (#8965)
 - [fixed] Fixed an issue where passing nil as a value for a custom key or user ID did not clear the stored value as expected.
 
-# v8.9.0
+# 8.9.0
 - [fixed] Fixed an issue where exceptions with `nil` reasons weren't properly recorded (#8671).
 
-# v8.8.0
+# 8.8.0
 - [added] Internal SDK updates to test potential future MetricKit support.
 
-# v8.4.0
+# 8.4.0
 - [fixed] Bump Promises dependency. (#8365)
 
-# v8.3.0
+# 8.3.0
 - [fixed] Add missing dependency that could cause missing symbol build failures. (#8137)
 
-# v8.2.0
+# 8.2.0
 - [changed] Incorporated code quality changes around integer overflow, potential race conditions, and reinstalling signal handlers.
 - [fixed] Fixed an issue where iOS-only apps running on iPads would report iOS as their OS Name.
 - [fixed] Fixed depcrecation warning for projects with minimum deployment version iOS 13 and up.
 
-# v8.0.0
+# 8.0.0
 - [changed] Added a warning to upload-symbols when it detects a dSYM with hidden symbols.
 
-# v7.10.0
+# 7.10.0
 - [changed] Added a warning to upload-symbols when it detects a dSYM without any symbols.
 
-# v7.9.0
+# 7.9.0
 - [changed] Updated Firebase pod to allow iOS 9 installation via `pod 'Firebase/Crashlytics'`
 
-# v7.8.0
+# 7.8.0
 - [added] Added a new API checkAndUpdateUnsentReportsWithCompletion for updating the crash report from the previous run of the app if, for example, the developer wants to implement a feedback dialog to ask end-users for more information. Unsent Crashlytics Reports have familiar methods like setting custom keys and logs (#7503).
 - [changed] Added a limit to the number of unsent reports on disk to prevent disk filling up when automatic data collection is off. Developers can ensure this limit is never reached by calling send/deleteUnsentReports every run (#7619).
 
-# v7.7.0
+# 7.7.0
 - [added] Added a new API to allow for bulk logging of custom keys and values (#7302).
 
-# v7.6.0
+# 7.6.0
 - [fixed] Fixed an issue where some developers experienced a race condition involving binary image operations (#7459).
 
-# v7.5.0
+# 7.5.0
 - [changed] Improve start-up performance by moving some initialization work to a background thread (#7332).
 - [changed] Updated upload-symbols to a version that is notarized to avoid macOS security alerts (#7323).
 - [changed] Deleting unsent reports with deleteUnsentReports no longer happens on the main thread (#7298).
 
-# v7.4.0
+# 7.4.0
 - [changed] Removed obsolete crash reporting mechanism from the SDK (#7076).
 
-# v7.3.0
+# 7.3.0
 - [added] Added Crashlytics support for x86 apps running on Apple Silicon via Rosetta 2
 - [changed] Decreased Crashlytics CocoaPods minimum deployment target from iOS 10 to iOS 9
 - [changed] Removed obsolete API calls from upload-symbols
 - [changed] Removed obsolete onboarding calls from the SDK.
 
-# v7.1.0
+# 7.1.0
 - [fixed] Fixed an issue where symbol uploads would fail when there are spaces in the project path, particularly in Unity builds (#6789).
 - [changed] Added additional logging when settings requests fail with a 404 status to help customers debug onboarding issues (#6847).
 
-# v4.6.2
+# 4.6.2
 
 - [changed] Improved upload-symbols conversion speed. Customers with large dSYMs should see a significant improvement in the time it takes to upload Crashlytics symbols.
 - [fixed] Fixed Apple Watch crash related to `sigaction` (#6434).
 
-# v4.6.0
+# 4.6.0
 
 - [added] Added stackFrameWithAddress API for recording custom errors that are symbolicated on the backend (#5975).
 - [fixed] Fixed comment typos (#6363).
 - [fixed] Remove device information from binary image data crash info entries (#6382).
 
-# v4.5.0
+# 4.5.0
 
 - [fixed] Fixed a compiler warning and removed unused networking code (#6210).
 - [fixed] Fixed a crash that occurred rarely when trying to restart a URL session task without a valid request (#5984).
 - [added] Introduced watchOS support (#6262).
 
-# v4.3.1
+# 4.3.1
 
 - [fixed] Fixed a segmentation fault that could occur when writing crash contexts to disk (#6048).
 
-# v4.3.0
+# 4.3.0
 
 - [changed] Add dispatch_once for opening sdk log file. (#5904)
 - [changed] Functionally neutral updated import references for dependencies. (#5902)
 
-# v4.2.0
+# 4.2.0
 
 - [changed] Removed an unnecessary linker rule for embedding the Info.plist. (#5804)
 
-# v4.1.1
+# 4.1.1
 
 - [fixed] Fixed a crash that could occur if certain plist fields necessary to create Crashlytics records were missing at runtime. Also added some diagnostic logging to make the issue cause more explicit (#5565).
 
-# v4.1.0
+# 4.1.0
 
 - [fixed] Fixed unchecked `malloc`s in Crashlytics (#5428).
 - [fixed] Fixed an instance of undefined behavior when loading files from disk (#5454).
 
-# v4.0.0
+# 4.0.0
 
  - [changed] The Firebase Crashlytics SDK is now generally available.
 
-# v4.0.0-beta.7
+# 4.0.0-beta.7
 
  - [changed] Increased network timeout for symbol uploads to improve reliability on limited internet connections. (#5228)
 
-# v4.0.0-beta.6
+# 4.0.0-beta.6
 
  - [added] Added a new API to record custom exception models and stacktraces to Crashlytics. This is a replacement for the `recordCustomException` API that existed in the Fabric Crashlytics SDK (#5055)
  - [fixed] Fixed an issue with the `sendUnsentReports` API where reports wouldn't be uploaded until the method was called twice in specific instances (#5060)
  - [changed] Changed Crashlytics to use GoogleDataTransport to upload crashes (#4989)
  - [changed] Changed the origin that Crashlytics uses to register Crash events for Crash Free Users. Ensure you have installed Firebase Analytics version 6.3.1 or above (#5030)
 
-# v4.0.0-beta.5
+# 4.0.0-beta.5
 
 - [changed] Changed two endpoints in the Firebase Crashlytics SDK with no expected end-user impact (#4953, #4988).
 
-# v4.0.0-beta.4
+# 4.0.0-beta.4
 
 - [fixed] Fixed symbol collisions with the legacy Fabric Crashlytics SDK and added a warning not to include both (#4753, #4755)
 - [fixed] Added crash prevention checks (#4661)
 
-# v4.0.0-beta.3
+# 4.0.0-beta.3
 
 - [fixed] Fixed an import declaration for installing Crashlytics. Previously, the declaration caused a compile error when you installed using CocoaPods with the `generate_multiple_pods_project` flag set to true (#4786)
 
-# v4.0.0-beta.2
+# 4.0.0-beta.2
 
 - [fixed] Fixed VeraCode scanner issues for unchecked error conditions (#4669)
 
-# v4.0.0-beta.1
+# 4.0.0-beta.1
 
 This Firebase Crashlytics version includes the initial beta release of the Firebase Crashlytics SDK:
 

Crashlytics/Crashlytics/Controllers/FIRCLSExistingReportManager.m

@@ -151,9 +151,12 @@ - (NSUInteger)unsentReportsCount {
   // which should be at the start of the array.
   if (validReports.count > FIRCLSMaxUnsentReports) {
     NSUInteger deletingCount = validReports.count - FIRCLSMaxUnsentReports;
-    FIRCLSInfoLog(@"Deleting %lu unsent reports over the limit of %lu to prevent disk space from "
-                  @"filling up. To prevent this make sure to call send/deleteUnsentReports.",
-                  deletingCount, FIRCLSMaxUnsentReports);
+    FIRCLSInfoLog(
+        @"Automatic data collection is disabled. Deleting %lu unsent reports over the limit of %lu "
+        @"to prevent disk space from "
+        @"filling up. To take action on these reports, call send/deleteUnsentReports. To turn on "
+        @"automatic data collection, call setCrashlyticsCollectionEnabled with true",
+        deletingCount, FIRCLSMaxUnsentReports);
   }
 
   // Not that validReports is sorted, delete any reports at indices > MAX_UNSENT_REPORTS, and

Dangerfile

@@ -35,6 +35,7 @@ end
 # multiple directories may have multiple labels.
 def labelsForModifiedFiles()
   labels = []
+  labels.push("api: analytics") if @has_analytics_changes
   labels.push("api: abtesting") if @has_abtesting_changes
   labels.push("api: appcheck") if @has_appcheck_changes
   labels.push("api: appdistribution") if @has_appdistribution_changes
@@ -70,6 +71,18 @@ has_changelog_changes = hasChangesIn(["CHANGELOG"])
 has_license_changes = didModify(["LICENSE"])
 
 ## Product directories
+@has_analytics_changes = hasChangesIn([
+  "FirebaseAnalyticsOnDeviceConversionWrapper",
+  "FirebaseAnalyticsSwift",
+  "FirebaseAnalyticsWithoutAdIdSupportWrapper",
+  "FirebaseAnalyticsWrapper"
+]) || didModify([
+  "FirebaseAnalytics.podspec.json",
+  "FirebaseAnalyticsSwift.podspec",
+  "FirebaseAnalyticsOnDeviceConversion.podspec",
+  "GoogleAppMeasurement.podspec.json",
+  "GoogleAppMeasurementOnDeviceConversion.podspec.json"
+])
 @has_abtesting_changes = hasChangesIn("FirebaseABTesting")
 @has_abtesting_api_changes = hasChangesIn("FirebaseABTesting/Sources/Public/")
 @has_appcheck_changes = hasChangesIn("FirebaseAppCheck")