Refactor

Author: andrewbrook

packages/telemetry/rollup.config.js

@@ -25,13 +25,13 @@ import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_pa
 
 const deps = [
   ...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies)),
-  './constants/auto-constants'
+  './auto-constants'
 ];
 
 function replaceSource(path) {
   return replacePlugin({
-    './src/constants/auto-constants': `'${path}'`,
-    '../constants/auto-constants': `'${path}'`,
+    './src/auto-constants': `'${path}'`,
+    '../auto-constants': `'${path}'`,
     delimiters: ["'", "'"],
     preventAssignment: true
   });
@@ -191,7 +191,7 @@ const angularBuilds = [
 
 const autoinitBuild = [
   {
-    input: './src/constants/auto-constants.ts',
+    input: './src/auto-constants.ts',
     output: {
       file: './dist/auto-constants.js',
       format: 'cjs'

packages/telemetry/src/api.test.ts

@@ -42,7 +42,7 @@ import {
 import { TelemetryService } from './service';
 import { registerTelemetry } from './register';
 import { _FirebaseInstallationsInternal } from '@firebase/installations';
-import { AUTO_CONSTANTS } from './constants/auto-constants';
+import { AUTO_CONSTANTS } from './auto-constants';
 
 const PROJECT_ID = 'my-project';
 const APP_ID = 'my-appid';

packages/telemetry/src/api.ts

@@ -16,17 +16,13 @@
  */
 
 import { _getProvider, FirebaseApp, getApp } from '@firebase/app';
-import {
-  LOG_ENTRY_ATTRIBUTE_KEYS,
-  TELEMETRY_SESSION_ID_KEY,
-  TELEMETRY_TYPE
-} from './constants';
+import { LOG_ENTRY_ATTRIBUTE_KEYS, TELEMETRY_TYPE } from './constants';
 import { Telemetry, TelemetryOptions } from './public-types';
 import { Provider } from '@firebase/component';
 import { AnyValueMap, SeverityNumber } from '@opentelemetry/api-logs';
 import { trace } from '@opentelemetry/api';
 import { TelemetryService } from './service';
-import { getAppVersion } from './helpers';
+import { getAppVersion, getSessionId } from './helpers';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
@@ -101,20 +97,9 @@ export function captureError(
   customAttributes['app.version'] = getAppVersion(telemetry);
 
   // Add session ID metadata
-  if (
-    typeof sessionStorage !== 'undefined' &&
-    typeof crypto?.randomUUID === 'function'
-  ) {
-    try {
-      let sessionId = sessionStorage.getItem(TELEMETRY_SESSION_ID_KEY);
-      if (!sessionId) {
-        sessionId = crypto.randomUUID();
-        sessionStorage.setItem(TELEMETRY_SESSION_ID_KEY, sessionId);
-      }
-      customAttributes[LOG_ENTRY_ATTRIBUTE_KEYS.SESSION_ID] = sessionId;
-    } catch (e) {
-      // Ignore errors accessing sessionStorage (e.g. security restrictions)
-    }
+  const sessionId = getSessionId();
+  if (sessionId) {
+    customAttributes[LOG_ENTRY_ATTRIBUTE_KEYS.SESSION_ID] = sessionId;
   }
 
   if (error instanceof Error) {

packages/telemetry/src/constants/auto-constants.ts renamed to packages/telemetry/src/auto-constants.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import * as constants from './constants/auto-constants';
+import * as constants from './auto-constants';
+import { TELEMETRY_SESSION_ID_KEY } from './constants';
 import { Telemetry } from './public-types';
 import { TelemetryService } from './service';
 
@@ -27,3 +28,21 @@ export function getAppVersion(telemetry: Telemetry): string {
   }
   return 'unset';
 }
+
+export function getSessionId(): string | undefined {
+  if (
+    typeof sessionStorage !== 'undefined' &&
+    typeof crypto?.randomUUID === 'function'
+  ) {
+    try {
+      let sessionId = sessionStorage.getItem(TELEMETRY_SESSION_ID_KEY);
+      if (!sessionId) {
+        sessionId = crypto.randomUUID();
+        sessionStorage.setItem(TELEMETRY_SESSION_ID_KEY, sessionId);
+      }
+      return sessionId;
+    } catch (e) {
+      // Ignore errors accessing sessionStorage (e.g. security restrictions)
+    }
+  }
+}