Skip to content

Commit 1857c62

Browse files
authored
Update Ansible metadata event (#853)
* Update Ansible metadata event * Add telemetry to identify if Ansible Lightspeed and code assist is enabled or disabled * Read EE enabled from VSCode Ansible settings * fix typo
1 parent 9a8aa05 commit 1857c62

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

USAGE_DATA.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ vscode-ansible has opt-in telemetry collection, provided by
1414
- ansible-navigator run command runs successfully or fails.
1515
- Ansible vault (ansible-vault) command run in case it fails.
1616
- Resync Ansible inventory (ansible-inventory) command run in case it fails.
17+
- Execution environment enabled or disabled
18+
- Ansible Lightspeed enabled or disabled
19+
- Ansible Lightspeed code assist enabled or disabled
1720

1821
## What's included in the general telemetry data
1922

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
9797
new AnsiblePlaybookRunProvider(context, extSettings.settings, telemetry);
9898

9999
// handle metadata status bar
100-
const metaData = new MetadataManager(context, client, telemetry);
100+
const metaData = new MetadataManager(context, client, telemetry, extSettings);
101101
metaData.updateAnsibleInfoInStatusbar();
102102

103103
// handle Ansible Lightspeed

src/features/ansibleMetaData.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,21 @@ import { LanguageClient } from "vscode-languageclient/node";
1212
import { TelemetryManager } from "../utils/telemetryUtils";
1313
import { formatAnsibleMetaData } from "./utils/formatAnsibleMetaData";
1414
import { compareObjects } from "./utils/data";
15+
import { SettingsManager } from "../settings";
1516

1617
interface ansibleMetadataEvent {
1718
ansibleVersion: string;
1819
ansibleLintVersion?: string;
1920
eeEnabled: boolean;
21+
lightSpeedEnabled: boolean;
22+
lightSpeedCodeAssistEnabled: boolean;
2023
}
2124

2225
let prevEventData: ansibleMetadataEvent = {
2326
ansibleVersion: "",
2427
eeEnabled: false,
28+
lightSpeedEnabled: false,
29+
lightSpeedCodeAssistEnabled: false,
2530
};
2631

2732
export class MetadataManager {
@@ -30,15 +35,18 @@ export class MetadataManager {
3035
private cachedAnsibleVersion = "";
3136
private metadataStatusBarItem: StatusBarItem;
3237
private telemetry: TelemetryManager;
38+
private extensionSettings: SettingsManager;
3339

3440
constructor(
3541
context: ExtensionContext,
3642
client: LanguageClient,
37-
telemetry: TelemetryManager
43+
telemetry: TelemetryManager,
44+
extensionSettings: SettingsManager
3845
) {
3946
this.context = context;
4047
this.client = client;
4148
this.telemetry = telemetry;
49+
this.extensionSettings = extensionSettings;
4250

4351
this.metadataStatusBarItem = this.initialiseStatusBar();
4452
}
@@ -105,7 +113,13 @@ export class MetadataManager {
105113
const eventData: ansibleMetadataEvent = {
106114
ansibleVersion:
107115
ansibleMetaData.metaData["ansible information"]["core version"],
108-
eeEnabled: ansibleMetaData.eeEnabled,
116+
eeEnabled:
117+
this.extensionSettings.settings.executionEnvironment.enabled,
118+
lightSpeedEnabled:
119+
this.extensionSettings.settings.lightSpeedService.enabled,
120+
lightSpeedCodeAssistEnabled:
121+
this.extensionSettings.settings.lightSpeedService.suggestions
122+
.enabled,
109123
};
110124
if (ansibleMetaData.ansibleLintPresent) {
111125
eventData["ansibleLintVersion"] =

src/features/utils/formatAnsibleMetaData.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export function formatAnsibleMetaData(ansibleMetaData: any) {
3232
markdown,
3333
ansiblePresent,
3434
ansibleLintPresent,
35-
eeEnabled,
3635
};
3736
}
3837

0 commit comments

Comments
 (0)