changes

microsoft · Jan 19, 2024 · a73b346 · a73b346
1 parent 2e2d714
commit a73b346
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/src/web/client/extension.ts b/src/web/client/extension.ts
@@ -36,7 +36,6 @@ import { copilotNotificationPanel, disposeNotificationPanel } from "../../common
 import { COPILOT_NOTIFICATION_DISABLED } from "../../common/copilot/constants";
 import * as Constants from "./common/constants"
 import { fetchArtemisResponse } from "../../common/ArtemisService";
-import { oneDSLoggerWrapper } from "../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
 
 export function activate(context: vscode.ExtensionContext): void {
     // setup telemetry
@@ -56,7 +55,6 @@ export function activate(context: vscode.ExtensionContext): void {
         WebExtensionContext.telemetry.getTelemetryReporter()
     );
 
-    oneDSLoggerWrapper.instantiate();
     WebExtensionContext.telemetry.sendInfoTelemetry("activated");
     const portalsFS = new PortalsFS();
     context.subscriptions.push(
@@ -593,4 +591,4 @@ async function logArtemisTelemetry() {
             logArtemisTelemetry.name,
             ARTEMIS_RESPONSE_FAILED);
     }
-}
+}
diff --git a/src/web/client/telemetry/webExtensionTelemetry.ts b/src/web/client/telemetry/webExtensionTelemetry.ts
@@ -10,7 +10,6 @@ import { sanitizeURL } from "../utilities/urlBuilderUtil";
 import { telemetryEventNames } from "./constants";
 import { IPortalWebExtensionInitQueryParametersTelemetryData, IWebExtensionAPITelemetryData, IWebExtensionExceptionTelemetryData, IWebExtensionInitPathTelemetryData, IWebExtensionPerfTelemetryData } from "./webExtensionTelemetryInterface";
 import { isNullOrUndefined } from '../utilities/commonUtil';
-import { oneDSLoggerWrapper } from "../../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
 
 export class WebExtensionTelemetry {
     private _telemetry: TelemetryReporter | undefined;
@@ -34,7 +33,6 @@ export class WebExtensionTelemetry {
             }
         }
         this._telemetry?.sendTelemetryEvent(telemetryData.eventName, telemetryData.properties);
-        oneDSLoggerWrapper.getLogger().traceInfo(telemetryData.eventName, telemetryData.properties)
     }
 
     public sendExtensionInitQueryParametersTelemetry(queryParamsMap: Map<string, string>) {
@@ -56,7 +54,6 @@ export class WebExtensionTelemetry {
             }
         }
         this._telemetry?.sendTelemetryEvent(telemetryData.eventName, telemetryData.properties);
-        oneDSLoggerWrapper.getLogger().traceInfo(telemetryData.eventName, telemetryData.properties)
     }
 
     public sendErrorTelemetry(eventName: string, methodName: string, errorMessage?: string, error?: Error) {
@@ -72,25 +69,15 @@ export class WebExtensionTelemetry {
             telemetryData.properties.stack = error.stack;
         }
         if (errorMessage || error) {
-            let error: Error = new Error(errorMessage);
+            const error: Error = new Error(errorMessage);
             this._telemetry?.sendTelemetryException(error, telemetryData.properties);
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            console.log("here eventName--"+eventName);
-            errorMessage = 'Exception';
-            console.log("here errorMessage--"+errorMessage);
-            error = new Error();
-            console.log("here error--"+error);
-           // oneDSLoggerWrapper.getLogger().traceError(eventName, errorMessage, error, telemetryData.properties)
         } else {
             this._telemetry?.sendTelemetryException(new Error(), telemetryData.properties);
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            oneDSLoggerWrapper.getLogger().traceError(eventName, errorMessage!, new Error(), telemetryData.properties)
         }
     }
 
     public sendInfoTelemetry(eventName: string, properties?: Record<string, string>) {
         this._telemetry?.sendTelemetryEvent(eventName, properties);
-        oneDSLoggerWrapper.getLogger().traceInfo(eventName, properties)
     }
 
     public sendAPITelemetry(
@@ -125,11 +112,8 @@ export class WebExtensionTelemetry {
         if (errorMessage) {
             const error: Error = new Error(errorMessage);
             this._telemetry?.sendTelemetryException(error, { ...telemetryData.properties, eventName: eventName }, telemetryData.measurements);
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            oneDSLoggerWrapper.getLogger().traceError(eventName, errorMessage!, error, { ...telemetryData.properties, eventName: eventName },  telemetryData.measurements)
         } else {
             this._telemetry?.sendTelemetryEvent(telemetryData.eventName, telemetryData.properties, telemetryData.measurements);
-            oneDSLoggerWrapper.getLogger().traceInfo(telemetryData.eventName, telemetryData.properties, telemetryData.measurements)
         }
     }
 
@@ -188,10 +172,9 @@ export class WebExtensionTelemetry {
             }
         }
         this._telemetry?.sendTelemetryEvent(telemetryData.eventName, undefined, telemetryData.measurements);
-        oneDSLoggerWrapper.getLogger().traceInfo(telemetryData.eventName, undefined, telemetryData.measurements)
     }
 
     private getPathParameterValue(parameter: string | undefined | null): string {
         return (parameter) ? parameter : '';
     }
-}
+}