From 3202e8ea64cba8a045b4691dda989ae370c210aa Mon Sep 17 00:00:00 2001 From: Jahed Ahmed Date: Fri, 10 Dec 2021 17:06:00 +0000 Subject: [PATCH] feat: include os architecture in analytics --- src/lib/analytics/getStandardData.ts | 6 ++++-- test/jest/unit/lib/analytics/getStandardData.spec.ts | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/analytics/getStandardData.ts b/src/lib/analytics/getStandardData.ts index 59cccd41dc..5d1d37cc9b 100644 --- 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 index 3f909663a7..26336f3980 100644 --- 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),