imp(): js worker event type improved

Author: e11sy

workers/archiver/tests/index.test.ts

@@ -102,10 +102,6 @@ describe('Archiver worker', () => {
 
     const changedProject = await projectCollection.findOne({ _id: mockedProject._id });
 
-    // console.log('Changed project:', changedProject);
-    // console.log('repetitions: ', await repetitionsCollection.find({projectId: changedProject._id}).toArray());
-    // console.log('events: ', await eventsCollection.find({projectId: changedProject._id}).toArray());
-
     let originalEventsDeletedCount = 0;
 
     mockedEvents.forEach(event => {
@@ -114,9 +110,6 @@ describe('Archiver worker', () => {
       }
     });
 
-    // console.log('originalEventsDeletedCount:', originalEventsDeletedCount);
-    // console.log('archiveEventsCount:', archiveEventsCount);
-
     expect(changedProject.archivedEventsCount).toBe(archiveEventsCount + originalEventsDeletedCount);
   });
 

workers/default/types/default-event-worker-task.d.ts

@@ -1,16 +1,12 @@
-import { CatcherMessageAccepted, CatcherMessagePayload } from '@hawk.so/types';
+import { CatcherMessageAccepted, CatcherMessagePayload, ErrorsCatcherType } from '@hawk.so/types';
 
 /**
- * Format of task for Default Event Worker
+ * Default Event Worker can process events with all types except 'errors/javascript'
+ * because it is handled by JavaScript Event Worker.
  */
-export interface DefaultEventWorkerTask extends CatcherMessageAccepted<'errors/default'> {
-  /**
-   * Language-specific payload
-   */
-  payload: CatcherMessagePayload<'errors/default'>;
+export type DefaultCatcherMessageType = Exclude<ErrorsCatcherType, 'errors/javascript'>
 
-  /**
-   * Unix timestamp of the event
-   */
-  timestamp: number;
-}
+/**
+ * Format of task for Default Event Worker
+ */
+export interface DefaultEventWorkerTask extends CatcherMessageAccepted<DefaultCatcherMessageType> {}

workers/grouper/src/index.ts

@@ -100,7 +100,6 @@ export default class GrouperWorker extends Worker {
    *
    * @param task - event to handle
    */
-  // @todo export ErrorsCatcherType from types and use it here
   public async handle(task: GroupWorkerTask<ErrorsCatcherType>): Promise<void> {
     let uniqueEventHash = await this.getUniqueEventHash(task);
 

workers/grouper/tests/index.test.ts

@@ -326,8 +326,7 @@ describe('GrouperWorker', () => {
     test('Should save event even if its context is type of string', async () => {
       const task = generateTask();
 
-      // @todo export ErrorsCatcherType from types and use it here
-      (task.payload as CatcherMessagePayload<'errors/javascript' | 'errors/php' | 'errors/nodejs' | 'errors/go' | 'errors/python'>).context = 'string context';
+      task.payload.context = 'string context';
       await worker.handle(task);
 
       expect((await eventsCollection.findOne({})).payload.context).toBe(null);
@@ -393,7 +392,7 @@ describe('GrouperWorker', () => {
       expect(typeof savedRepetition.delta).toBe('string');
     });
 
-    test.only('Should correctly calculate diff after encoding original event when they are the same', async () => {
+    test('Should correctly calculate diff after encoding original event when they are the same', async () => {
       await worker.handle(generateTask({ user: { id: '123' } }));
       await worker.handle(generateTask({ user: { id: '123' } }));
 

workers/javascript/types/javascript-event-worker-task.d.ts

@@ -3,14 +3,4 @@ import { CatcherMessageAccepted, CatcherMessagePayload } from '@hawk.so/types';
 /**
  * Format of task for JavaScript Event Worker
  */
-export interface JavaScriptEventWorkerTask extends CatcherMessageAccepted<'errors/javascript'> {
-  /**
-   * Language-specific payload
-   */
-  payload: CatcherMessagePayload<'errors/javascript'>;
-
-  /**
-   * Unix timestamp of the event
-   */
-  timestamp: number;
-}
+export interface JavaScriptEventWorkerTask extends CatcherMessageAccepted<'errors/javascript'> {}

workers/sentry/src/index.ts

@@ -100,7 +100,7 @@ export default class SentryEventWorker extends Worker {
    * @param envelopeHeader - Sentry envelope header
    * @param eventItem - Sentry event item
    * @param projectId - Hawk project ID
-   * @param isJsSDK - Whether the event is from a Sentry JavaScript SDK
+   * @param isJsSDK - Whether the event is from a Sentry JavaScript-related SDK
    */
   private transformToHawkFormat(
     envelopeHeader: EventEnvelope[0],

workers/sentry/tests/converter.test.ts

@@ -156,6 +156,7 @@ describe('converter utils', () => {
         platform: 'javascript',
         // eslint-disable-next-line @typescript-eslint/naming-convention
         server_name: 'test-server',
+        release: '1.0.0',
         dist: '1.0.0',
         environment: 'production',
         request: { url: 'https://test.com' },