Clean up service init

Author: andrewbrook

packages/telemetry/src/api.ts

@@ -22,7 +22,6 @@ import { Provider } from '@firebase/component';
 import { AnyValueMap, SeverityNumber } from '@opentelemetry/api-logs';
 import { trace } from '@opentelemetry/api';
 import { TelemetryService } from './service';
-import { encodeInstanceIdentifier } from './helpers';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -54,8 +53,7 @@ export function getTelemetry(
     app,
     TELEMETRY_TYPE
   );
-  const finalOptions: TelemetryOptions = options || {};
-  const identifier = encodeInstanceIdentifier(finalOptions);
+  const identifier = options?.endpointUrl || '';
   return telemetryProvider.getImmediate({ identifier });
 }
 

packages/telemetry/src/helpers.test.ts

@@ -21,7 +21,6 @@ import { TELEMETRY_TYPE } from './constants';
 import { name, version } from '../package.json';
 import { TelemetryService } from './service';
 import { createLoggerProvider } from './logging/logger-provider';
-import { decodeInstanceIdentifier } from './helpers';
 
 export function registerTelemetry(): void {
   _registerComponent(
@@ -32,9 +31,8 @@ export function registerTelemetry(): void {
           throw new Error('TelemetryService instance identifier is undefined');
         }
 
-        const options = decodeInstanceIdentifier(instanceIdentifier);
         // TODO: change to default endpoint once it exists
-        const endpointUrl = options.endpointUrl || 'http://localhost';
+        const endpointUrl = instanceIdentifier || 'http://localhost';
 
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();

packages/telemetry/src/helpers.ts

@@ -21,7 +21,6 @@ import { TELEMETRY_TYPE } from './constants';
 import { name, version } from '../package.json';
 import { TelemetryService } from './service';
 import { createLoggerProvider } from './logging/logger-provider';
-import { decodeInstanceIdentifier } from './helpers';
 
 export function registerTelemetry(): void {
   _registerComponent(
@@ -32,9 +31,8 @@ export function registerTelemetry(): void {
           throw new Error('TelemetryService instance identifier is undefined');
         }
 
-        const options = decodeInstanceIdentifier(instanceIdentifier);
         // TODO: change to default endpoint once it exists
-        const endpointUrl = options.endpointUrl || 'http://localhost';
+        const endpointUrl = instanceIdentifier || 'http://localhost';
 
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();