Merge branch 'main' into mila/client-side-metrics-demo2

google-cloud-firestore/clirr-ignored-differences.xml

@@ -314,19 +314,17 @@
     <method>com.google.cloud.firestore.Query getQuery()</method>
   </difference>
 
-    <!-- Relocate constants in TraceUtil -->
+  <difference>
+    <className>com/google/cloud/firestore/StreamableQuery</className>
+    <differenceType>7009</differenceType>
+    <method>void internalStream(*)</method>
+  </difference>
+
+  <!-- Relocate constants in TraceUtil -->
   <difference>
     <differenceType>6011</differenceType>
     <className>com/google/cloud/firestore/telemetry/TraceUtil</className>
     <field>SPAN_NAME_*</field>
   </difference>
 
-  <!-- Change the parameter type of internalStream function -->
-  <difference>
-    <differenceType>7005</differenceType>
-    <className>com/google/cloud/firestore/StreamableQuery</className>
-    <method>* internalStream(com.google.api.gax.rpc.ApiStreamObserver, long, com.google.protobuf.ByteString, com.google.cloud.Timestamp, com.google.cloud.firestore.ExplainOptions, boolean)</method>
-    <to>*</to>
-  </difference>
-
 </differences>

google-cloud-firestore/src/main/java/com/google/cloud/firestore/StreamableQuery.java

@@ -303,7 +303,7 @@ public void onCompleted() {
     }
   }
 
-  protected void internalStream(
+  void internalStream(
       final MonitoredStreamResponseObserver streamResponseObserver,
       final long startTimeNanos,
       @Nullable final ByteString transactionId,