From d95fe113e48925264ff8e9f141891f9ad1d45d85 Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Tue, 7 Jun 2022 10:30:55 -0700
Subject: [PATCH] Fix sql database projects vscode telemetry (#19645)

* fix the wrong extension name getting sent for sql database projects vscode extension

* bump version

* remove print statements

* clean up comment
---
 extensions/sql-database-projects/package.json |  2 +-
 .../sql-database-projects/src/common/utils.ts | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json
index 0fa6ea62f7..b832206060 100644
--- a/extensions/sql-database-projects/package.json
+++ b/extensions/sql-database-projects/package.json
@@ -2,7 +2,7 @@
   "name": "sql-database-projects",
   "displayName": "SQL Database Projects",
   "description": "Enables users to develop and publish database schemas for MSSQL Databases",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "publisher": "Microsoft",
   "preview": true,
   "engines": {
diff --git a/extensions/sql-database-projects/src/common/utils.ts b/extensions/sql-database-projects/src/common/utils.ts
index 16ff7b50d7..fbfc62eefa 100644
--- a/extensions/sql-database-projects/src/common/utils.ts
+++ b/extensions/sql-database-projects/src/common/utils.ts
@@ -352,16 +352,25 @@ export function getPackageInfo(packageJson?: any): IPackageInfo | undefined {
 		packageJson = require('../../package.json');
 	}
 
-	if (packageJson) {
-		return {
-			name: packageJson.name,
-			fullName: `${packageJson.publisher}.${packageJson.name}`,
-			version: packageJson.version,
-			aiKey: packageJson.aiKey
-		};
+	const vscodePackageJson = require('../../package.vscode.json');
+	const azdataApi = getAzdataApi();
+
+	if (!packageJson || !azdataApi && !vscodePackageJson) {
+		return undefined;
 	}
 
-	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 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
+	const extensionName = azdataApi ? packageJson.name : vscodePackageJson.name;
+	const publisher = azdataApi ? packageJson.publisher : vscodePackageJson.publisher;
+
+	return {
+		name: extensionName,
+		fullName: `${publisher}.${extensionName}`,
+		version: packageJson.version,
+		aiKey: packageJson.aiKey
+	};
 }
 
 /**