Telemetry: Add CLI version to context

code/lib/cli/src/generate.ts

@@ -6,6 +6,7 @@ import leven from 'leven';
 import { sync as readUpSync } from 'read-pkg-up';
 
 import { logger } from '@storybook/node-logger';
+import { globalContext } from '@storybook/telemetry';
 
 import type { CommandOptions } from './generators/types';
 import { initiate } from './initiate';
@@ -20,6 +21,9 @@ import { generateStorybookBabelConfigInCWD } from './babel-config';
 import { dev } from './dev';
 import { build } from './build';
 import { parseList, getEnvConfig } from './utils';
+import versions from './versions';
+
+globalContext.cliVersion = versions.storybook;
 
 const pkg = readUpSync({ cwd: __dirname }).packageJson;
 const consoleLogger = console;

code/lib/telemetry/src/index.ts

@@ -15,6 +15,8 @@ export { getStorybookCoreVersion } from './package-json';
 
 export { getPrecedingUpgrade } from './event-cache';
 
+export { globalContext } from './telemetry';
+
 export const telemetry = async (
   eventType: EventType,
   payload: Payload = {},

code/lib/telemetry/src/telemetry.ts

@@ -16,6 +16,11 @@ let tasks: Promise<any>[] = [];
 // send telemetry
 const sessionId = nanoid();
 
+// context info sent with all events, provided
+// by the app. currently:
+// - cliVersion
+export const globalContext = {} as Record<string, any>;
+
 export async function sendTelemetry(
   data: TelemetryData,
   options: Partial<Options> = { retryDelay: 1000, immediate: false }
@@ -27,8 +32,9 @@ export async function sendTelemetry(
   // flatten the data before we send it
   const { eventType, payload, metadata, ...rest } = data;
   const context = options.stripMetadata
-    ? {}
+    ? globalContext
     : {
+        ...globalContext,
         anonymousId: getAnonymousProjectId(),
         inCI: Boolean(process.env.CI),
         isTTY: process.stdout.isTTY,