feat: pass config to sendTelemetry parameter

Author: DmitryAnansky

packages/cli/src/utils/telemetry.ts

@@ -6,7 +6,7 @@ import { version } from './package.js';
 import { getReuniteUrl } from '../reunite/api/index.js';
 
 import type { ExitCode } from './miscellaneous.js';
-import type { ArazzoDefinition } from '@redocly/openapi-core';
+import type { ArazzoDefinition, Config } from '@redocly/openapi-core';
 import type { ExtendedSecurity } from 'respect-core/src/types.js';
 import type { Arguments } from 'yargs';
 import type { CommandOptions } from '../types.js';
@@ -34,19 +34,17 @@ export type Analytics = {
 };
 
 export async function sendTelemetry({
-  residency,
+  config,
   argv,
   exit_code,
-  has_config,
   spec_version,
   spec_keyword,
   spec_full_version,
   respect_x_security_auth_types,
 }: {
-  residency: string | undefined;
+  config: Config | undefined;
   argv: Arguments | undefined;
   exit_code: ExitCode;
-  has_config: boolean | undefined;
   spec_version: string | undefined;
   spec_keyword: string | undefined;
   spec_full_version: string | undefined;
@@ -62,6 +60,8 @@ export async function sendTelemetry({
       ...args
     } = argv;
     const event_time = new Date().toISOString();
+    const residency = (argv.residency as string) || config?.rawConfig?.residency;
+    const has_config = !!config?.rawConfig;
     const { RedoclyOAuthClient } = await import('../auth/oauth-client.js');
     const oauthClient = new RedoclyOAuthClient('redocly-cli', version);
     const reuniteUrl = getReuniteUrl(residency);

packages/cli/src/wrapper.ts

@@ -27,7 +27,6 @@ export function commandWrapper<T extends CommandOptions>(
 ) {
   return async (argv: Arguments<T>) => {
     let code: ExitCode = 2;
-    let hasConfig;
     let telemetry;
     let specVersion: string | undefined;
     let specKeyword: string | undefined;
@@ -63,7 +62,6 @@ export function commandWrapper<T extends CommandOptions>(
       }
       config = await loadConfigAndHandleErrors(argv as Exact<T>, version);
       telemetry = config.resolvedConfig.telemetry;
-      hasConfig = !!config.rawConfig;
       code = 1;
       if (typeof commandHandler === 'function') {
         await commandHandler({ argv, config, version, collectSpecData });
@@ -83,12 +81,10 @@ export function commandWrapper<T extends CommandOptions>(
       }
     } finally {
       if (process.env.REDOCLY_TELEMETRY !== 'off' && telemetry !== 'off') {
-        const residency = (argv.residency as string) || config?.rawConfig?.residency;
         await sendTelemetry({
-          residency,
+          config,
           argv,
           exit_code: code,
-          has_config: hasConfig,
           spec_version: specVersion,
           spec_keyword: specKeyword,
           spec_full_version: specFullVersion,