diff --git a/packages/loader/driver-utils/package.json b/packages/loader/driver-utils/package.json index 332f5ebcbda5..c70dd6d84d58 100644 --- a/packages/loader/driver-utils/package.json +++ b/packages/loader/driver-utils/package.json @@ -64,7 +64,6 @@ "@fluidframework/core-interfaces": "^0.42.0", "@fluidframework/driver-definitions": "^0.45.2000-0", "@fluidframework/gitresources": "^0.1035.1000", - "@fluidframework/odsp-driver-definitions": "^0.58.3000", "@fluidframework/protocol-base": "^0.1035.1000", "@fluidframework/protocol-definitions": "^0.1027.1000", "@fluidframework/telemetry-utils": "^0.58.3000", @@ -103,4 +102,4 @@ "version": "0.58.3000", "broken": {} } -} \ No newline at end of file +} diff --git a/packages/loader/driver-utils/src/runWithRetry.ts b/packages/loader/driver-utils/src/runWithRetry.ts index 983a25d7792a..f4cf2ffdd2c7 100644 --- a/packages/loader/driver-utils/src/runWithRetry.ts +++ b/packages/loader/driver-utils/src/runWithRetry.ts @@ -5,7 +5,7 @@ import { ITelemetryLogger } from "@fluidframework/common-definitions"; import { delay, performance } from "@fluidframework/common-utils"; -import { OdspErrorType } from "@fluidframework/odsp-driver-definitions"; +import { DriverErrorType } from "@fluidframework/driver-definitions"; import { canRetryOnError, getRetryDelayFromError } from "./network"; import { pkgVersion } from "./packageVersion"; import { NonRetryableError } from "."; @@ -61,15 +61,22 @@ export async function runWithRetry( eventName: `${fetchCallName}_cancel`, retry: numRetries, duration: performance.now() - startTime, + fetchCallName, }, err); throw err; } if (progress.cancel?.aborted === true) { + logger.sendTelemetryEvent({ + eventName: `${fetchCallName}_runWithRetryAborted`, + retry: numRetries, + duration: performance.now() - startTime, + fetchCallName, + }, err); throw new NonRetryableError( - "runWithRetryAborted", - OdspErrorType.fetchTimeout, - { eventName: `runWithRetryAborted_${fetchCallName}`, driverVersion: pkgVersion }, + "runWithRetry was Aborted", + DriverErrorType.genericError, + { driverVersion: pkgVersion, fetchCallName }, ); } @@ -89,6 +96,7 @@ export async function runWithRetry( eventName: `${fetchCallName}_lastError`, retry: numRetries, duration: performance.now() - startTime, + fetchCallName, }, lastError); }