Revert "feat(workers): add decorator to catch unhandled exceptions and report them to Hawk with worker type context"

This reverts commit ebb1fd7.

Author: akulistus

lib/utils/catchAndReport.ts

@@ -1,4 +1,3 @@
-import { EventContext } from '@hawk.so/types';
 import * as utils from './lib/utils';
 
 /* Prometheus client for pushing metrics to the pushgateway */
@@ -193,9 +192,7 @@ class WorkerRunner {
 
           utils.sendReport(worker.constructor.name + ' started');
         } catch (startingError) {
-          this.exceptionHandler(startingError, {
-            workerType: worker.type
-          });
+          this.exceptionHandler(startingError);
 
           utils.sendReport(worker.constructor.name + ' failed to start');
 
@@ -212,8 +209,8 @@ class WorkerRunner {
    *
    * @param error - error to handle
    */
-  private exceptionHandler(error: Error, context?: EventContext): void {
-    HawkCatcher.send(error, context);
+  private exceptionHandler(error: Error): void {
+    HawkCatcher.send(error);
 
     console.log(
       '\x1b[41m%s\x1b[0m',
@@ -288,9 +285,7 @@ class WorkerRunner {
         `\n\n Worker ${worker.constructor.name} stopped \n`
       );
     } catch (finishingError) {
-      HawkCatcher.send(finishingError, {
-        workerType: worker.type
-      });
+      HawkCatcher.send(finishingError);
       console.error('Error while finishing Worker: ', finishingError);
     }
   }

runner.ts

@@ -5,7 +5,6 @@ import { Worker } from '../../../lib/worker';
 import * as pkg from '../package.json';
 import { AccountantEvent, EventType, IncomeTransactionPayload, TransactionEvent, TransactionType } from '../types/accountant-worker-events';
 import { WorkspaceDBScheme } from '@hawk.so/types';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 /**
  * Worker for managing workspaces balance
@@ -64,7 +63,6 @@ export default class AccountantWorker extends Worker {
    *
    * @param event
    */
-  @catchAndReport()
   public async handle(event: AccountantEvent): Promise<void> {
     switch (event.type) {
       case EventType.Transaction:

workers/accountant/src/index.ts

@@ -9,7 +9,6 @@ import * as dotenv from 'dotenv';
 import prettysize from 'prettysize';
 import { ProjectDBScheme } from '@hawk.so/types';
 import { HOURS_IN_DAY, MINUTES_IN_HOUR, MS_IN_SEC, SECONDS_IN_MINUTE } from '../../../lib/utils/consts';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 dotenv.config({ path: path.resolve(__dirname, '../.env') });
 
@@ -78,7 +77,6 @@ export default class ArchiverWorker extends Worker {
   /**
    * Task handling function
    */
-  @catchAndReport()
   public async handle(): Promise<void> {
     const dbSizeOnStart = (await this.eventsDbConnection.stats()).dataSize;
 

workers/archiver/src/index.ts

@@ -2,7 +2,6 @@ import { ErrorsCatcherType } from '@hawk.so/types';
 import { EventWorker } from '../../../lib/event-worker';
 import * as pkg from '../package.json';
 import { DefaultEventWorkerTask } from '../types/default-event-worker-task';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 /**
  * Worker for handling Default events
@@ -18,7 +17,6 @@ export default class DefaultEventWorker extends EventWorker {
    *
    * @param event - event to handle
    */
-  @catchAndReport()
   public async handle(event: DefaultEventWorkerTask): Promise<void> {
     /**
      * Define  event type

workers/default/src/index.ts

@@ -31,7 +31,6 @@ import { hasValue } from '../../../lib/utils/hasValue';
  */
 /* eslint-disable-next-line no-unused-vars */
 import { memoize } from '../../../lib/memoize';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 /**
  * eslint does not count decorators as a variable usage
@@ -137,7 +136,6 @@ export default class GrouperWorker extends Worker {
    *
    * @param task - event to handle
    */
-  @catchAndReport()
   public async handle(task: GroupWorkerTask<ErrorsCatcherType>): Promise<void> {
     let uniqueEventHash = await this.getUniqueEventHash(task);
 

workers/grouper/src/index.ts

@@ -14,7 +14,6 @@ import { beautifyUserAgent, getFunctionContext } from './utils';
 import { Collection } from 'mongodb';
 /* eslint-disable-next-line no-unused-vars */
 import { memoize } from '../../../lib/memoize';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 /**
  * eslint does not count decorators as a variable usage
@@ -71,7 +70,6 @@ export default class JavascriptEventWorker extends EventWorker {
    *
    * @param event - event to handle
    */
-  @catchAndReport()
   public async handle(event: JavaScriptEventWorkerTask): Promise<void> {
     if (event.payload.release && event.payload.backtrace) {
       this.logger.info('beautifyBacktrace called');

workers/javascript/src/index.ts

@@ -13,7 +13,6 @@ import { WorkspaceWithTariffPlan } from '../types';
 import * as WorkerNames from '../../../lib/workerNames';
 import { DbHelper } from './dbHelper';
 import * as telegram from '../../../lib/utils/telegram';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 dotenv.config({ path: path.resolve(__dirname, '../.env') });
 
@@ -92,7 +91,6 @@ export default class LimiterWorker extends Worker {
    *
    * @param event - worker event to handle
    */
-  @catchAndReport()
   public async handle(event: LimiterEvent): Promise<void> {
     switch (event.type) {
       case 'regular-workspaces-check':

workers/limiter/src/index.ts

@@ -11,7 +11,6 @@ import { SenderWorkerTask } from 'hawk-worker-sender/types/sender-task';
 import RuleValidator from './validator';
 import TimeMs from '../../../lib/utils/time';
 import RedisHelper from './redisHelper';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 /**
  * Worker to buffer events before sending notifications about them
@@ -57,7 +56,6 @@ export default class NotifierWorker extends Worker {
    *
    * @param task — notifier task to handle
    */
-  @catchAndReport()
   public async handle(task: NotifierWorkerTask): Promise<void> {
     try {
       const { projectId, event } = task;

workers/notifier/src/index.ts

@@ -10,7 +10,6 @@ import axios from 'axios';
 import * as WorkerNames from '../../../lib/workerNames';
 import HawkCatcher from '@hawk.so/nodejs';
 import { countDaysBeforePayday, countDaysAfterPayday, countDaysAfterBlock } from '../../../lib/utils/payday';
-import { catchAndReport } from '../../../lib/utils/catchAndReport';
 
 dotenv.config({
   path: path.resolve(__dirname, '../.env'),
@@ -137,7 +136,6 @@ export default class PaymasterWorker extends Worker {
    *
    * @param event - event to handle
    */
-  @catchAndReport()
   public async handle(event: PaymasterEvent): Promise<void> {
     switch (event.type) {
       case EventType.WorkspaceSubscriptionCheck: