🔊 improve and tidy up logs

Author: LemonaOna

src/cache/storage/redis-storage-adapter.ts

@@ -47,6 +47,7 @@ export class RedisStorageAdapter implements StorageAdapter {
     if (!value) {
       return null;
     }
+
     const decompressed = await inflate(Buffer.from(value, 'base64'));
     const result = JSON.parse(decompressed.toString());
     return result;

src/cache/token-cache-storage.ts

@@ -17,11 +17,6 @@ export class TokenCacheStorage implements TokenCache {
   public async get(key: string): Promise<TokenCacheItem | null> {
     const keyWithPrefix = this.buildKey(key);
     try {
-      infoLogger(
-        this.logPrefix,
-        'Trying to get token from cache',
-        keyWithPrefix,
-      );
       return await this.storage.get<TokenCacheItem>(keyWithPrefix);
     } catch (e) {
       errorLogger(

src/models/controller.model.ts

@@ -274,8 +274,6 @@ export class Controller {
     res: Response,
     next: NextFunction,
   ): Promise<void> {
-    console.log('traceIdFromHeader', req.headers.traceparent);
-
     const { providerConfig } = req;
     try {
       if (!providerConfig) {
@@ -293,7 +291,7 @@ export class Controller {
 
       infoLogger(
         'streamContacts',
-        `Starting contact streaming ${timestamp} - orderingKey ${orderingKey}`,
+        `[${orderingKey}] Starting contact streaming`,
         providerConfig.apiKey,
       );
 
@@ -312,14 +310,13 @@ export class Controller {
               ),
               state: PubSubContactsState.IN_PROGRESS,
               integrationName: this.integrationName,
-              // traceparent: tracer.getTraceParent(),
             },
             orderingKey,
           );
         } catch (error) {
           errorLogger(
             'streamContacts',
-            `Could not publish contacts`,
+            `[${orderingKey}] Could not publish contacts`,
             providerConfig.apiKey,
             error,
           );
@@ -352,15 +349,14 @@ export class Controller {
               contacts: [],
               state: PubSubContactsState.COMPLETE,
               integrationName: this.integrationName,
-              // traceparent: tracer.getTraceParent(),
             },
             orderingKey,
           );
         })
         .catch(async (error) => {
           errorLogger(
             'streamContacts',
-            'Could not stream contacts',
+            `[${orderingKey}] Could not stream contacts`,
             providerConfig.apiKey,
             error,
           );
@@ -371,15 +367,14 @@ export class Controller {
               contacts: [],
               state: PubSubContactsState.FAILED,
               integrationName: this.integrationName,
-              // traceparent: tracer.getTraceParent(),
             },
             orderingKey,
           );
         })
         .catch((error) => {
           errorLogger(
             'streamContacts',
-            'Could not publish failed message',
+            `[${orderingKey}] Could not publish failed message`,
             providerConfig.apiKey,
             error,
           );
@@ -395,14 +390,18 @@ export class Controller {
         } catch (error) {
           errorLogger(
             'streamContacts',
-            'Could not get and refresh token',
+            `[${orderingKey}] Could not get and refresh token`,
             providerConfig.apiKey,
             error,
           );
         }
       }
 
-      infoLogger('streamContacts', 'END', providerConfig.apiKey);
+      infoLogger(
+        `[${orderingKey}] streamContacts`,
+        'END',
+        providerConfig.apiKey,
+      );
 
       res.status(200).send({ timestamp });
 
@@ -419,7 +418,7 @@ export class Controller {
 
       errorLogger(
         'streamContacts',
-        'Could not stream contacts',
+        `Could not stream contacts`,
         providerConfig?.apiKey,
         error,
       );