Merge pull request #2446 from snyk/feat/analytics-arch

feat: include os architecture in analytics
snyk · Dec 29, 2021 · e91a9bc · e91a9bc
2 parents c2aa312 + 3202e8e
commit e91a9bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/lib/analytics/getStandardData.ts b/src/lib/analytics/getStandardData.ts
@@ -1,7 +1,6 @@
 import * as version from '../version';
 import { v4 as uuidv4 } from 'uuid';
 import * as os from 'os';
-const osName = require('os-name');
 import * as crypto from 'crypto';
 import { isCI } from '../is-ci';
 import {
@@ -11,12 +10,12 @@ import {
   getIntegrationEnvironmentVersion,
   getCommandVersion,
 } from './sources';
-
 import { StandardAnalyticsData } from './types';
 import { MetricsCollector } from '../metrics';
 import * as createDebug from 'debug';
 import { ArgsOptions } from '../../cli/args';
 
+const osName = require('os-name');
 const debug = createDebug('snyk');
 const START_TIME = Date.now();
 
@@ -49,6 +48,9 @@ export async function getStandardData(
 
   const data = {
     os: osName(os.platform(), os.release()),
+    osPlatform: os.platform(),
+    osRelease: os.release(),
+    osArch: os.arch(),
     version: snykVersion,
     nodeVersion: process.version,
     standalone: isStandalone,

diff --git a/test/jest/unit/lib/analytics/getStandardData.spec.ts b/test/jest/unit/lib/analytics/getStandardData.spec.ts
@@ -9,6 +9,9 @@ describe('getStandardData returns object', () => {
 
     expect(standardData).toMatchObject({
       os: expect.any(String),
+      osPlatform: expect.any(String),
+      osRelease: expect.any(String),
+      osArch: expect.any(String),
       version: '1.0.0-monorepo',
       id: expect.any(String),
       ci: expect.any(Boolean),
@@ -49,6 +52,9 @@ describe('getStandardData returns object', () => {
     const standardData = await getStandardData(args);
     expect(standardData).toMatchObject({
       os: expect.any(String),
+      osPlatform: expect.any(String),
+      osRelease: expect.any(String),
+      osArch: expect.any(String),
       version: '1.0.0-monorepo',
       id: expect.any(String),
       ci: expect.any(Boolean),