fix: flag type when passing data to child process

forcedotcom · Jan 10, 2020 · 0e5204b · 0e5204b
1 parent 1bd097e
commit 0e5204b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/packages/telemetry/src/telemetryChildProcess.ts b/packages/telemetry/src/telemetryChildProcess.ts
@@ -6,15 +6,24 @@ import { TelemetryReporter } from './telemetryReporter';
   const args = process.argv.slice(2);
   const options = JSON.parse(args[0]);
   const reporter = await TelemetryReporter.create(options);
-  process.on('message', event => {
-    if (event.eventName) {
-      reporter.sendTelemetryEvent(event.eventName, event.attributes);
-    } else if (event.exception) {
-      reporter.sendTelemetryException(event.exception, event.attributes);
-    } else if (event.traceMessage) {
-      reporter.sendTelemetryTrace(event.traceMessage, event.properties);
-    } else if (event.metricName) {
-      reporter.sendTelemetryMetric(event.metricName, event.value, event.properties);
+  process.on('message', telemetry => {
+    switch (telemetry.type) {
+      case 'event': {
+        reporter.sendTelemetryEvent(telemetry.eventName, telemetry.attributes);
+        break;
+      }
+      case 'exception': {
+        reporter.sendTelemetryException(telemetry.exception, telemetry.attributes);
+        break;
+      }
+      case 'metric': {
+        reporter.sendTelemetryMetric(telemetry.metricName, telemetry.value, telemetry.properties);
+        break;
+      }
+      case 'trace': {
+        reporter.sendTelemetryTrace(telemetry.traceMessage, telemetry.properties);
+        break;
+      }
     }
   });
 })();
diff --git a/packages/telemetry/src/telemetryReporter.ts b/packages/telemetry/src/telemetryReporter.ts
@@ -240,7 +240,7 @@ export class SpawnedTelemetryReporter extends AsyncCreatable<TelemetryOptions> {
    */
   public sendTelemetryEvent(eventName: string, attributes: Attributes = {}): void {
     if (this.forkedProcess) {
-      this.forkedProcess.send({ eventName, attributes });
+      this.forkedProcess.send({ type: 'event', eventName, attributes });
     }
   }
 
@@ -251,7 +251,7 @@ export class SpawnedTelemetryReporter extends AsyncCreatable<TelemetryOptions> {
    */
   public sendTelemetryException(exception: Error, attributes: Attributes = {}): void {
     if (this.forkedProcess) {
-      this.forkedProcess.send({ exception, attributes });
+      this.forkedProcess.send({ type: 'exception', exception, attributes });
     }
   }
 
@@ -262,7 +262,7 @@ export class SpawnedTelemetryReporter extends AsyncCreatable<TelemetryOptions> {
    */
   public sendTelemetryTrace(traceMessage: string, properties?: Properties): void {
     if (this.forkedProcess) {
-      this.forkedProcess.send({ traceMessage, properties });
+      this.forkedProcess.send({ type: 'trace', traceMessage, properties });
     }
   }
 
@@ -274,7 +274,7 @@ export class SpawnedTelemetryReporter extends AsyncCreatable<TelemetryOptions> {
    */
   public sendTelemetryMetric(metricName: string, value: number, properties?: Properties): void {
     if (this.forkedProcess) {
-      this.forkedProcess.send({ metricName, value, properties });
+      this.forkedProcess.send({ type: 'metric', metricName, value, properties });
     }
   }