From e757a33c03dbc6708b61e0bbfd88564f1d418c5e Mon Sep 17 00:00:00 2001
From: Tejas Deshpande <tdeshpande@google.com>
Date: Tue, 15 Jul 2025 15:18:54 -0400
Subject: [PATCH 1/3] Bump up minor version for fireperf

---
 firebase-perf/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firebase-perf/gradle.properties b/firebase-perf/gradle.properties
index 890136d83a4..05fe0803708 100644
--- a/firebase-perf/gradle.properties
+++ b/firebase-perf/gradle.properties
@@ -15,7 +15,7 @@
 #
 #
 
-version=22.0.0
+version=22.1.0
 latestReleasedVersion=21.0.5
 android.enableUnitTestBinaryResources=true
 

From f05d908c40acc0fe6fd89edfb5d823c4d12042e0 Mon Sep 17 00:00:00 2001
From: Tejas Deshpande <tdeshpande@google.com>
Date: Tue, 15 Jul 2025 15:27:45 -0400
Subject: [PATCH 2/3] Add CHANGELOG entry

---
 firebase-perf/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/firebase-perf/CHANGELOG.md b/firebase-perf/CHANGELOG.md
index bcae68e09ad..425fa2e7092 100644
--- a/firebase-perf/CHANGELOG.md
+++ b/firebase-perf/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Unreleased
+* [changed] Updated `firebase-sessions` dependency to v3.0.0
+* [fixed] Fixed the issues around unifying the sessions in `firebase-sessions` 
+  and`firebase-performance`.
+
+# 22.0.0
 * [changed] **Breaking Change**: Updated minSdkVersion to API level 23 or higher.
 * [removed] **Breaking Change**: Stopped releasing the deprecated Kotlin extensions
   (KTX) module and removed it from the Firebase Android BoM. Instead, use the KTX APIs

From 07d09b1e0d2718b608a51b54cd30cb2264c38639 Mon Sep 17 00:00:00 2001
From: Tejas Deshpande <tdeshpande@google.com>
Date: Thu, 17 Jul 2025 11:43:47 -0400
Subject: [PATCH 3/3] Add flaky test TODO

---
 .../google/firebase/perf/session/gauges/GaugeManagerTest.java    | 1 +
 .../com/google/firebase/perf/transport/TransportManagerTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
index c111f5fb7a2..64a4586f896 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/session/gauges/GaugeManagerTest.java
@@ -402,6 +402,7 @@ public void testGaugeCounterIsDecrementedWhenLogged() {
   }
 
   @Test
+  // TODO(b/394127311): Investigate flaky test.
   public void testDuplicateGaugeLoggingIsAvoided() {
     int priorGaugeCounter = GaugeCounter.count();
     PerfSession fakeSession = createTestSession(1);
diff --git a/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java b/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
index 07b50c4377d..e50a8a445c1 100644
--- a/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
+++ b/firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java
@@ -219,6 +219,7 @@ public void invalidGaugeMetric_transportNotInitialized_notLoggedAfterInitializat
   }
 
   @Test
+  // TODO(b/394127311): Investigate flaky test.
   public void
       logMultipleEvents_transportNotInitialized_validEventsGetLoggedInOrderAfterInitialization() {
     initializeTransport(false);