refactor: use await syntax rather than callbacks

snyk · Jul 23, 2021 · 0b833f6 · 0b833f6
1 parent fce83d5
commit 0b833f6
Showing 1 changed file with 64 additions and 68 deletions.
diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts
@@ -61,7 +61,7 @@ export function allowAnalytics(): boolean {
  * given by the data parameter, or called from {@link addDataAndSend}.
  * @param data the analytics data to send to the backend.
  */
-export function postAnalytics(
+export async function postAnalytics(
   data,
 ): Promise<void | { res: needle.NeedleResponse; body: any }> {
   // if the user opt'ed out of analytics, then let's bail out early
@@ -73,74 +73,70 @@ export function postAnalytics(
 
   const isStandalone = version.isStandaloneBuild();
 
-  // get snyk version
-  return version
-    .getVersion()
-    .then(async (version) => {
-      data.version = version;
-      data.os = osName(os.platform(), os.release());
-      data.nodeVersion = process.version;
-      data.standalone = isStandalone;
-      data.integrationName = getIntegrationName(data.args);
-      data.integrationVersion = getIntegrationVersion(data.args);
-      data.integrationEnvironment = getIntegrationEnvironment(data.args);
-      data.integrationEnvironmentVersion = getIntegrationEnvironmentVersion(
-        data.args,
-      );
-
-      const seed = uuidv4();
-      const shasum = crypto.createHash('sha1');
-      data.id = shasum.update(seed).digest('hex');
-
-      const headers = {};
-      if (snyk.api) {
-        headers['authorization'] = 'token ' + snyk.api;
-      }
-
-      data.ci = isCI();
-
-      data.environment = {};
-      if (!isStandalone) {
-        data.environment.npmVersion = await getCommandVersion('npm');
-      }
-
-      data.durationMs = Date.now() - startTime;
-
-      try {
-        const networkTime = MetricsCollector.NETWORK_TIME.getTotal();
-        const cpuTime = data.durationMs - networkTime;
-        MetricsCollector.CPU_TIME.createInstance().setValue(cpuTime);
-        data.metrics = MetricsCollector.getAllMetrics();
-      } catch (err) {
-        debug('Error with metrics', err);
-      }
-
-      const queryStringParams = {};
-      if (data.org) {
-        queryStringParams['org'] = data.org;
-      }
-
-      debug('analytics', JSON.stringify(data, null, '  '));
-
-      const queryString =
-        Object.keys(queryStringParams).length > 0
-          ? queryStringParams
-          : undefined;
-
-      return request({
-        body: {
-          data: data,
-        },
-        qs: queryString,
-        url: config.API + '/analytics/cli',
-        json: true,
-        method: 'post',
-        headers: headers,
-      });
-    })
-    .catch((error) => {
-      debug('analytics', error); // this swallows the analytics error
+  const snykVersion = await version.getVersion();
+
+  try {
+    data.version = snykVersion;
+    data.os = osName(os.platform(), os.release());
+    data.nodeVersion = process.version;
+    data.standalone = isStandalone;
+    data.integrationName = getIntegrationName(data.args);
+    data.integrationVersion = getIntegrationVersion(data.args);
+    data.integrationEnvironment = getIntegrationEnvironment(data.args);
+    data.integrationEnvironmentVersion = getIntegrationEnvironmentVersion(
+      data.args,
+    );
+
+    const seed = uuidv4();
+    const shasum = crypto.createHash('sha1');
+    data.id = shasum.update(seed).digest('hex');
+
+    const headers = {};
+    if (snyk.api) {
+      headers['authorization'] = 'token ' + snyk.api;
+    }
+
+    data.ci = isCI();
+
+    data.environment = {};
+    if (!isStandalone) {
+      data.environment.npmVersion = await getCommandVersion('npm');
+    }
+
+    data.durationMs = Date.now() - startTime;
+
+    try {
+      const networkTime = MetricsCollector.NETWORK_TIME.getTotal();
+      const cpuTime = data.durationMs - networkTime;
+      MetricsCollector.CPU_TIME.createInstance().setValue(cpuTime);
+      data.metrics = MetricsCollector.getAllMetrics();
+    } catch (err) {
+      debug('Error with metrics', err);
+    }
+
+    const queryStringParams = {};
+    if (data.org) {
+      queryStringParams['org'] = data.org;
+    }
+
+    debug('analytics', JSON.stringify(data, null, '  '));
+
+    const queryString =
+      Object.keys(queryStringParams).length > 0 ? queryStringParams : undefined;
+
+    return request({
+      body: {
+        data: data,
+      },
+      qs: queryString,
+      url: config.API + '/analytics/cli',
+      json: true,
+      method: 'post',
+      headers: headers,
     });
+  } catch (err) {
+    debug('analytics', err); // this swallows the analytics error
+  }
 }
 
 /**