Adding AUTOMATICALLY_TRACE_CORE_NG_METRICS InjectionToken and getting tests working

Author: jamesdaniels

karma.conf.js

@@ -30,13 +30,15 @@ module.exports = function(config) {
       'node_modules/firebase/firebase-database.js',
       'node_modules/firebase/firebase-firestore.js',
       'node_modules/firebase/firebase-functions.js',
+      'node_modules/firebase/firebase-performance.js',
       'node_modules/firebase/firebase-storage.js',
       'dist/packages-dist/bundles/core.umd.{js,map}',
       'dist/packages-dist/bundles/auth.umd.{js,map}',
       'dist/packages-dist/bundles/database.umd.{js,map}',
       'dist/packages-dist/bundles/firestore.umd.{js,map}',
       'dist/packages-dist/bundles/functions.umd.{js,map}',
       'dist/packages-dist/bundles/storage.umd.{js,map}',
+      'dist/packages-dist/bundles/performance.umd.{js,map}',
       'dist/packages-dist/bundles/database-deprecated.umd.{js,map}',
       'dist/packages-dist/bundles/test.umd.{js,map}',
     ],

src/core/firebase.app.module.ts

@@ -25,7 +25,7 @@ export class FirebaseApp {
     auth: () => FirebaseAuth;
     database: (databaseURL?: string) => FirebaseDatabase;
     messaging: () => FirebaseMessaging;
-    performance: () => any;
+    performance: () => any; // SEMVER: once >= 6 import performance.Performance
     storage: (storageBucket?: string) => FirebaseStorage;
     delete: () => Promise<void>;
     firestore: () => FirebaseFirestore;

src/performance/package.json

@@ -22,8 +22,7 @@
     "@angular/core": "ANGULAR_VERSION",
     "@angular/platform-browser": "ANGULAR_VERSION",
     "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
-    "@firebase/app": "FIREBASE_APP_VERSION",
-    "@firebase/messaging": "FIREBASE_MESSAGING_VERSION",
+    "firebase": "FIREBASE_VERSION",
     "rxjs": "RXJS_VERSION",
     "zone.js": "ZONEJS_VERSION"
   },

src/performance/performance.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { AngularFirePerformance } from './performance';
+
 import 'firebase/performance';
 
 @NgModule({

src/performance/performance.spec.ts

@@ -33,9 +33,4 @@ describe('AngularFirePerformance', () => {
     expect(afp.performance).toBeDefined();
   });
 
-  it('should have an initialized Firebase app', () => {
-    expect(afp.performance.app).toBeDefined();
-    expect(afp.performance.app).toEqual(app);
-  });
-
 });

src/performance/performance.ts

@@ -1,10 +1,10 @@
-import { Injectable, Inject, Optional, NgZone, ApplicationRef } from '@angular/core';
+import { Injectable, NgZone, ApplicationRef, InjectionToken, Inject, Optional } from '@angular/core';
 import { Observable } from 'rxjs';
-import { filter, tap, take } from 'rxjs/operators';
-import { FirebaseOptions, FirebaseAppConfig } from '@angular/fire';
-import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory } from '@angular/fire';
+import { first, tap } from 'rxjs/operators';
 import { performance } from 'firebase/app';
 
+export const AUTOMATICALLY_TRACE_CORE_NG_METRICS = new InjectionToken<boolean>('angularfire2.performance.auto_trace');
+
 export type TraceOptions = {
   metrics: {[key:string]: number},
   attributes?:{[key:string]:string},
@@ -19,23 +19,22 @@ export class AngularFirePerformance {
   performance: performance.Performance;
 
   constructor(
-    @Inject(FirebaseOptionsToken) options:FirebaseOptions,
-    @Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|null|undefined,
+    @Optional() @Inject(AUTOMATICALLY_TRACE_CORE_NG_METRICS) automaticallyTraceCoreNgMetrics:boolean|null,
     appRef: ApplicationRef,
     private zone: NgZone
   ) {
 
-    this.performance = zone.runOutsideAngular(() => {
-      const app = _firebaseAppFactory(options, nameOrConfig);
-      return app.performance();
-    });
+    this.performance = zone.runOutsideAngular(() => performance());
 
-    // TODO detirmine more built in metrics
-    appRef.isStable.pipe(
-      this.traceComplete('isStable'),
-      filter(it => it),
-      take(1)
-    ).subscribe();
+    if (automaticallyTraceCoreNgMetrics != false) {
+
+      // TODO detirmine more built in metrics
+      appRef.isStable.pipe(
+        this.traceComplete('isStable'),
+        first(it => it)
+      ).subscribe();
+
+    }
 
   }
 

src/performance/test-config.ts

@@ -3,6 +3,8 @@ export const COMMON_CONFIG = {
   apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
   authDomain: "angularfire2-test.firebaseapp.com",
   databaseURL: "https://angularfire2-test.firebaseio.com",
+  projectId: "angularfire2-test",
   storageBucket: "angularfire2-test.appspot.com",
-  messagingSenderId: "920323787688"
+  messagingSenderId: "920323787688",
+  appId: "1:920323787688:web:2253a0e5eb5b9a8b"
 };

src/performance/tsconfig-test.json

@@ -3,8 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@angular/fire": ["../../dist/packages-dist"],
-      "@angular/fire/performance": ["../../dist/packages-dist/performance"]
+      "@angular/fire": ["../../dist/packages-dist"]
     }
   },
   "files": [

src/tsconfig.json

@@ -17,6 +17,7 @@
       "@angular/fire/functions": ["./functions"],
       "@angular/fire/storage": ["./storage"],
       "@angular/fire/messaging": ["./messaging"],
+      "@angular/fire/performance": ["./performance"],
       "@angular/fire/database-deprecated": ["./database-deprecated"]
     },
     "rootDir": ".",

tools/build.js

@@ -23,7 +23,7 @@ const GLOBALS = {
   'firebase/messaging': 'firebase',
   'firebase/firestore': 'firebase',
   'firebase/functions': 'firebase',
-  'firebase/perf': 'firebase',
+  'firebase/performance': 'firebase',
   'firebase/storage': 'firebase',
   '@angular/fire': 'angularfire2',
   '@angular/fire/auth': 'angularfire2.auth',