diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 24c3757af5..f363579565 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -55,10 +55,8 @@ import { AcceptTermsService } from './services/acceptTerms/acceptTerms.service'; import { CaseShareService } from './services/case/share-case.service'; import { DefaultErrorHandler } from './services/errorHandler/defaultErrorHandler'; import { JurisdictionService } from './services/jurisdiction/jurisdiction.service'; -import { AbstractAppInsights, AppInsightsWrapper } from './services/logger/appInsightsWrapper'; import { CryptoWrapper } from './services/logger/cryptoWrapper'; import { LoggerService } from './services/logger/logger.service'; -import { MonitoringService } from './services/logger/monitoring.service'; import { SharedModule } from './shared/shared.module'; import { effects } from './store/effects'; // ngrx modules - END @@ -125,12 +123,7 @@ export function launchDarklyClientIdFactory( multi: true }, CryptoWrapper, - MonitoringService, LoggerService, - { - provide: AbstractAppInsights, - useClass: AppInsightsWrapper - }, { provide: ErrorHandler, useClass: DefaultErrorHandler @@ -150,4 +143,4 @@ export function launchDarklyClientIdFactory( bootstrap: [AppComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class AppModule {} +export class AppModule { } diff --git a/src/app/services/logger/logger.service.spec.ts b/src/app/services/logger/logger.service.spec.ts index 198e86fdba..1264f75129 100644 --- a/src/app/services/logger/logger.service.spec.ts +++ b/src/app/services/logger/logger.service.spec.ts @@ -1,7 +1,6 @@ import { LoggerService } from './logger.service'; describe('Logger service', () => { - const mockedMonitoringService = jasmine.createSpyObj('mockedMonitoringService', ['logEvent', 'logException', 'enableCookies']); const mockedNgxLogger = jasmine.createSpyObj('mockedNgxLogger', ['trace', 'debug', 'info', 'log', 'warn', 'error', 'fatal']); const mockedSessionStorageService = jasmine.createSpyObj('mockedCookieService', ['getItem']); @@ -12,83 +11,74 @@ describe('Logger service', () => { mockEnvironmentService.config$ = mockConfig; it('should be Truthy', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); expect(service).toBeTruthy(); }); it('should be able to call info', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.info('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); expect(mockedNgxLogger.info).toHaveBeenCalled(); }); it('should be able to call log', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.log('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); expect(mockedNgxLogger.log).toHaveBeenCalled(); }); it('should be able to call warn', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.warn('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); expect(mockedNgxLogger.warn).toHaveBeenCalled(); }); it('should be able to call error', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.error('message'); - expect(mockedMonitoringService.logException).toHaveBeenCalled(); expect(mockedNgxLogger.error).toHaveBeenCalled(); }); it('should be able to call fatal', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.fatal('message'); - expect(mockedMonitoringService.logException).toHaveBeenCalled(); expect(mockedNgxLogger.fatal).toHaveBeenCalled(); }); it('should be able to call debug', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.debug('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); }); it('should be able to call trace', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.trace('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); expect(mockedNgxLogger.trace).toHaveBeenCalled(); }); it('should be able to get a message', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); // slice off the last two characters of string to ensure no accidental discrepancies const expectedMessage = `Message - message, Timestamp - ${Date.now()}`.slice(0, -2); const returnedMessage = service.getMessage('message'); - expect(mockedMonitoringService.logEvent).toHaveBeenCalled(); expect(returnedMessage).not.toBeNull(); expect(returnedMessage.slice(0, -2)).toBe(expectedMessage); }); describe('enableCookies()', () => { it('should make a call to monitoringService', () => { - const service = new LoggerService(mockedMonitoringService, mockedNgxLogger, mockedSessionStorageService, + const service = new LoggerService(mockedNgxLogger, mockedSessionStorageService, mockedCryptoWrapper, mockEnvironmentService); service.enableCookies(); - expect(mockedMonitoringService.enableCookies).toHaveBeenCalled(); }); }); diff --git a/src/app/services/logger/logger.service.ts b/src/app/services/logger/logger.service.ts index ccb1a85085..566908d127 100644 --- a/src/app/services/logger/logger.service.ts +++ b/src/app/services/logger/logger.service.ts @@ -4,7 +4,6 @@ import { environment as config } from '../../../environments/environment'; import { UserInfo } from '../../models/user-details.model'; import { SessionStorageService } from '../session-storage/session-storage.service'; import { CryptoWrapper } from './cryptoWrapper'; -import { MonitoringService } from './monitoring.service'; import { EnvironmentService } from '../../shared/services/environment.service'; export interface ILoggerService { @@ -26,11 +25,10 @@ export class LoggerService implements ILoggerService { // Do nothing. }; - constructor(private readonly monitoringService: MonitoringService, - private readonly ngxLogger: NGXLogger, - private readonly sessionStorageService: SessionStorageService, - private readonly cryptoWrapper: CryptoWrapper, - private readonly environmentService: EnvironmentService) { + constructor(private readonly ngxLogger: NGXLogger, + private readonly sessionStorageService: SessionStorageService, + private readonly cryptoWrapper: CryptoWrapper, + private readonly environmentService: EnvironmentService) { this.COOKIE_KEYS = { TOKEN: config.cookies.token, USER: config.cookies.userId @@ -46,38 +44,33 @@ export class LoggerService implements ILoggerService { } // eslint-disable-next-line @typescript-eslint/no-unused-vars - public trace(message: any, ... additional: any[]): void { + public trace(message: any, ...additional: any[]): void { const formattedMessage = this.getMessage(message); this.ngxLogger.trace(formattedMessage); - this.monitoringService.logEvent(message); } // eslint-disable-next-line @typescript-eslint/no-unused-vars public debug(message: any, ...additional: any[]): void { const formattedMessage = this.getMessage(message); this.ngxLogger.debug(formattedMessage); - this.monitoringService.logEvent(message); } // eslint-disable-next-line @typescript-eslint/no-unused-vars public info(message: any, ...additional: any[]): void { const formattedMessage = this.getMessage(message); this.ngxLogger.info(formattedMessage); - this.monitoringService.logEvent(message); } // eslint-disable-next-line @typescript-eslint/no-unused-vars public log(message: any, ...additional: any[]): void { const formattedMessage = this.getMessage(message); this.ngxLogger.log(formattedMessage, ...additional); - this.monitoringService.logEvent(message); } // eslint-disable-next-line @typescript-eslint/no-unused-vars public warn(message: any, ...additional: any[]): void { const formattedMessage = this.getMessage(message); this.ngxLogger.warn(formattedMessage); - this.monitoringService.logEvent(message); } // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -85,7 +78,6 @@ export class LoggerService implements ILoggerService { this.ngxLogger.error(message); const formattedMessage = this.getMessage(message); const error = new Error(formattedMessage); - this.monitoringService.logException(error); } // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -93,7 +85,6 @@ export class LoggerService implements ILoggerService { this.ngxLogger.fatal(message); const formattedMessage = this.getMessage(message); const error = new Error(formattedMessage); - this.monitoringService.logException(error); } public getMessage(message: any): string { @@ -109,7 +100,7 @@ export class LoggerService implements ILoggerService { } public enableCookies(): void { - this.monitoringService.enableCookies(); + // this.monitoringService.enableCookies(); } public static switchConsoleLogs(consoleConfig: any): void { diff --git a/src/app/services/logger/monitoring.service.spec.ts b/src/app/services/logger/monitoring.service.spec.ts deleted file mode 100644 index 0281bf17b4..0000000000 --- a/src/app/services/logger/monitoring.service.spec.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { of } from 'rxjs'; -import { MonitorConfig, MonitoringService } from './monitoring.service'; - -describe('Monitoring service', () => { - const mockedHttpClient = jasmine.createSpyObj('mockedHttpClient', { get: of({ key: 'Some Value' }) }); - const mockedAppInsights = jasmine.createSpyObj('mockedAppInsights', ['downloadAndSetup', 'trackException', 'trackEvent', - 'trackPageView']); - const mockedConfig = new MonitorConfig(); - - it('should be Truthy', () => { - const service = new MonitoringService(mockedHttpClient); - expect(service).toBeTruthy(); - }); - - it('should be able to LogException and Should not call the http service', () => { - mockedConfig.instrumentationKey = 'somevalue'; - const service = new MonitoringService(mockedHttpClient, mockedConfig, mockedAppInsights); - expect(service).toBeTruthy(); - service.logException(new Error('Some ErrorMesssage')); - expect(mockedHttpClient.get).not.toHaveBeenCalled(); - expect(mockedAppInsights.downloadAndSetup).not.toHaveBeenCalled(); - expect(mockedAppInsights.trackException).toHaveBeenCalled(); - }); - - it('should be able to LogEvent', () => { - mockedConfig.instrumentationKey = 'somevalue'; - const service = new MonitoringService(mockedHttpClient, mockedConfig, mockedAppInsights); - expect(service).toBeTruthy(); - service.logEvent('name', [], []); - expect(mockedHttpClient.get).not.toHaveBeenCalled(); - expect(mockedAppInsights.downloadAndSetup).not.toHaveBeenCalled(); - expect(mockedAppInsights.trackEvent).toHaveBeenCalled(); - }); - - it('should be able to LogPageview', () => { - mockedConfig.instrumentationKey = 'somevalue'; - const service = new MonitoringService(mockedHttpClient, mockedConfig, mockedAppInsights); - expect(service).toBeTruthy(); - service.logPageView('name', null, [], [], 1); - expect(mockedHttpClient.get).not.toHaveBeenCalled(); - expect(mockedAppInsights.downloadAndSetup).not.toHaveBeenCalled(); - expect(mockedAppInsights.trackPageView).toHaveBeenCalled(); - }); - - it('should be able to LogPageview', () => { - mockedConfig.instrumentationKey = null; - const service = new MonitoringService(mockedHttpClient, mockedConfig, mockedAppInsights); - expect(service).toBeTruthy(); - service.logPageView('name', null, [], [], 1); - expect(mockedHttpClient.get).toHaveBeenCalled(); - }); - - describe('enableCookies()', () => { - it('should set areCookiesEnabled to true', () => { - const service = new MonitoringService(mockedHttpClient, mockedConfig, mockedAppInsights); - service.enableCookies(); - expect(service.areCookiesEnabled).toBeTruthy(); - }); - }); -});