Cleaning up framework logging

src/analytics/analytics.module.ts

@@ -1,8 +1,9 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders, APP_INITIALIZER } from '@angular/core';
 import { Analytics as FirebaseAnalytics, isSupported } from 'firebase/analytics';
-import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers } from '@angular/fire';
+import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers, VERSION } from '@angular/fire';
 import { Analytics, ANALYTICS_PROVIDER_NAME, AnalyticsInstances } from './analytics';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
+import { registerVersion } from 'firebase/app';
 
 const PROVIDED_ANALYTICS_INSTANCES = new InjectionToken<Analytics[]>('angularfire2.analytics-instances');
 const IS_SUPPORTED = new InjectionToken<boolean>('angularfire2.analytics.isSupported');
@@ -52,6 +53,9 @@ const DEFAULT_ANALYTICS_INSTANCE_PROVIDER = {
   ]
 })
 export class AnalyticsModule {
+  constructor() {
+    registerVersion('angularfire', VERSION.full, 'analytics');
+  }
 }
 
 export function provideAnalytics(fn: () => FirebaseAnalytics): ModuleWithProviders<AnalyticsModule> {

src/app/app.module.ts

@@ -1,9 +1,11 @@
 import {
+  Inject,
   InjectionToken,
   ModuleWithProviders,
   NgModule,
   NgZone,
   Optional,
+  PLATFORM_ID,
   VERSION as NG_VERSION,
 } from '@angular/core';
 import { FirebaseApp as IFirebaseApp, getApp, registerVersion } from 'firebase/app';
@@ -54,9 +56,11 @@ export function firebaseAppFactory(fn: () => IFirebaseApp) {
   ]
 })
 export class FirebaseAppModule {
-  constructor() {
+  // tslint:disable-next-line:ban-types
+  constructor(@Inject(PLATFORM_ID) platformId: Object) {
     registerVersion('angularfire', VERSION.full, 'core');
-    registerVersion('angular', NG_VERSION.full);
+    registerVersion('angularfire', VERSION.full, 'app');
+    registerVersion('angular', NG_VERSION.full, platformId.toString());
   }
 }
 

src/auth/auth.module.ts

@@ -1,19 +1,28 @@
-import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
+import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders, PLATFORM_ID } from '@angular/core';
 import { Auth as FirebaseAuth } from 'firebase/auth';
-import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers } from '@angular/fire';
+import { ɵgetDefaultInstanceOf, ɵmemoizeInstance, ɵAngularFireSchedulers, VERSION } from '@angular/fire';
 import { Auth, AuthInstances, AUTH_PROVIDER_NAME } from './auth';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
+import { registerVersion } from 'firebase/app';
 
 export const PROVIDED_AUTH_INSTANCES = new InjectionToken<Auth[]>('angularfire2.auth-instances');
 
-export function defaultAuthInstanceFactory(provided: FirebaseAuth[]|undefined, defaultApp: FirebaseApp) {
+export function defaultAuthInstanceFactory(
+  provided: FirebaseAuth[]|undefined,
+  defaultApp: FirebaseApp,
+  // tslint:disable-next-line:ban-types
+  platformId: Object
+) {
   const defaultAuth = ɵgetDefaultInstanceOf<FirebaseAuth>(AUTH_PROVIDER_NAME, provided, defaultApp);
+  (defaultAuth as any)._logFramework(`angularfire-${platformId}`);
   return new Auth(defaultAuth);
 }
 
 export function authInstanceFactory(fn: () => FirebaseAuth) {
-  return (zone: NgZone) => {
+  // tslint:disable-next-line:ban-types
+  return (zone: NgZone, platformId: Object) => {
     const auth = ɵmemoizeInstance<FirebaseAuth>(fn, zone);
+    (auth as any)._logFramework(`angularfire-${platformId}`);
     return new Auth(auth);
   };
 }
@@ -31,6 +40,7 @@ const DEFAULT_AUTH_INSTANCE_PROVIDER = {
   deps: [
     [new Optional(), PROVIDED_AUTH_INSTANCES ],
     FirebaseApp,
+    PLATFORM_ID,
   ]
 };
 
@@ -41,6 +51,9 @@ const DEFAULT_AUTH_INSTANCE_PROVIDER = {
   ]
 })
 export class AuthModule {
+  constructor() {
+    registerVersion('angularfire', VERSION.full, 'auth');
+  }
 }
 
 export function provideAuth(fn: () => FirebaseAuth): ModuleWithProviders<AuthModule> {
@@ -52,6 +65,7 @@ export function provideAuth(fn: () => FirebaseAuth): ModuleWithProviders<AuthMod
       multi: true,
       deps: [
         NgZone,
+        PLATFORM_ID,
         ɵAngularFireSchedulers,
         FirebaseApps,
       ]

src/auth/auth.ts

@@ -2,6 +2,7 @@ import { Auth as FirebaseAuth } from 'firebase/auth';
 import { ɵgetAllInstancesOf } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';
+import { Inject, PLATFORM_ID } from '@angular/core';
 
 export const AUTH_PROVIDER_NAME = 'auth';
 
@@ -19,8 +20,11 @@ export class Auth {
 export interface AuthInstances extends Array<FirebaseAuth> {}
 
 export class AuthInstances {
-  constructor() {
-    return ɵgetAllInstancesOf<FirebaseAuth>(AUTH_PROVIDER_NAME);
+  // tslint:disable-next-line:ban-types
+  constructor(@Inject(PLATFORM_ID) platformId: Object) {
+    const instances = ɵgetAllInstancesOf<FirebaseAuth>(AUTH_PROVIDER_NAME);
+    instances.forEach((it: any) => it._logFramework(`angularfire-${platformId}`));
+    return instances;
   }
 }
 

src/compat/analytics/analytics.module.ts

@@ -2,6 +2,8 @@ import { NgModule, Optional } from '@angular/core';
 import { ScreenTrackingService } from './screen-tracking.service';
 import { AngularFireAnalytics } from './analytics';
 import { UserTrackingService } from './user-tracking.service';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
 
 @NgModule({
   providers: [ AngularFireAnalytics ]
@@ -10,8 +12,9 @@ export class AngularFireAnalyticsModule {
   constructor(
     analytics: AngularFireAnalytics,
     @Optional() screenTracking: ScreenTrackingService,
-    @Optional() userTracking: UserTrackingService
+    @Optional() userTracking: UserTrackingService,
   ) {
+    firebase.registerVersion('angularfire', VERSION.full, 'analytics-compat');
     // calling anything on analytics will eagerly load the SDK
     // tslint:disable-next-line:no-unused-expression
     analytics.app.then(() => {});

src/compat/analytics/screen-tracking.service.ts

@@ -14,6 +14,8 @@ import { AngularFireAnalytics } from './analytics';
 import { Title } from '@angular/platform-browser';
 import { isPlatformBrowser } from '@angular/common';
 import { UserTrackingService } from './user-tracking.service';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
 
 const FIREBASE_EVENT_ORIGIN_KEY = 'firebase_event_origin';
 const FIREBASE_PREVIOUS_SCREEN_CLASS_KEY = 'firebase_previous_class';
@@ -66,6 +68,7 @@ export class ScreenTrackingService implements OnDestroy {
     zone: NgZone,
     @Optional() userTrackingService: UserTrackingService,
   ) {
+    firebase.registerVersion('angularfire', VERSION.full, 'compat-screen-tracking');
     if (!router || !isPlatformBrowser(platformId)) {
       return this;
     }

src/compat/analytics/user-tracking.service.ts

@@ -3,6 +3,8 @@ import { Inject, Injectable, NgZone, OnDestroy, PLATFORM_ID } from '@angular/cor
 import { AngularFireAnalytics } from './analytics';
 import { AngularFireAuth } from '@angular/fire/compat/auth';
 import { Subscription } from 'rxjs';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
 
 @Injectable()
 export class UserTrackingService implements OnDestroy {
@@ -18,7 +20,7 @@ export class UserTrackingService implements OnDestroy {
     auth: AngularFireAuth,
     zone: NgZone,
   ) {
-
+    firebase.registerVersion('angularfire', VERSION.full, 'compat-user-tracking');
     if (!isPlatformServer(platformId)) {
       let resolveInitialized;
       this.initialized = zone.runOutsideAngular(() => new Promise(resolve => resolveInitialized = resolve));

src/compat/auth-guard/auth-guard.module.ts

@@ -1,7 +1,13 @@
 import { NgModule } from '@angular/core';
 import { AngularFireAuthGuard } from './auth-guard';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
 
 @NgModule({
   providers: [ AngularFireAuthGuard ]
 })
-export class AngularFireAuthGuardModule { }
+export class AngularFireAuthGuardModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'auth-guard-compat');
+  }
+}

src/compat/auth/auth.module.ts

@@ -1,7 +1,17 @@
 import { NgModule } from '@angular/core';
 import { AngularFireAuth } from './auth';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
+import { FirebaseApp } from '@angular/fire/compat';
 
 @NgModule({
-  providers: [ AngularFireAuth ]
+  providers: [{
+    provide: AngularFireAuth,
+    deps: [ FirebaseApp, ],
+  }]
 })
-export class AngularFireAuthModule { }
+export class AngularFireAuthModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'auth-compat');
+  }
+}

src/compat/auth/auth.ts

@@ -25,8 +25,11 @@ export const ɵauthFactory = (
   app: FirebaseApp, zone: NgZone, useEmulator: UseEmulatorArguments|null,
   tenantId: string, languageCode: string|null, useDeviceLanguage: boolean|null,
   settings: firebase.auth.AuthSettings|null, persistence: string|null,
+  // tslint:disable-next-line:ban-types
+  platformId: Object,
 ) => ɵcacheInstance(`${app.name}.auth`, 'AngularFireAuth', app.name, () => {
   const auth = zone.runOutsideAngular(() => app.auth());
+  (auth as any)._logFramework(`angularfire-${platformId}-compat`);
   if (useEmulator) {
     auth.useEmulator(...useEmulator);
   }
@@ -100,7 +103,7 @@ export class AngularFireAuth {
       observeOn(schedulers.outsideAngular),
       switchMap(() => zone.runOutsideAngular(() => import('firebase/compat/auth'))),
       map(() => ɵfirebaseAppFactory(options, zone, name)),
-      map(app => ɵauthFactory(app, zone, useEmulator, tenantId, languageCode, useDeviceLanguage, settings, persistence)),
+      map(app => ɵauthFactory(app, zone, useEmulator, tenantId, languageCode, useDeviceLanguage, settings, persistence, platformId)),
       shareReplay({ bufferSize: 1, refCount: false }),
     );
 

src/compat/database/database.module.ts

@@ -1,7 +1,17 @@
 import { NgModule } from '@angular/core';
 import { AngularFireDatabase } from './database';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
+import { FirebaseApp } from '@angular/fire/compat';
 
 @NgModule({
-  providers: [ AngularFireDatabase ]
+  providers: [{
+    provide: AngularFireDatabase,
+    deps: [ FirebaseApp, ],
+  }]
 })
-export class AngularFireDatabaseModule { }
+export class AngularFireDatabaseModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'rtdb-compat');
+  }
+}

src/compat/database/database.ts

@@ -54,7 +54,7 @@ export class AngularFireDatabase {
     const app = ɵfirebaseAppFactory(options, zone, name);
 
     if (auth) {
-      ɵauthFactory(app, zone, useAuthEmulator, tenantId, languageCode, useDeviceLanguage, authSettings, persistence);
+      ɵauthFactory(app, zone, useAuthEmulator, tenantId, languageCode, useDeviceLanguage, authSettings, persistence, platformId);
     }
 
     this.database = ɵcacheInstance(`${app.name}.database.${databaseURL}`, 'AngularFireDatabase', app.name, () => {

src/compat/firebase.app.module.ts

@@ -60,7 +60,8 @@ export class AngularFireModule {
 
   // tslint:disable-next-line:ban-types
   constructor(@Inject(PLATFORM_ID) platformId: Object) {
-    firebase.registerVersion('angularfire', VERSION.full, `compat-${platformId.toString()}`);
-    firebase.registerVersion('angular', NG_VERSION.full);
+    firebase.registerVersion('angularfire', VERSION.full, 'core');
+    firebase.registerVersion('angularfire', VERSION.full, 'app-compat');
+    firebase.registerVersion('angular', NG_VERSION.full, platformId.toString());
   }
 }

src/compat/firestore/firestore.module.ts

@@ -1,11 +1,20 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { PersistenceSettings } from './interfaces';
 import { AngularFirestore, ENABLE_PERSISTENCE, PERSISTENCE_SETTINGS } from './firestore';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
+import { FirebaseApp } from '@angular/fire/compat';
 
 @NgModule({
-  providers: [ AngularFirestore ]
+  providers: [{
+    provide: AngularFirestore,
+    deps: [ FirebaseApp, ],
+  }]
 })
 export class AngularFirestoreModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'fst-compat');
+  }
   /**
    * Attempt to enable persistent storage, if possible
    */

src/compat/firestore/firestore.ts

@@ -157,7 +157,7 @@ export class AngularFirestore {
     const useEmulator: UseEmulatorArguments | null = _useEmulator;
 
     if (auth) {
-      ɵauthFactory(app, zone, useAuthEmulator, tenantId, languageCode, useDeviceLanguage, authSettings, persistence);
+      ɵauthFactory(app, zone, useAuthEmulator, tenantId, languageCode, useDeviceLanguage, authSettings, persistence, platformId);
     }
 
     [this.firestore, this.persistenceEnabled$] = ɵcacheInstance(`${app.name}.firestore`, 'AngularFirestore', app.name, () => {

src/compat/functions/functions.module.ts

@@ -1,7 +1,17 @@
 import { NgModule } from '@angular/core';
 import { AngularFireFunctions } from './functions';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
+import { FirebaseApp } from '@angular/fire/compat';
 
 @NgModule({
-  providers: [ AngularFireFunctions ]
+  providers: [{
+    provide: AngularFireFunctions,
+    deps: [ FirebaseApp, ],
+  }]
 })
-export class AngularFireFunctionsModule { }
+export class AngularFireFunctionsModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'fn-compat');
+  }
+}

src/compat/messaging/messaging.module.ts

@@ -1,7 +1,17 @@
 import { NgModule } from '@angular/core';
 import { AngularFireMessaging } from './messaging';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
+import { FirebaseApp } from '@angular/fire/compat';
 
 @NgModule({
-  providers: [ AngularFireMessaging ]
+  providers: [{
+    provide: AngularFireMessaging,
+    deps: [ FirebaseApp, ],
+  }]
 })
-export class AngularFireMessagingModule { }
+export class AngularFireMessagingModule {
+  constructor() {
+    firebase.registerVersion('angularfire', VERSION.full, 'fcm-compat');
+  }
+}

src/compat/performance/performance.module.ts

@@ -1,6 +1,8 @@
 import { NgModule, Optional } from '@angular/core';
 import { AngularFirePerformance } from './performance';
 import { PerformanceMonitoringService } from './performance.service';
+import firebase from 'firebase/compat/app';
+import { VERSION } from '@angular/fire';
 
 @NgModule({
   providers: [ AngularFirePerformance ]
@@ -10,6 +12,7 @@ export class AngularFirePerformanceModule {
     perf: AngularFirePerformance,
     @Optional() _: PerformanceMonitoringService
   ) {
+    firebase.registerVersion('angularfire', VERSION.full, 'perf-compat');
     // call anything here to get perf loading
     // tslint:disable-next-line:no-unused-expression
     perf.dataCollectionEnabled.then(() => {});