From f6f45bc3f96cf1be5cabd3e153345afbeb7fced0 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Fri, 5 Mar 2021 09:02:54 -0800
Subject: [PATCH] Add event for connection error (#14564)

---
 .../telemetry/common/telemetryKeys.ts         |  1 +
 .../browser/connectionManagementService.ts    | 52 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/sql/platform/telemetry/common/telemetryKeys.ts b/src/sql/platform/telemetry/common/telemetryKeys.ts
index da1290ff38..70cfbcd02d 100644
--- a/src/sql/platform/telemetry/common/telemetryKeys.ts
+++ b/src/sql/platform/telemetry/common/telemetryKeys.ts
@@ -6,6 +6,7 @@
 // Telemetry Event Names
 
 export const DatabaseConnected = 'DatabaseConnected';
+export const DatabaseConnectionError = 'DatabaseConnectionError';
 export const DatabaseDisconnected = 'DatabaseDisconnected';
 export const DeleteConnection = 'DeleteConnection';
 export const AddServerGroup = 'AddServerGroup';
diff --git a/src/sql/workbench/services/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
index 2a45d4fae0..4a0c846dbe 100644
--- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
@@ -943,29 +943,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		}
 	}
 
-	private addTelemetryForConnection(connection: ConnectionManagementInfo): void {
-		this._telemetryService.createActionEvent(TelemetryKeys.TelemetryView.Shell, TelemetryKeys.DatabaseConnected)
-			.withAdditionalProperties({
-				connectionType: connection.serverInfo ? (connection.serverInfo.isCloud ? 'Azure' : 'Standalone') : '',
-				provider: connection.connectionProfile.providerName,
-				serverVersion: connection.serverInfo ? connection.serverInfo.serverVersion : '',
-				serverEdition: connection.serverInfo ? connection.serverInfo.serverEdition : '',
-				serverEngineEdition: connection.serverInfo ? connection.serverInfo.engineEditionId : '',
-				isBigDataCluster: connection.serverInfo?.options?.isBigDataCluster ?? false,
-				extensionConnectionTime: connection.extensionTimer.elapsed() - connection.serviceTimer.elapsed(),
-				serviceConnectionTime: connection.serviceTimer.elapsed()
-			})
-			.send();
-	}
-
-	private addTelemetryForConnectionDisconnected(connection: interfaces.IConnectionProfile): void {
-		this._telemetryService.createActionEvent(TelemetryKeys.TelemetryView.Shell, TelemetryKeys.DatabaseDisconnected)
-			.withAdditionalProperties({
-				provider: connection.providerName
-			})
-			.send();
-	}
-
 	public onConnectionComplete(handle: number, info: azdata.ConnectionInfoSummary): void {
 		let connection = this._connectionStatusManager.onConnectionComplete(info);
 
@@ -977,13 +954,34 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 			connection.extensionTimer.stop();
 
 			connection.connectHandler(true);
-			this.addTelemetryForConnection(connection);
+			this._telemetryService.createActionEvent(TelemetryKeys.TelemetryView.Shell, TelemetryKeys.DatabaseConnected)
+				.withAdditionalProperties({
+					connectionType: connection.serverInfo ? (connection.serverInfo.isCloud ? 'Azure' : 'Standalone') : '',
+					provider: connection.connectionProfile.providerName,
+					serverVersion: connection.serverInfo ? connection.serverInfo.serverVersion : '',
+					serverEdition: connection.serverInfo ? connection.serverInfo.serverEdition : '',
+					serverEngineEdition: connection.serverInfo ? connection.serverInfo.engineEditionId : '',
+					isBigDataCluster: connection.serverInfo?.options?.isBigDataCluster ?? false,
+				}).withAdditionalMeasurements({
+					extensionConnectionTimeMs: connection.extensionTimer.elapsed() - connection.serviceTimer.elapsed(),
+					serviceConnectionTimeMs: connection.serviceTimer.elapsed()
+				})
+				.send();
 
 			if (this._connectionStatusManager.isDefaultTypeUri(info.ownerUri)) {
 				this._connectionGlobalStatus.setStatusToConnected(info.connectionSummary);
 			}
 		} else {
 			connection.connectHandler(false, info.errorMessage, info.errorNumber, info.messages);
+			this._telemetryService.createErrorEvent(TelemetryKeys.TelemetryView.Shell, TelemetryKeys.DatabaseConnectionError, info.errorNumber.toString())
+				.withAdditionalProperties({
+					provider: connection.connectionProfile.providerName,
+				})
+				.withAdditionalMeasurements({
+					extensionConnectionTimeMs: connection.extensionTimer.elapsed() - connection.serviceTimer.elapsed(),
+					serviceConnectionTimeMs: connection.serviceTimer.elapsed()
+				})
+				.send();
 		}
 	}
 
@@ -1156,7 +1154,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		}
 		return this.doDisconnect(uri, profile).then(result => {
 			if (result) {
-				this.addTelemetryForConnectionDisconnected(profile);
+				this._telemetryService.createActionEvent(TelemetryKeys.TelemetryView.Shell, TelemetryKeys.DatabaseDisconnected)
+					.withAdditionalProperties({
+						provider: profile.providerName
+					})
+					.send();
 				this._connectionStatusManager.removeConnection(uri);
 			} else {
 				throw result;