Change naming from transport to Fl.

Author: zijianjoy

packages/performance/src/services/perf_logger.test.ts

@@ -338,8 +338,8 @@ describe('Performance Monitoring > perf_logger', () => {
       expect(addToQueueStub).not.called;
     });
 
-    it('skips performance collection if domain is transport', () => {
-      const TRANSPORT_NETWORK_PERFORMANCE_ENTRY: PerformanceResourceTiming = {
+    it('skips performance collection if domain is fl', () => {
+      const FL_NETWORK_PERFORMANCE_ENTRY: PerformanceResourceTiming = {
         connectEnd: 0,
         connectStart: 0,
         decodedBodySize: 0,
@@ -370,7 +370,7 @@ describe('Performance Monitoring > perf_logger', () => {
       SettingsService.getInstance().loggingEnabled = true;
       SettingsService.getInstance().logNetworkAfterSampling = true;
       // Calls logNetworkRequest under the hood.
-      createNetworkRequestEntry(TRANSPORT_NETWORK_PERFORMANCE_ENTRY);
+      createNetworkRequestEntry(FL_NETWORK_PERFORMANCE_ENTRY);
       clock.tick(1);
 
       expect(addToQueueStub).not.called;

packages/performance/src/services/perf_logger.ts

@@ -157,12 +157,11 @@ export function logNetworkRequest(networkRequest: NetworkRequest): void {
 
   // Blacklist old log endpoint and new transport endpoint.
   const logEndpointHostName = new URL(settingsService.logEndPointUrl).hostname;
-  const transportEndpointHostName = new URL(
-    settingsService.transportEndpointUrl
-  ).hostname;
+  const flEndpointHostName = new URL(settingsService.flTransportEndpointUrl)
+    .hostname;
   if (
     networkRequestHostName === logEndpointHostName ||
-    networkRequestHostName === transportEndpointHostName
+    networkRequestHostName === flEndpointHostName
   ) {
     return;
   }

packages/performance/src/services/remote_config_service.test.ts

@@ -20,7 +20,7 @@ import { SettingsService } from './settings_service';
 import { CONFIG_EXPIRY_LOCAL_STORAGE_KEY } from '../constants';
 import { setupApi, Api } from './api_service';
 import * as iidService from './iid_service';
-import { getConfig, isDestTransport } from './remote_config_service';
+import { getConfig, isDestFl } from './remote_config_service';
 import { FirebaseApp } from '@firebase/app-types';
 import '../../test/setup';
 
@@ -135,7 +135,7 @@ describe('Performance Monitoring > remote_config_service', () => {
         TRANSPORT_KEY
       );
       expect(SettingsService.getInstance().logSource).to.equal(LOG_SOURCE);
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.true;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.true;
       expect(
         SettingsService.getInstance().networkRequestsSamplingRate
       ).to.equal(NETWORK_SAMPLIG_RATE);
@@ -176,7 +176,7 @@ describe('Performance Monitoring > remote_config_service', () => {
         TRANSPORT_KEY
       );
       expect(SettingsService.getInstance().logSource).to.equal(LOG_SOURCE);
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.true;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.true;
       expect(
         SettingsService.getInstance().networkRequestsSamplingRate
       ).to.equal(NETWORK_SAMPLIG_RATE);
@@ -252,7 +252,7 @@ describe('Performance Monitoring > remote_config_service', () => {
       await getConfig(IID);
 
       // If no template, will send to cc.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.false;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.false;
     });
 
     it('marks event destination to cc if instance state unspecified', async () => {
@@ -270,7 +270,7 @@ describe('Performance Monitoring > remote_config_service', () => {
       await getConfig(IID);
 
       // If instance state unspecified, will send to cc.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.false;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.false;
     });
 
     it("marks event destination to cc if state doesn't exist", async () => {
@@ -285,10 +285,10 @@ describe('Performance Monitoring > remote_config_service', () => {
       await getConfig(IID);
 
       // If "state" doesn't exist, will send to cc.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.false;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.false;
     });
 
-    it('marks event destination to transport if template exists but no rollout flag', async () => {
+    it('marks event destination to Fl if template exists but no rollout flag', async () => {
       const CONFIG_WITHOUT_ROLLOUT_FLAG = `{"entries":{"fpr_enabled":"true",\
     "fpr_log_endpoint_url":"https://firebaselogging.test.com",\
     "fpr_log_source":"2","fpr_vc_network_request_sampling_rate":"0.250000",\
@@ -304,8 +304,8 @@ describe('Performance Monitoring > remote_config_service', () => {
       );
       await getConfig(IID);
 
-      // If template exists but no rollout flag, will send to transport.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.true;
+      // If template exists but no rollout flag, will send to Fl.
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.true;
     });
 
     it('marks event destination to cc when instance is outside of rollout range', async () => {
@@ -326,10 +326,10 @@ describe('Performance Monitoring > remote_config_service', () => {
       await getConfig(IID);
 
       // If rollout flag exists, will send to cc when this instance is out of rollout scope.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.false;
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.false;
     });
 
-    it('marks event destination to transport when instance is within rollout range', async () => {
+    it('marks event destination to Fl when instance is within rollout range', async () => {
       const CONFIG_WITH_ROLLOUT_FLAG_40 = `{"entries":{"fpr_enabled":"true",\
     "fpr_log_endpoint_url":"https://firebaselogging.test.com",\
     "fpr_log_source":"2","fpr_vc_network_request_sampling_rate":"0.250000",\
@@ -346,25 +346,25 @@ describe('Performance Monitoring > remote_config_service', () => {
       );
       await getConfig(IID);
 
-      // If rollout flag exists, will send to transport when this instance is within rollout scope.
-      expect(SettingsService.getInstance().shouldSendToTransport).to.be.true;
+      // If rollout flag exists, will send to Fl when this instance is within rollout scope.
+      expect(SettingsService.getInstance().shouldSendToFl).to.be.true;
     });
   });
 
-  describe('isDestTransport', () => {
+  describe('isDestFl', () => {
     it('marks traffic to cc when rollout percentage is 0', () => {
-      const shouldSendToTransport = isDestTransport('abc', 0); // Hash percentage of "abc" is 38%.
-      expect(shouldSendToTransport).to.be.false;
+      const shouldSendToFl = isDestFl('abc', 0); // Hash percentage of "abc" is 38%.
+      expect(shouldSendToFl).to.be.false;
     });
 
-    it('marks traffic to transport when rollout percentage is 100', () => {
-      const shouldSendToTransport = isDestTransport('abc', 100); // Hash percentage of "abc" is 38%.
-      expect(shouldSendToTransport).to.be.true;
+    it('marks traffic to Fl when rollout percentage is 100', () => {
+      const shouldSendToFl = isDestFl('abc', 100); // Hash percentage of "abc" is 38%.
+      expect(shouldSendToFl).to.be.true;
     });
 
-    it('marks traffic to transport if hash percentage is lower than rollout percentage 50%', () => {
-      const shouldSendToTransport = isDestTransport('abc', 50); // Hash percentage of "abc" is 38%.
-      expect(shouldSendToTransport).to.be.true;
+    it('marks traffic to Fl if hash percentage is lower than rollout percentage 50%', () => {
+      const shouldSendToFl = isDestFl('abc', 50); // Hash percentage of "abc" is 38%.
+      expect(shouldSendToFl).to.be.true;
     });
   });
 });

packages/performance/src/services/remote_config_service.ts

@@ -34,7 +34,7 @@ interface SecondaryConfig {
   logSource?: number;
   logEndPointUrl?: string;
   transportKey?: string;
-  shouldSendToTransport?: boolean;
+  shouldSendToFl?: boolean;
   tracesSamplingRate?: number;
   networkRequestsSamplingRate?: number;
 }
@@ -43,13 +43,13 @@ interface SecondaryConfig {
 // retrieved, but the template does not have these fields.
 const SECONDARY_CONFIGS: SecondaryConfig = {
   loggingEnabled: true,
-  shouldSendToTransport: true
+  shouldSendToFl: true
 };
 
 // These values will be used if the remote config object is successfully
 // retrieved, but the config object state shows unspecified or no template.
 const NO_TEMPLATE_CONFIGS: SecondaryConfig = {
-  shouldSendToTransport: false
+  shouldSendToFl: false
 };
 
 /* eslint-disable camelcase */
@@ -215,24 +215,23 @@ function processConfig(
     state === 'INSTANCE_STATE_UNSPECIFIED' ||
     state === 'NO_TEMPLATE'
   ) {
-    if (NO_TEMPLATE_CONFIGS.shouldSendToTransport !== undefined) {
-      settingsServiceInstance.shouldSendToTransport =
-        NO_TEMPLATE_CONFIGS.shouldSendToTransport;
+    if (NO_TEMPLATE_CONFIGS.shouldSendToFl !== undefined) {
+      settingsServiceInstance.shouldSendToFl =
+        NO_TEMPLATE_CONFIGS.shouldSendToFl;
     }
   } else if (entries.fpr_log_transport_web_percent !== undefined) {
     // If config object state doesn't indicate no template, it can only be UPDATE for now.
     // - Performance Monitoring doesn't set etag in request, therefore state cannot be NO_CHANGE.
     // - Sampling rate flags and master flag are required, therefore state cannot be EMPTY_CONFIG.
     // If config object state is UPDATE and rollout flag is present, determine endpoint by iid.
-    settingsServiceInstance.shouldSendToTransport = isDestTransport(
+    settingsServiceInstance.shouldSendToFl = isDestFl(
       iid,
       Number(entries.fpr_log_transport_web_percent)
     );
-  } else if (SECONDARY_CONFIGS.shouldSendToTransport !== undefined) {
+  } else if (SECONDARY_CONFIGS.shouldSendToFl !== undefined) {
     // If config object state is UPDATE and rollout flag is not present, that means rollout is
     // complete and rollout flag is deprecated, therefore dispatch events to new transport endpoint.
-    settingsServiceInstance.shouldSendToTransport =
-      SECONDARY_CONFIGS.shouldSendToTransport;
+    settingsServiceInstance.shouldSendToFl = SECONDARY_CONFIGS.shouldSendToFl;
   }
 
   if (entries.fpr_vc_network_request_sampling_rate !== undefined) {
@@ -270,13 +269,13 @@ function shouldLogAfterSampling(samplingRate: number): boolean {
 }
 
 /**
- * True if event should be sent to transport endpoint rather than log endpoint.
+ * True if event should be sent to Fl transport endpoint rather than log endpoint.
  * rolloutPercent is in range [0.0, 100.0].
  * @param {string} iid Installation ID which identifies a web app installed on client.
- * @param {number} rolloutPercent the possibility of this app sending events to transport endpoint.
- * @return {boolean} true if this installation should send events to transport endpoint.
+ * @param {number} rolloutPercent the possibility of this app sending events to Fl endpoint.
+ * @return {boolean} true if this installation should send events to Fl endpoint.
  */
-export function isDestTransport(iid: string, rolloutPercent: number): boolean {
+export function isDestFl(iid: string, rolloutPercent: number): boolean {
   if (iid.length === 0) {
     return false;
   }

packages/performance/src/services/settings_service.ts

@@ -40,14 +40,14 @@ export class SettingsService {
     'https://firebaselogging.googleapis.com/v0cc/log?format=json_proto';
   // Performance event transport endpoint URL which should be compatible with proto3.
   // New Address for transport service, not configurable via Remote Config.
-  transportEndpointUrl = mergeStrings(
+  flTransportEndpointUrl = mergeStrings(
     'hts/frbslgigp.ogepscmv/ieo/eaylg',
     'tp:/ieaeogn-agolai.o/1frlglgc/o'
   );
 
   transportKey = mergeStrings('AzSC8r6ReiGqFMyfvgow', 'Iayx0u-XT3vksVM-pIV');
 
-  shouldSendToTransport = false;
+  shouldSendToFl = false;
 
   // Source type for performance event logs.
   logSource = 462;
@@ -96,8 +96,8 @@ export class SettingsService {
     return apiKey;
   }
 
-  getTransportFullUrl(): string {
-    return this.transportEndpointUrl.concat('?key=', this.transportKey);
+  getFlTransportFullUrl(): string {
+    return this.flTransportEndpointUrl.concat('?key=', this.transportKey);
   }
 
   static getInstance(): SettingsService {

packages/performance/src/services/transport_service.test.ts

@@ -47,7 +47,7 @@ describe('Firebase Performance > transport_service', () => {
     fetchStub.restore();
     clock.restore();
     resetTransportService();
-    SettingsService.getInstance().shouldSendToTransport = false;
+    SettingsService.getInstance().shouldSendToFl = false;
   });
 
   it('throws an error when logging an empty message', () => {
@@ -85,10 +85,10 @@ describe('Firebase Performance > transport_service', () => {
   it('successful send a meesage to transport', () => {
     const transportDelayInterval = 30000;
     const setting = SettingsService.getInstance();
-    const transportFullUrl =
-      setting.transportEndpointUrl + '?key=' + setting.transportKey;
-    setting.shouldSendToTransport = true;
-    fetchStub.withArgs(transportFullUrl, match.any).resolves(
+    const flTransportFullUrl =
+      setting.flTransportEndpointUrl + '?key=' + setting.transportKey;
+    setting.shouldSendToFl = true;
+    fetchStub.withArgs(flTransportFullUrl, match.any).resolves(
       // DELETE_REQUEST means event dispatch is successful.
       new Response(
         '{\

packages/performance/src/services/transport_service.ts

@@ -35,7 +35,7 @@ interface BatchEvent {
 }
 
 /* eslint-disable camelcase */
-// CC/Transport accepted log format.
+// CC/Fl accepted log format.
 interface TransportBatchLogFormat {
   request_time_ms: string;
   client_info: ClientInfo;
@@ -124,18 +124,18 @@ function postToEndpoint(
   staged: BatchEvent[]
 ): Promise<void> {
   // Gradually rollout traffic from cc to transport using remote config.
-  if (SettingsService.getInstance().shouldSendToTransport) {
-    return sendEventsToTransport(data, staged);
+  if (SettingsService.getInstance().shouldSendToFl) {
+    return sendEventsToFl(data, staged);
   } else {
     return sendEventsToCc(data);
   }
 }
 
-function sendEventsToTransport(
+function sendEventsToFl(
   data: TransportBatchLogFormat,
   staged: BatchEvent[]
 ): Promise<void> {
-  return postToTransportEndpoint(data)
+  return postToFlEndpoint(data)
     .then(res => {
       if (!res.ok) {
         consoleLogger.info('Call to Firebase backend failed.');
@@ -191,11 +191,9 @@ function sendEventsToCc(data: TransportBatchLogFormat): Promise<void> {
     });
 }
 
-function postToTransportEndpoint(
-  data: TransportBatchLogFormat
-): Promise<Response> {
-  const transportFullUrl = SettingsService.getInstance().getTransportFullUrl();
-  return fetch(transportFullUrl, {
+function postToFlEndpoint(data: TransportBatchLogFormat): Promise<Response> {
+  const flTransportFullUrl = SettingsService.getInstance().getFlTransportFullUrl();
+  return fetch(flTransportFullUrl, {
     method: 'POST',
     body: JSON.stringify(data)
   });