dataconnect(change): merge "X-Client-Platform" header into "X-Client-Version" (#8495)

Author: dconeybe

firebase-dataconnect/CHANGELOG.md

@@ -7,9 +7,10 @@
   [#8446](https://github.com/firebase/firebase-android-sdk/pull/8446),
   [#8456](https://github.com/firebase/firebase-android-sdk/pull/8456),
   [#8460](https://github.com/firebase/firebase-android-sdk/pull/8460))
-- [changed] Add grpc request headers for platform name and sdk version
+- [changed] Add grpc request header for platform name and sdk version
   to enable metrics collection in cloud monitoring.
-  ([#8486](https://github.com/firebase/firebase-android-sdk/pull/8486))
+  ([#8486](https://github.com/firebase/firebase-android-sdk/pull/8486),
+  [#8495](https://github.com/firebase/firebase-android-sdk/pull/8495))
 - [changed] Wait for 15 seconds before closing realtime streaming connection
   with backend after last subscriber unsubscribes (instead of closing the
   connection immediately).

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

@@ -328,7 +328,6 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
         .shouldContainAll(
           googRequestParamsHeader.name(),
           googApiClientHeader.name(),
-          clientPlatformHeader.name(),
           clientVersionHeader.name(),
         )
       assertSoftly {
@@ -338,8 +337,7 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
           "location=${dataConnect.config.location}&frontend=data"
         metadata.get(googApiClientHeader) shouldBe expectedGoogApiClientHeader(isFromGeneratedSdk)
         metadata.get(gmpAppIdHeader) shouldBe expectedAppId
-        metadata.get(clientPlatformHeader) shouldBe "android"
-        metadata.get(clientVersionHeader) shouldBe BuildConfig.VERSION_NAME
+        metadata.get(clientVersionHeader) shouldBe "android/${BuildConfig.VERSION_NAME}"
       }
     }
   }
@@ -478,9 +476,6 @@ class GrpcMetadataIntegrationTest : DataConnectIntegrationTestBase() {
     val googApiClientHeader: Metadata.Key<String> =
       Metadata.Key.of("x-goog-api-client", Metadata.ASCII_STRING_MARSHALLER)
 
-    val clientPlatformHeader: Metadata.Key<String> =
-      Metadata.Key.of("x-client-platform", Metadata.ASCII_STRING_MARSHALLER)
-
     val clientVersionHeader: Metadata.Key<String> =
       Metadata.Key.of("x-client-version", Metadata.ASCII_STRING_MARSHALLER)
 

firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcMetadata.kt

@@ -83,8 +83,7 @@ internal class DataConnectGrpcMetadata(
       Metadata().also {
         it.put(googRequestParamsHeader, googRequestParamsHeaderValue)
         it.put(googApiClientHeader, googApiClientHeaderValue(callerSdkType))
-        it.put(clientPlatformHeader, "android")
-        it.put(clientVersionHeader, dataConnectSdkVersion)
+        it.put(clientVersionHeader, "android/$dataConnectSdkVersion")
         if (appId.isNotBlank()) {
           it.put(gmpAppIdHeader, appId)
         }
@@ -184,9 +183,6 @@ internal class DataConnectGrpcMetadata(
     private val googApiClientHeader: Metadata.Key<String> =
       Metadata.Key.of(GOOG_API_CLIENT_HEADER, Metadata.ASCII_STRING_MARSHALLER)
 
-    private val clientPlatformHeader: Metadata.Key<String> =
-      Metadata.Key.of("x-client-platform", Metadata.ASCII_STRING_MARSHALLER)
-
     private val clientVersionHeader: Metadata.Key<String> =
       Metadata.Key.of("x-client-version", Metadata.ASCII_STRING_MARSHALLER)
 

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcMetadataUnitTest.kt

@@ -134,13 +134,6 @@ class DataConnectGrpcMetadataUnitTest {
       getExpectedHeaderValue = { "location=q8mgtztcz2&frontend=data" },
     )
 
-  @Test
-  fun `should include x-client-platform`() =
-    testMetadataIncludesHeader(
-      headerName = "x-client-platform",
-      getExpectedHeaderValue = { "android" },
-    )
-
   @Test
   fun `should include x-client-version`() =
     testMetadataIncludesHeader(
@@ -149,7 +142,7 @@ class DataConnectGrpcMetadataUnitTest {
           dataConnectSdkVersion = Arb.constant("v3q46qc2ax"),
         ),
       headerName = "x-client-version",
-      getExpectedHeaderValue = { "v3q46qc2ax" },
+      getExpectedHeaderValue = { "android/v3q46qc2ax" },
     )
 
   @Test

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcRPCsUnitTest.kt

@@ -829,46 +829,25 @@ class DataConnectGrpcRPCsUnitTest {
     }
   }
 
-  @Test
-  fun `executeQuery sends x-client-platform header`() =
-    testExecuteQuerySendsHeader(
-      headerName = "x-client-platform",
-      getExpectedHeaderValue = { "android" },
-    )
-
   @Test
   fun `executeQuery sends x-client-version header`() =
     testExecuteQuerySendsHeader(
       headerName = "x-client-version",
-      getExpectedHeaderValue = { it.grpcMetadata.dataConnectSdkVersion },
-    )
-
-  @Test
-  fun `executeMutation sends x-client-platform header`() =
-    testExecuteMutationSendsHeader(
-      headerName = "x-client-platform",
-      getExpectedHeaderValue = { "android" },
+      getExpectedHeaderValue = { "android/${it.grpcMetadata.dataConnectSdkVersion}" },
     )
 
   @Test
   fun `executeMutation sends x-client-version header`() =
     testExecuteMutationSendsHeader(
       headerName = "x-client-version",
-      getExpectedHeaderValue = { it.grpcMetadata.dataConnectSdkVersion },
-    )
-
-  @Test
-  fun `connect sends x-client-platform header`() =
-    testConnectSendsHeader(
-      headerName = "x-client-platform",
-      getExpectedHeaderValue = { "android" },
+      getExpectedHeaderValue = { "android/${it.grpcMetadata.dataConnectSdkVersion}" },
     )
 
   @Test
   fun `connect sends x-client-version header`() =
     testConnectSendsHeader(
       headerName = "x-client-version",
-      getExpectedHeaderValue = { it.grpcMetadata.dataConnectSdkVersion },
+      getExpectedHeaderValue = { "android/${it.grpcMetadata.dataConnectSdkVersion}" },
     )
 
   private fun testExecuteQuerySendsHeader(