ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix data workspace vscode telemetry (#19768)

Browse Source 
* fix data workspace vscode extension telemetry extension name

* remove unused fullName
This commit is contained in:
Kim Santiago
2022-06-20 14:11:15 -07:00
committed by GitHub
parent f7286b8e81
commit 0aadd317fa
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/data-workspace/src/common/utils.ts
View File

@@ -40,15 +40,23 @@ export interface IPackageInfo {
} }
export function getPackageInfo(packageJson: any): IPackageInfo | undefined { export function getPackageInfo(packageJson: any): IPackageInfo | undefined {
if (packageJson) { const vscodePackageJson = require('../../package.vscode.json');
const azdataApi = getAzdataApi();
if (!packageJson || !azdataApi && !vscodePackageJson) {
return undefined;
}
// When the extension is compiled and packaged, the content of package.json get copied here in the extension.js. This happens before the
// package.vscode.json values replace the corresponding values in the package.json for the data-workspace-vscode extension
// so we need to read these values directly from the package.vscode.json to get the correct extension and publisher names
const extensionName = azdataApi ? packageJson.name : vscodePackageJson.name;
return { return {
name: packageJson.name, name: extensionName,
version: packageJson.version, version: packageJson.version,
aiKey: packageJson.aiKey aiKey: packageJson.aiKey
}; };
}
return undefined;
} }
// Try to load the azdata API - but gracefully handle the failure in case we're running // Try to load the azdata API - but gracefully handle the failure in case we're running

3
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -342,7 +342,6 @@ export async function getDefaultPublishDeploymentOptions(project: Project): Prom
export interface IPackageInfo { export interface IPackageInfo {
name: string; name: string;
fullName: string;
version: string; version: string;
aiKey: string; aiKey: string;
} }
@@ -363,11 +362,9 @@ export function getPackageInfo(packageJson?: any): IPackageInfo | undefined {
// package.vscode.json values replace the corresponding values in the package.json for the sql-database-projects-vscode extension // package.vscode.json values replace the corresponding values in the package.json for the sql-database-projects-vscode extension
// so we need to read these values directly from the package.vscode.json to get the correct extension and publisher names // so we need to read these values directly from the package.vscode.json to get the correct extension and publisher names
const extensionName = azdataApi ? packageJson.name : vscodePackageJson.name; const extensionName = azdataApi ? packageJson.name : vscodePackageJson.name;
const publisher = azdataApi ? packageJson.publisher : vscodePackageJson.publisher;
return { return {
name: extensionName, name: extensionName,
fullName: `${publisher}.${extensionName}`,
version: packageJson.version, version: packageJson.version,
aiKey: packageJson.aiKey aiKey: packageJson.aiKey
}; };