Merge branch 'fireperf-aqs' into td/aqs-usage

Author: tejasd

.github/workflows/dataconnect.yml

@@ -64,15 +64,16 @@ jobs:
         with:
           node-version: ${{ env.FDC_NODEJS_VERSION }}
 
-      - name: install firebase-tools
+      - name: Install Firebase Tools ("firebase" command-line tool)
         run: |
+          set -euo pipefail
           set -v
           mkdir -p ${{ env.FDC_FIREBASE_TOOLS_DIR }}
           cd ${{ env.FDC_FIREBASE_TOOLS_DIR }}
           echo '{}' > package.json
           npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
 
-      - name: Restore Gradle cache
+      - name: Restore Gradle Cache
         id: restore-gradle-cache
         uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2
         if: github.event_name != 'schedule'
@@ -84,9 +85,11 @@ jobs:
           restore-keys: |
             gradle-cache-jqnvfzw6w7-
 
-      - name: tool versions
+      - name: Print Command-Line Tool Versions
         continue-on-error: true
         run: |
+          set -euo pipefail
+
           function run_cmd {
             echo "==============================================================================="
             echo "Running Command: $*"
@@ -105,6 +108,7 @@ jobs:
 
       - name: Gradle assembleDebugAndroidTest
         run: |
+          set -euo pipefail
           set -v
 
           # Speed up build times and also avoid configuring firebase-crashlytics-ndk
@@ -117,23 +121,24 @@ jobs:
             ${{ (inputs.gradleInfoLog && '--info') || '' }} \
             :firebase-dataconnect:assembleDebugAndroidTest
 
-      - name: Save Gradle cache
+      - name: Save Gradle Cache
         uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2
         if: github.event_name == 'schedule'
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ steps.restore-gradle-cache.outputs.cache-primary-key }}
+          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
 
-      - name: Enable KVM group permissions for Android Emulator
+      - name: Enable KVM Group Permissions for Android Emulator
         run: |
+          set -euo pipefail
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
             | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Restore AVD cache
+      - name: Restore AVD Cache
         uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2
         if: github.event_name != 'schedule'
         id: restore-avd-cache
@@ -146,28 +151,30 @@ jobs:
             avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-
 
       - name: Create AVD
-        if: github.event_name == 'schedule' || steps.restore-avd-cache.outputs.cache-hit != 'true'
+        if: github.event_name == 'schedule' || steps.restore-avd-cache.outputs.cache-matched-key == ''
         uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
           arch: x86_64
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: echo "Generated AVD snapshot for caching."
+          script: 'echo "Generated AVD snapshot for caching; event_name=${{ github.event_name }}, cache-matched-key=${{ steps.restore-avd-cache.outputs.cache-matched-key }}"'
 
-      - name: Save AVD cache
+      - name: Save AVD Cache
         uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2
         if: github.event_name == 'schedule'
         with:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: ${{ steps.restore-avd-cache.outputs.cache-primary-key }}
+          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
 
-      - name: Data Connect Emulator
+      - name: Data Connect Emulator Start
+        id: data-connect-emulator
         run: |
-          set -x
+          set -euo pipefail
+          set -xv
 
           echo 'emulator.postgresConnectionUrl=postgresql://postgres:[email protected]:5432?sslmode=disable' > firebase-dataconnect/dataconnect.local.properties
 
@@ -176,14 +183,29 @@ jobs:
             :firebase-dataconnect:connectors:runDebugDataConnectEmulator \
             >firebase.emulator.dataconnect.log 2>&1 &
 
-      - name: Firebase Auth Emulator
+          echo "FIREBASE_DATA_CONNECT_EMULATOR_PID=$!" >> "$GITHUB_ENV"
+
+      - name: Firebase Auth Emulator Start
+        id: firebase-auth-emulator
         run: |
-          set -x
+          set -euo pipefail
+          set -xv
+
           cd firebase-dataconnect/emulator
           ${{ env.FDC_FIREBASE_COMMAND }} emulators:start --only=auth >firebase.emulator.auth.log 2>&1 &
 
-      - name: Capture Logcat Logs
-        run: adb logcat >logcat.log &
+          echo "FIREBASE_AUTH_EMULATOR_PID=$!" >> "$GITHUB_ENV"
+
+      - name: Logcat Log Capture Start
+        id: logcat-capture
+        continue-on-error: true
+        run: |
+          set -euo pipefail
+          set -xv
+
+          "$ANDROID_HOME/platform-tools/adb" logcat >logcat.log 2>&1 &
+
+          echo "LOGCAT_PID=$!" >> "$GITHUB_ENV"
 
       - name: Gradle connectedCheck
         id: connectedCheck
@@ -201,25 +223,26 @@ jobs:
           script: |
             set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
 
-      - name: Upload log file artifacts
+      - name: Upload Log Files
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: integration_test_logs
           path: "**/*.log"
           if-no-files-found: warn
           compression-level: 9
 
-      - name: Upload Gradle build report artifacts
+      - name: Upload Gradle Build Reports
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: integration_test_gradle_build_reports
           path: firebase-dataconnect/**/build/reports/
           if-no-files-found: warn
           compression-level: 9
 
-      - name: Verify "Gradle connectedCheck" step was successful
+      - name: Verify "Gradle connectedCheck" Step Was Successful
         if: steps.connectedCheck.outcome != 'success'
         run: |
+          set -euo pipefail
           echo 'Failing because the outcome of the "Gradle connectedCheck" step ("${{ steps.connectedCheck.outcome }}") was not successful'
           exit 1
 

firebase-dataconnect/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Unreleased
-* [changed] Removed the "beta" suffix from the version of the Firebase Data
-  Connect Android SDK, thus graduating it from "beta" to "generally available".
-  ([#6792](https://github.com/firebase/firebase-android-sdk/pull/6792))
+
+
+# 16.0.0
 * [changed] DataConnectOperationException added, enabling support for partial
   errors; that is, any data that was received and/or was able to be decoded is
   now available via the "response" property of the exception thrown when a
@@ -80,3 +80,4 @@
   ([#6299](https://github.com/firebase/firebase-android-sdk/pull/6299))
 * [changed] Added `equals` and `hashCode` methods to `GeneratedConnector`.
   ([#6177](https://github.com/firebase/firebase-android-sdk/pull/6177))
+

firebase-dataconnect/gradle.properties

@@ -1,2 +1,2 @@
-version=16.0.0
-latestReleasedVersion=16.0.0-beta05
+version=16.0.1
+latestReleasedVersion=16.0.0

firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/QuerySubscriptionIntegrationTest.kt

@@ -483,9 +483,7 @@ class QuerySubscriptionIntegrationTest : DataConnectIntegrationTestBase() {
     val noName1Query =
       schema.getPerson(personId).withDataDeserializer(serializer<GetPersonDataNoName1>())
 
-    backgroundScope.launch { noName1Query.subscribe().flow.collect() }
-
-    noName1Query.execute()
+    keepCacheAlive(noName1Query)
 
     schema.updatePerson(id = personId, name = "Name1").execute()
 
@@ -571,7 +569,7 @@ class QuerySubscriptionIntegrationTest : DataConnectIntegrationTestBase() {
    */
   private suspend fun TestScope.keepCacheAlive(query: QueryRef<*, *>) {
     val cachePrimed = SuspendingFlag()
-    backgroundScope.launch { query.subscribe().flow.onEach { cachePrimed.set() }.collect() }
+    backgroundScope.launch { query.subscribe().flow.collect { cachePrimed.set() } }
     cachePrimed.await()
   }
 

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/serializers/LocalDateSerializerUnitTest.kt

@@ -205,7 +205,11 @@ class LocalDateSerializerUnitTest {
     }
 
     fun Arb.Companion.unparseableDash(): Arb<String> {
-      val invalidString = string(1..5, codepoints.filterNot { it.value == '-'.code })
+      val invalidString =
+        string(
+          1..5,
+          codepoints.filterNot { it.value == '-'.code || it.value in '0'.code..'9'.code }
+        )
       return arbitrary { rs ->
         val flags = Array(3) { rs.random.nextBoolean() }
         if (!flags[0]) {

firebase-functions/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Unreleased
+
+
+# 21.2.1
 * [fixed] Fixed issue that caused the SDK to crash when trying to stream a function that does not exist.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-functions` library. The Kotlin extensions library has no additional
+updates.
+
 # 21.2.0
 * [feature] Streaming callable functions are now supported.
 * [fixed] Fixed an issue that prevented the App Check token from being handled correctly in case of error.
@@ -235,3 +244,4 @@ updates.
 optional region to override the default "us-central1".
 * [feature] New `useFunctionsEmulator` method allows testing against a local
 instance of the [Cloud Functions Emulator](https://firebase.google.com/docs/functions/local-emulator).
+

firebase-functions/gradle.properties

@@ -1,3 +1,3 @@
-version=21.2.1
-latestReleasedVersion=21.2.0
+version=21.2.2
+latestReleasedVersion=21.2.1
 android.enableUnitTestBinaryResources=true

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java

@@ -46,7 +46,6 @@
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import com.google.firebase.sessions.BuildConfig;
 import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
@@ -97,8 +96,6 @@ public class FirebasePerformance implements FirebasePerformanceAttributable {
   // once during initialization and cache it.
   private final ImmutableBundle mMetadataBundle;
 
-  private final SessionSubscriber sessionSubscriber;
-
   /** Valid HttpMethods for manual network APIs */
   @StringDef({
     HttpMethod.GET,
@@ -172,7 +169,6 @@ public static FirebasePerformance getInstance() {
       this.mPerformanceCollectionForceEnabledState = false;
       this.configResolver = configResolver;
       this.mMetadataBundle = new ImmutableBundle(new Bundle());
-      this.sessionSubscriber = new FirebasePerformanceSessionSubscriber(false);
       return;
     }
     DebugEnforcementCheck.setEnforcement(BuildConfig.DEBUG);
@@ -190,9 +186,8 @@ public static FirebasePerformance getInstance() {
     sessionManager.setApplicationContext(appContext);
 
     mPerformanceCollectionForceEnabledState = configResolver.getIsPerformanceCollectionEnabled();
-    this.sessionSubscriber =
-        new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled());
-    FirebaseSessionsDependencies.register(this.sessionSubscriber);
+    FirebaseSessionsDependencies.register(
+        new FirebasePerformanceSessionSubscriber(isPerformanceCollectionEnabled()));
 
     if (logger.isLogcatEnabled() && isPerformanceCollectionEnabled()) {
       logger.info(
@@ -468,10 +463,4 @@ private static ImmutableBundle extractMetadata(Context appContext) {
   Boolean getPerformanceCollectionForceEnabledState() {
     return mPerformanceCollectionForceEnabledState;
   }
-
-  @NonNull
-  @VisibleForTesting
-  SessionSubscriber getSessionSubscriber() {
-    return sessionSubscriber;
-  }
 }