fix(admin): attach usage-tracking headers to Firestore requests

packages/firebase_admin_sdk/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 0.5.4-wip
 
+- Fixed `Firestore` requests not carrying the SDK's usage-tracking headers (`X-Firebase-Client`, `X-Goog-Api-Client`).
 - Update dependency `googleapis_auth: ^2.3.3` to fix `auth/insufficient-permission`
   errors with Application Default Credentials that have no quota project set.
 

packages/firebase_admin_sdk/lib/src/app.dart

@@ -35,7 +35,6 @@ import '../messaging.dart';
 import '../security_rules.dart';
 import '../storage.dart';
 import 'utils/utils.dart';
-import 'version.g.dart';
 
 part 'app/app_exception.dart';
 part 'app/app_options.dart';

packages/firebase_admin_sdk/lib/src/app/firebase_user_agent_client.dart

@@ -32,9 +32,7 @@ class FirebaseUserAgentClient extends BaseClient
 
   @override
   Future<StreamedResponse> send(BaseRequest request) {
-    request.headers['X-Firebase-Client'] = 'fire-admin-dart/$packageVersion';
-    request.headers['X-Goog-Api-Client'] =
-        'gl-dart/$dartVersion fire-admin/$packageVersion';
+    request.headers.addAll(firebaseUserAgentHeaders);
     return _client.send(request);
   }
 

packages/firebase_admin_sdk/lib/src/firestore/firestore.dart

@@ -19,6 +19,7 @@ import 'package:google_cloud_firestore/google_cloud_firestore.dart'
 import 'package:meta/meta.dart';
 
 import '../app.dart';
+import '../utils/utils.dart';
 
 /// Default database ID used by Firestore
 const String kDefaultDatabaseId = '(default)';
@@ -152,6 +153,10 @@ class Firestore implements FirebaseService {
       settings = settings.copyWith(projectId: projectId);
     }
 
+    if (settings.headers == null) {
+      settings = settings.copyWith(headers: firebaseUserAgentHeaders);
+    }
+
     return settings;
   }
 

packages/firebase_admin_sdk/lib/src/utils/utils.dart

@@ -14,10 +14,24 @@
 
 import 'dart:io';
 
+import '../version.g.dart';
+
 /// The current Dart SDK version in semver format (e.g. "3.3.0").
 String get dartVersion =>
     Platform.version.split(RegExp('[^0-9]')).take(3).join('.');
 
+/// Headers that identify a request as originating from this SDK, for
+/// Firebase backend usage tracking.
+///
+/// Shared by `FirebaseUserAgentClient` (used by Auth, Messaging, and other
+/// services that go through `FirebaseApp.client`) and the Firestore service,
+/// which builds its own HTTP client and can't be wrapped by
+/// `FirebaseUserAgentClient` directly.
+Map<String, String> get firebaseUserAgentHeaders => {
+  'X-Firebase-Client': 'fire-admin-dart/$packageVersion',
+  'X-Goog-Api-Client': 'gl-dart/$dartVersion fire-admin/$packageVersion',
+};
+
 /// Generates the update mask for the provided object.
 /// Note this will ignore the last key with value `null`.
 List<String> _generateUpdateMask(Object? obj, String root) {