Merge branch 'main' into davidmotson.ai_monitoring

Author: davidmotson

ci/fireci/fireciplugins/api_information.py

@@ -37,9 +37,9 @@ def api_information(auth_token, repo_name, issue_number):
     with open(os.path.join(dir_suffix, filename), 'r') as f:
       outputlines = f.readlines()
       for line in outputlines:
-        if 'error' in line:
+        if 'error:' in line:
           formatted_output_lines.append(line[line.find('error:'):])
-        elif 'warning' in line:
+        elif 'warning:' in line:
           formatted_output_lines.append(line[line.find('warning:'):])
 
     if formatted_output_lines:

firebase-functions/src/androidTest/java/com/google/firebase/functions/StreamTests.kt

@@ -128,14 +128,14 @@ class StreamTests {
   fun genStreamError_receivesError() = runBlocking {
     val input = mapOf("data" to "test error")
     val function =
-      functions.getHttpsCallable("genStreamError").withTimeout(2000, TimeUnit.MILLISECONDS)
+      functions.getHttpsCallable("genStreamError").withTimeout(10_000, TimeUnit.MILLISECONDS)
     val subscriber = StreamSubscriber()
 
     function.stream(input).subscribe(subscriber)
 
-    withTimeout(2000) {
+    withTimeout(10_000) {
       while (subscriber.throwable == null) {
-        delay(100)
+        delay(1_000)
       }
     }