fix console logs and file path regex

aws-amplify · Feb 17, 2025 · 5239b78 · 5239b78
1 parent b1826fe
commit 5239b78
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/platform-core/src/telemetry-data/serializable_error.test.ts b/packages/platform-core/src/telemetry-data/serializable_error.test.ts
@@ -85,7 +85,7 @@ void describe('serializable error', () => {
     );
     error.stack = `${error.stack}  at methodName (${pathToFileURL(
       process.cwd()
-    ).toString()}:12:34)\n`;
+    ).toString()}/node_modules/@aws-amplify/test-package/lib/test.js:12:34)\n`;
     const serializableError = new SerializableError(error);
     assert.ok(serializableError.stack);
     const matches = [
@@ -95,5 +95,7 @@ void describe('serializable error', () => {
       matches.length === 0,
       `${os.homedir()} is included in ${serializableError.stack}`
     );
+    const expectedFilePath = 'node_modules/@aws-amplify/test-package/lib/test.js';
+    assert.ok(serializableError.stack.includes(expectedFilePath), `${expectedFilePath} is not found in ${serializableError.stack}`);
   });
 });
diff --git a/packages/platform-core/src/telemetry-data/serializable_error.ts b/packages/platform-core/src/telemetry-data/serializable_error.ts
@@ -13,9 +13,9 @@ export class SerializableError {
   // breakdown of filePathRegex:
   // (file:/+)? -> matches optional file url prefix
   // homedir() -> users home directory, replacing \ with /
-  // [\\w.\\-_\\\\/]+ -> matches nested directories and file name
+  // [\\w.\\-_@\\\\/]+ -> matches nested directories and file name
   private filePathRegex = new RegExp(
-    `(file:/+)?${homedir().replaceAll('\\', '/')}[\\w.\\-_\\\\/]+`,
+    `(file:/+)?${homedir().replaceAll('\\', '/')}[\\w.\\-_@\\\\/]+`,
     'g'
   );
   private arnRegex =

diff --git a/packages/platform-core/src/telemetry-data/telemetry_data_emitter.ts b/packages/platform-core/src/telemetry-data/telemetry_data_emitter.ts
@@ -67,7 +67,7 @@ export class DefaultTelemetryDataEmitter implements TelemetryDataEmitter {
         metrics,
         dimensions,
       });
-      console.log(data);
+      console.log(JSON.stringify(data, null, 2));
       // await this.send(data);
       // eslint-disable-next-line amplify-backend-rules/no-empty-catch
     } catch {
@@ -87,7 +87,7 @@ export class DefaultTelemetryDataEmitter implements TelemetryDataEmitter {
         metrics,
         dimensions,
       });
-      console.log(data);
+      console.log(JSON.stringify(data, null, 2));
       // await this.send(data);
       // eslint-disable-next-line amplify-backend-rules/no-empty-catch
     } catch {
@@ -105,7 +105,7 @@ export class DefaultTelemetryDataEmitter implements TelemetryDataEmitter {
         metrics,
         dimensions,
       });
-      console.log(data);
+      console.log(JSON.stringify(data, null, 2));
       // await this.send(data);
       // eslint-disable-next-line amplify-backend-rules/no-empty-catch
     } catch {
@@ -200,8 +200,6 @@ export class DefaultTelemetryDataEmitter implements TelemetryDataEmitter {
       }
     }
 
-    console.log('path', path);
-    console.log('parameters', parameters);
     return { path: path.split(' '), parameters: parameters.split(' ') };
   };