@fluidframework/routerlicious-driver 2.0.0-internal.2.0.4 → 2.0.0-internal.2.1.1

package/src/documentServiceFactory.ts

@@ -18,7 +18,7 @@ import {
     getQuorumValuesFromProtocolSummary,
     RateLimiter,
 } from "@fluidframework/driver-utils";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
+import { ChildLogger, PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { ISession } from "@fluidframework/server-services-client";
 import { DocumentService } from "./documentService";
 import { IRouterliciousDriverPolicies } from "./policies";
@@ -108,16 +108,34 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
             resolvedUrl.endpoints.ordererUrl,
         );
 
-        // @TODO: Remove returned "string" type when removing back-compat code
-        const res = await ordererRestWrapper.post<{ id: string; token?: string; session?: ISession; } | string>(
-            `/documents/${tenantId}`,
+        const res = await PerformanceEvent.timedExecAsync(
+            logger2,
             {
-                summary: convertSummaryToCreateNewSummary(appSummary),
-                sequenceNumber: documentAttributes.sequenceNumber,
-                values: quorumValues,
-                enableDiscovery: this.driverPolicies.enableDiscovery,
-                generateToken: this.tokenProvider.documentPostCreateCallback !== undefined,
+                eventName: "CreateNew",
+                details: JSON.stringify({
+                    enableDiscovery: this.driverPolicies.enableDiscovery,
+                    sequenceNumber: documentAttributes.sequenceNumber,
+                }),
             },
+            async (event) => {
+                // @TODO: Remove returned "string" type when removing back-compat code
+                const postRes = await ordererRestWrapper.post<
+                    { id: string; token?: string; session?: ISession; } | string
+                >(`/documents/${tenantId}`, {
+                    summary: convertSummaryToCreateNewSummary(appSummary),
+                    sequenceNumber: documentAttributes.sequenceNumber,
+                    values: quorumValues,
+                    enableDiscovery: this.driverPolicies.enableDiscovery,
+                    generateToken:
+                        this.tokenProvider.documentPostCreateCallback !==
+                        undefined,
+                });
+
+                event.end({
+                    docId: typeof postRes === "string" ? postRes : postRes.id,
+                });
+                return postRes;
+            }
         );
 
         // For supporting backward compatibility, when the request has generateToken === true, it will return
@@ -138,12 +156,20 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
 
         // @TODO: Remove token from the condition, checking the documentPostCreateCallback !== undefined
         // is sufficient to determine if the token will be undefined or not.
-        if (token && this.tokenProvider.documentPostCreateCallback !== undefined) {
-            try {
-                await this.tokenProvider.documentPostCreateCallback(documentId, token);
-            } catch (error: any) {
-                throw new DocumentPostCreateError(error);
-            }
+        try {
+            await PerformanceEvent.timedExecAsync(
+                logger2,
+                {
+                    eventName: "DocPostCreateCallback",
+                    docId: documentId,
+                },
+                async () => {
+                    if (token && this.tokenProvider.documentPostCreateCallback !== undefined) {
+                        return this.tokenProvider.documentPostCreateCallback(documentId, token);
+                    }
+                });
+        } catch (error: any) {
+            throw new DocumentPostCreateError(error);
         }
 
         parsedUrl.set("pathname", replaceDocumentIdInPath(parsedUrl.pathname, documentId));
@@ -206,10 +232,18 @@ export class RouterliciousDocumentServiceFactory implements IDocumentServiceFact
                 this.driverPolicies.enableRestLess,
                 resolvedUrl.endpoints.ordererUrl,
             );
-            // The service responds with the current document session associated with the container.
-            const discoveredSession = await ordererRestWrapper.get<ISession>(
-                `/documents/${tenantId}/session/${documentId}`,
-            );
+
+            const discoveredSession = await PerformanceEvent.timedExecAsync(
+                logger2,
+                {
+                    eventName: "DiscoverSession",
+                    docId: documentId,
+                },
+                async () => {
+                    // The service responds with the current document session associated with the container.
+                    return ordererRestWrapper.get<ISession>(
+                        `/documents/${tenantId}/session/${documentId}`);
+                });
             return getDiscoveredFluidResolvedUrl(resolvedUrl, discoveredSession);
         };
         const fluidResolvedUrl: IFluidResolvedUrl = session !== undefined

package/src/index.ts

@@ -4,11 +4,11 @@
  */
 
 // Tokens
-export * from "./defaultTokenProvider";
-export * from "./tokens";
+export { DefaultTokenProvider } from "./defaultTokenProvider";
+export { ITokenProvider, ITokenResponse, ITokenService } from "./tokens";
 
 // Factory
-export * from "./documentServiceFactory";
+export { DocumentPostCreateError, RouterliciousDocumentServiceFactory } from "./documentServiceFactory";
 
 // Configuration
-export * from "./policies";
+export { IRouterliciousDriverPolicies } from "./policies";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-internal.2.0.4";
+export const pkgVersion = "2.0.0-internal.2.1.1";

package/src/restWrapper.ts

@@ -11,6 +11,7 @@ import {
     RestLessClient,
     RestWrapper,
 } from "@fluidframework/server-services-client";
+import { PerformanceEvent } from "@fluidframework/telemetry-utils";
 import fetch from "cross-fetch";
 import type { AxiosRequestConfig, AxiosRequestHeaders } from "axios";
 import safeStringify from "json-stringify-safe";
@@ -145,17 +146,26 @@ export class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {
             token: `${fromUtf8ToBase64(tenantId)}`,
         };
         const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {
-            // Craft credentials using tenant id and token
-            const storageToken = await tokenProvider.fetchStorageToken(
-                tenantId,
-                documentId,
-                refreshToken,
+            return PerformanceEvent.timedExecAsync(
+                logger,
+                {
+                    eventName: "FetchStorageToken",
+                    docId: documentId,
+                },
+                async () => {
+                    // Craft credentials using tenant id and token
+                    const storageToken = await tokenProvider.fetchStorageToken(
+                        tenantId,
+                        documentId,
+                        refreshToken
+                    );
+                    const credentials = {
+                        password: storageToken.jwt,
+                        user: tenantId,
+                    };
+                    return getAuthorizationTokenFromCredentials(credentials);
+                }
             );
-            const credentials = {
-                password: storageToken.jwt,
-                user: tenantId,
-            };
-            return getAuthorizationTokenFromCredentials(credentials);
         };
 
         const restWrapper = new RouterliciousStorageRestWrapper(
@@ -194,12 +204,21 @@ export class RouterliciousOrdererRestWrapper extends RouterliciousRestWrapper {
         baseurl?: string,
     ): Promise<RouterliciousOrdererRestWrapper> {
         const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {
-            const ordererToken = await tokenProvider.fetchOrdererToken(
-                tenantId,
-                documentId,
-                refreshToken,
+            return PerformanceEvent.timedExecAsync(
+                logger,
+                {
+                    eventName: "FetchOrdererToken",
+                    docId: documentId,
+                },
+                async () => {
+                    const ordererToken = await tokenProvider.fetchOrdererToken(
+                        tenantId,
+                        documentId,
+                        refreshToken,
+                    );
+                    return `Basic ${ordererToken.jwt}`;
+                }
             );
-            return `Basic ${ordererToken.jwt}`;
         };
 
         const restWrapper = new RouterliciousOrdererRestWrapper(