Merge pull request #22 from gupy-io/OPS-1891

Remove sentry and logstash dependencies

Author: nandoofz

dist/index.js

@@ -2,12 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loggerFactory = void 0;
 const winston = require("winston");
-const winstonSentryRavenTransport = require("winston-sentry-raven-transport");
-const winston_logstash_transport_1 = require("winston-logstash-transport");
 const logger_factory_generator_1 = require("./logger-factory-generator");
 exports.loggerFactory = logger_factory_generator_1.loggerFactoryGenerator({
     winston,
     consoleTransportClass: winston.transports.Console,
-    sentryTransportClass: winstonSentryRavenTransport,
-    logstashTransportClass: winston_logstash_transport_1.LogstashTransport,
 });

dist/logger-factory-generator.d.ts

@@ -1,28 +1,13 @@
 import { Logger } from 'winston';
 declare interface IConfig {
     level?: string;
-    sentry: {
-        enabled: boolean;
-        dsn?: string;
-        level?: string;
-        sampleRate?: number;
-    };
-    logstash?: {
-        enabled?: boolean;
-        application?: string;
-        host?: string;
-        port?: number;
-        level?: string;
-    };
 }
 export interface IFactoryInterface {
     config: IConfig;
 }
 declare type LoggerFactoryType = ({ config }: IFactoryInterface) => Logger;
-export declare const loggerFactoryGenerator: ({ winston, consoleTransportClass, sentryTransportClass, logstashTransportClass, }: {
+export declare const loggerFactoryGenerator: ({ winston, consoleTransportClass, }: {
     winston: any;
     consoleTransportClass: any;
-    sentryTransportClass: any;
-    logstashTransportClass: any;
 }) => LoggerFactoryType;
 export {};

dist/logger-factory-generator.js

@@ -9,7 +9,7 @@ function prepareErrorToLog(error, messages = []) {
     }
     return error;
 }
-const loggerFactoryGenerator = ({ winston, consoleTransportClass, sentryTransportClass, logstashTransportClass, }) => ({ config }) => {
+const loggerFactoryGenerator = ({ winston, consoleTransportClass, }) => ({ config }) => {
     const transports = [];
     transports.push(new consoleTransportClass({
         level: config.level,

dist/logger-factory-generator.test.js

@@ -4,57 +4,36 @@ const chai_1 = require("chai");
 const winston = require("winston");
 const logger_factory_generator_1 = require("./logger-factory-generator");
 const TransportStream = require("winston-transport");
-let lastSentryLog;
-class FakeSentryTransport extends TransportStream {
-    log(info) {
-        lastSentryLog = info;
-    }
-}
 let lastConsoleLog;
 class FakeConsoleTransport extends TransportStream {
     log(info) {
         lastConsoleLog = info;
     }
 }
-let lastLogstashLog;
-class FakeLogstashTransport extends TransportStream {
-    log(info) {
-        lastLogstashLog = info;
-    }
-}
 let logger;
 const symbolMessage = Symbol.for('message');
 const symbolLevel = Symbol.for('level');
 describe('gupy-logger', () => {
     beforeEach(() => {
         lastConsoleLog = null;
-        lastSentryLog = null;
-        lastLogstashLog = null;
         const loggerFactory = logger_factory_generator_1.loggerFactoryGenerator({
             winston,
             consoleTransportClass: FakeConsoleTransport,
-            sentryTransportClass: FakeSentryTransport,
-            logstashTransportClass: FakeLogstashTransport,
         });
         logger = loggerFactory({
             config: {
                 level: 'info',
-                sentry: { enabled: true, dsn: 'any', level: 'info' },
-                logstash: { enabled: true, host: 'logstashhost', port: 12345, level: 'info' },
             },
         });
     });
     it('should init', () => {
         const loggerFactory = logger_factory_generator_1.loggerFactoryGenerator({
             winston,
             consoleTransportClass: FakeConsoleTransport,
-            sentryTransportClass: FakeSentryTransport,
-            logstashTransportClass: undefined,
         });
         logger = loggerFactory({
             config: {
                 level: 'info',
-                sentry: { enabled: true, dsn: 'any', level: 'info' },
             },
         });
         chai_1.expect(logger).be.not.equal(undefined);

package-lock.json

@@ -23,9 +23,7 @@
   "homepage": "https://github.com/afonsof/gupy-logger#readme",
   "dependencies": {
     "moment": "^2.24.0",
-    "winston": "^3.2.1",
-    "winston-logstash-transport": "^2.0.0",
-    "winston-sentry-raven-transport": "^1.0.2"
+    "winston": "^3.2.1"
   },
   "devDependencies": {
     "@types/mocha": "^5.2.6",
@@ -36,6 +34,7 @@
     "mocha": "^6.0.2",
     "npm-run-all": "^4.1.5",
     "ts-node": "^8.0.3",
-    "typescript": "^4.0.5"
+    "typescript": "^4.0.5",
+    "winston-transport": "^4.4.0"
   }
 }

package.json

@@ -1,11 +1,7 @@
 import * as winston from 'winston';
-import winstonSentryRavenTransport = require('winston-sentry-raven-transport');
-import { LogstashTransport } from 'winston-logstash-transport';
 import { loggerFactoryGenerator } from './logger-factory-generator';
 
 export const loggerFactory = loggerFactoryGenerator({
     winston,
     consoleTransportClass: winston.transports.Console,
-    sentryTransportClass: winstonSentryRavenTransport,
-    logstashTransportClass: LogstashTransport,
 });

src/index.ts

@@ -3,47 +3,27 @@ import * as winston from 'winston';
 import { loggerFactoryGenerator } from './logger-factory-generator';
 import * as TransportStream from 'winston-transport';
 
-let lastSentryLog;
-class FakeSentryTransport extends TransportStream {
-  log(info) {
-    lastSentryLog = info;
-  }
-}
-
 let lastConsoleLog;
 class FakeConsoleTransport extends TransportStream {
   log(info) {
     lastConsoleLog = info;
   }
 }
 
-let lastLogstashLog;
-class FakeLogstashTransport extends TransportStream {
-  log(info) {
-    lastLogstashLog = info;
-  }
-}
-
 let logger;
 const symbolMessage = Symbol.for('message');
 const symbolLevel = Symbol.for('level');
 
 describe('gupy-logger', () => {
   beforeEach(() => {
     lastConsoleLog = null;
-    lastSentryLog = null;
-    lastLogstashLog = null;
     const loggerFactory = loggerFactoryGenerator({
       winston,
       consoleTransportClass: FakeConsoleTransport,
-      sentryTransportClass: FakeSentryTransport,
-      logstashTransportClass: FakeLogstashTransport,
     });
     logger = loggerFactory({
       config: {
         level: 'info',
-        sentry: { enabled: true, dsn: 'any', level: 'info' },
-        logstash: { enabled: true, host: 'logstashhost', port: 12345, level: 'info' },
       },
     });
   });
@@ -52,14 +32,11 @@ describe('gupy-logger', () => {
     const loggerFactory = loggerFactoryGenerator({
       winston,
       consoleTransportClass: FakeConsoleTransport,
-      sentryTransportClass: FakeSentryTransport,
-      logstashTransportClass: undefined,
     });
 
     logger = loggerFactory({
       config: {
         level: 'info',
-        sentry: { enabled: true, dsn: 'any', level: 'info' },
       },
     });