update

Author: zhiyuanliang-ms

src/afd/constants.ts

@@ -1,4 +1,4 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SERVER_TIMESTAMP_HEADER = "x-ms-date";
+export const X_MS_DATE_HEADER = "x-ms-date";

src/appConfigurationImpl.ts

@@ -68,7 +68,7 @@ import { ConfigurationClientManager } from "./configurationClientManager.js";
 import { getFixedBackoffDuration, getExponentialBackoffDuration } from "./common/backoffUtils.js";
 import { InvalidOperationError, ArgumentError, isFailoverableError, isInputError } from "./common/errors.js";
 import { ErrorMessages } from "./common/errorMessages.js";
-import { SERVER_TIMESTAMP_HEADER } from "./afd/constants.js";
+import { X_MS_DATE_HEADER } from "./afd/constants.js";
 
 const MIN_DELAY_FOR_UNHANDLED_FAILURE = 5_000; // 5 seconds
 
@@ -745,13 +745,16 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
                 let i = 0;
                 for await (const page of pageIterator) {
-                    const timestamp = this.#getResponseTimestamp(page);
+                    const serverResponseTime = this.#getMsDateHeader(page);
                     if (i >= pageWatchers.length) {
                         return true;
                     }
 
                     const lastServerResponseTime = pageWatchers[i].lastServerResponseTime;
-                    const isUpToDate = lastServerResponseTime ? timestamp > lastServerResponseTime : true;
+                    let isUpToDate = true;
+                    if (lastServerResponseTime !== undefined && serverResponseTime !== undefined) {
+                        isUpToDate = serverResponseTime > lastServerResponseTime;
+                    }
                     if (isUpToDate && page._response.status === 200 && page.etag !== pageWatchers[i].etag) {
                         return true;
                     }
@@ -802,7 +805,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
             const items: ConfigurationSetting[] = [];
             for await (const page of pageIterator) {
-                pageWatchers.push({ etag: page.etag, lastServerResponseTime: this.#getResponseTimestamp(page) });
+                pageWatchers.push({ etag: page.etag, lastServerResponseTime: this.#getMsDateHeader(page) });
                 items.push(...page.items);
             }
             return { items, pageWatchers };
@@ -1132,16 +1135,22 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     }
 
     /**
-     * Extracts the response timestamp from the headers. If not found, returns the current time.
+     * Extracts the response timestamp (x-ms-date) from the response headers. If not found, returns the current time.
      */
-    #getResponseTimestamp(response: GetConfigurationSettingResponse | ListConfigurationSettingPage | RestError): Date {
+    #getMsDateHeader(response: GetConfigurationSettingResponse | ListConfigurationSettingPage | RestError): Date {
         let header: string | undefined;
         if (isRestError(response)) {
-            header = response.response?.headers?.get(SERVER_TIMESTAMP_HEADER) ?? undefined;
+            header = response.response?.headers?.get(X_MS_DATE_HEADER);
         } else {
-            header = response._response?.headers?.get(SERVER_TIMESTAMP_HEADER) ?? undefined;
+            header = response._response?.headers?.get(X_MS_DATE_HEADER);
+        }
+        if (header !== undefined) {
+            const date = new Date(header);
+            if (!isNaN(date.getTime())) {
+                return date;
+            }
         }
-        return header ? new Date(header) : new Date();
+        return new Date();
     }
 }
 

src/requestTracing/utils.ts

@@ -117,13 +117,12 @@ function createCorrelationContextHeader(requestTracingOptions: RequestTracingOpt
     Host: identify with defined envs
     Env: identify by env `NODE_ENV` which is a popular but not standard. Usually, the value can be "development", "production".
     ReplicaCount: identify how many replicas are found
-    Features: LB
+    Features: LB+AI+AICC+AFD
     Filter: CSTM+TIME+TRGT
     MaxVariants: identify the max number of variants feature flag uses
     FFFeatures: Seed+Telemetry
     UsersKeyVault
     Failover
-    AFD
     */
     const keyValues = new Map<string, string | undefined>();
     const tags: string[] = [];
@@ -155,9 +154,6 @@ function createCorrelationContextHeader(requestTracingOptions: RequestTracingOpt
     if (requestTracingOptions.isFailoverRequest) {
         tags.push(FAILOVER_REQUEST_TAG);
     }
-    if (requestTracingOptions.isAfdUsed) {
-        tags.push(AFD_USED_TAG);
-    }
     if (requestTracingOptions.replicaCount > 0) {
         keyValues.set(REPLICA_COUNT_KEY, requestTracingOptions.replicaCount.toString());
     }
@@ -189,7 +185,8 @@ export function requestTracingEnabled(): boolean {
 
 function usesAnyTracingFeature(requestTracingOptions: RequestTracingOptions): boolean {
     return (requestTracingOptions.appConfigOptions?.loadBalancingEnabled ?? false) ||
-        (requestTracingOptions.aiConfigurationTracing?.usesAnyTracingFeature() ?? false);
+        (requestTracingOptions.aiConfigurationTracing?.usesAnyTracingFeature() ?? false) ||
+        requestTracingOptions.isAfdUsed;
 }
 
 function createFeaturesString(requestTracingOptions: RequestTracingOptions): string {
@@ -203,6 +200,9 @@ function createFeaturesString(requestTracingOptions: RequestTracingOptions): str
     if (requestTracingOptions.aiConfigurationTracing?.usesAIChatCompletionConfiguration) {
         tags.push(AI_CHAT_COMPLETION_CONFIGURATION_TAG);
     }
+    if (requestTracingOptions.isAfdUsed) {
+        tags.push(AFD_USED_TAG);
+    }
     return tags.join(DELIMITER);
 }
 

test/afd.test.ts

@@ -11,13 +11,13 @@ import { AppConfigurationClient } from "@azure/app-configuration";
 import { load, loadFromAzureFrontDoor } from "../src/index.js";
 import { ErrorMessages } from "../src/common/errorMessages.js";
 import { createMockedKeyValue, createMockedFeatureFlag, HttpRequestHeadersPolicy, getCachedIterator, sinon, restoreMocks, createMockedConnectionString, createMockedAzureFrontDoorEndpoint, sleepInMs } from "./utils/testHelper.js";
-import { SERVER_TIMESTAMP_HEADER } from "../src/afd/constants.js";
+import { X_MS_DATE_HEADER } from "../src/afd/constants.js";
 import { isBrowser } from "../src/requestTracing/utils.js";
 
 function createTimestampHeaders(timestamp: string | Date) {
     const value = timestamp instanceof Date ? timestamp.toUTCString() : new Date(timestamp).toUTCString();
     return {
-        get: (name: string) => name.toLowerCase() === SERVER_TIMESTAMP_HEADER ? value : undefined
+        get: (name: string) => name.toLowerCase() === X_MS_DATE_HEADER ? value : undefined
     };
 }