review cleanup

Author: kevmoo

lib/src/common/environment.dart

@@ -87,6 +87,28 @@ class FirebaseEnv {
   ///
   /// Uses the [PORT] environment variable, defaulting to 8080.
   int get port => int.tryParse(environment['PORT'] ?? '8080') ?? 8080;
+
+  /// The name of the Cloud Run service.
+  ///
+  /// Uses the `K_SERVICE` environment variable.
+  ///
+  /// See https://cloud.google.com/run/docs/container-contract#env-vars
+  String? get kService => environment['K_SERVICE'];
+
+  /// The name of the target function.
+  ///
+  /// Uses the `FUNCTION_TARGET` environment variable.
+  ///
+  /// See https://docs.cloud.google.com/run/docs/configuring/services/environment-variables#additional_reserved_environment_variables_when_deploying_functions
+  String? get functionTarget => environment['FUNCTION_TARGET'];
+
+  /// Whether the functions control API is enabled.
+  ///
+  /// Uses the `FUNCTIONS_CONTROL_API` environment variable.
+  ///
+  /// This is part of the contract with `firebase-tools`.
+  bool get functionsControlApi =>
+      environment['FUNCTIONS_CONTROL_API'] == 'true';
 }
 
 /// Common project ID environment variables checked in order.

lib/src/firebase.dart

@@ -255,5 +255,5 @@ abstract class FunctionsNamespace {
 /// Internal extension to access private members of Firebase.
 @internal
 extension FirebaseInternal on Firebase {
-  FirebaseEnv get envInternal => _env;
+  FirebaseEnv get $env => _env;
 }

lib/src/https/https_namespace.dart

@@ -100,7 +100,7 @@ class HttpsNamespace extends FunctionsNamespace {
       }
 
       // Extract auth and app check tokens
-      final skipVerification = firebase.envInternal.skipTokenVerification;
+      final skipVerification = firebase.$env.skipTokenVerification;
       final tokens = await checkTokens(
         request,
         skipTokenVerification: skipVerification,
@@ -180,7 +180,7 @@ class HttpsNamespace extends FunctionsNamespace {
       final body = await request.json as Map<String, dynamic>?;
 
       // Extract auth and app check tokens
-      final skipVerification = firebase.envInternal.skipTokenVerification;
+      final skipVerification = firebase.$env.skipTokenVerification;
       final tokens = await checkTokens(
         request,
         skipTokenVerification: skipVerification,

lib/src/identity/identity_namespace.dart

@@ -276,20 +276,18 @@ class IdentityNamespace extends FunctionsNamespace {
   /// skipTokenVerification debug feature is enabled), verification is skipped.
   Future<Map<String, dynamic>> _decodeAndVerifyJwt(String jwt) async {
     // Get project ID
-    final projectId = firebase.envInternal.projectId;
+    final projectId = firebase.$env.projectId;
 
     // Create verifier
     final verifier = AuthBlockingTokenVerifier(
       projectId: projectId,
       isEmulator:
-          firebase.envInternal.isEmulator ||
-          firebase.envInternal.skipTokenVerification,
+          firebase.$env.isEmulator || firebase.$env.skipTokenVerification,
     );
 
     // Determine audience based on platform
     // Cloud Run uses "run.app", GCF v1 uses default
-    final kService =
-        firebase.envInternal.environment['K_SERVICE']; // Cloud Run service name
+    final kService = firebase.$env.kService; // Cloud Run service name
     final audience = kService != null ? 'run.app' : null;
 
     return verifier.verifyToken(jwt, audience: audience);

lib/src/server.dart

@@ -46,7 +46,7 @@ typedef FunctionsRunner = FutureOr<void> Function(Firebase firebase);
 /// ```
 Future<void> fireUp(List<String> args, FunctionsRunner runner) async {
   final firebase = Firebase();
-  final env = firebase.envInternal;
+  final env = firebase.$env;
   final projectId = env.projectId;
 
   await runZoned(zoneValues: {projectIdZoneKey: projectId}, () async {
@@ -60,7 +60,7 @@ Future<void> fireUp(List<String> args, FunctionsRunner runner) async {
           final traceHeader = request.headers[cloudTraceContextHeader];
           String? traceId;
           if (traceHeader != null) {
-            traceId = 'projects/$projectId/traces/${traceHeader.split('/')[0]}';
+            traceId = traceHeader.split('/')[0];
           }
 
           if (traceId == null) {
@@ -127,15 +127,14 @@ FutureOr<Response> _routeRequest(
     return _handleQuitQuitQuit(request);
   }
 
-  if (requestPath == '__/functions.yaml' &&
-      env.environment['FUNCTIONS_CONTROL_API'] == 'true') {
+  if (requestPath == '__/functions.yaml' && env.functionsControlApi) {
     // Manifest endpoint for function discovery
     return _handleFunctionsManifest(request, firebase);
   }
 
   // FUNCTION_TARGET mode (production): Serve only the specified function
   // This matches Node.js behavior where each Cloud Run service runs one function
-  final functionTarget = env.environment['FUNCTION_TARGET'];
+  final functionTarget = env.functionTarget;
   if (functionTarget != null && functionTarget.isNotEmpty) {
     return _routeToTargetFunction(request, firebase, env, functionTarget);
   }

test/unit/logger_test.dart

@@ -293,7 +293,7 @@ void main() {
 
     group('trace context', () {
       test(
-        'should add trace header when traceId is in Zone',
+        'should add trace header when both projectId and traceId are in Zone',
         () {
           runZoned(
             () {
@@ -306,12 +306,47 @@ void main() {
               });
             },
             zoneValues: {
+              projectIdZoneKey: 'test-project',
               traceIdZoneKey: 'abc123',
-              // Simulate GCLOUD_PROJECT env var via a zone-aware override
             },
           );
         },
-        skip: 'Requires GCLOUD_PROJECT env var to be set',
+      );
+
+      test(
+        'should not add trace header when projectId is missing in Zone',
+        () {
+          runZoned(
+            () {
+              testLogger.write({'severity': 'INFO', 'message': 'traced'});
+              expect(parseStdout(), {
+                'severity': 'INFO',
+                'message': 'traced',
+              });
+            },
+            zoneValues: {
+              traceIdZoneKey: 'abc123',
+            },
+          );
+        },
+      );
+
+      test(
+        'should not add trace header when traceId is missing in Zone',
+        () {
+          runZoned(
+            () {
+              testLogger.write({'severity': 'INFO', 'message': 'traced'});
+              expect(parseStdout(), {
+                'severity': 'INFO',
+                'message': 'traced',
+              });
+            },
+            zoneValues: {
+              projectIdZoneKey: 'test-project',
+            },
+          );
+        },
       );
     });
   });