update

Author: zhiyuanliang-ms

src/requestTracing/FeatureFlagTracingOptions.ts

@@ -52,44 +52,27 @@ export class FeatureFlagTracingOptions {
     }
 
     createFeatureFiltersString(): string {
-        if (!this.usesAnyFeatureFilter()) {
-            return "";
-        }
-
-        let result: string = "";
+        const tags: string[] = [];
         if (this.usesCustomFilter) {
-            result += CUSTOM_FILTER_KEY;
+            tags.push(CUSTOM_FILTER_KEY);
         }
         if (this.usesTimeWindowFilter) {
-            if (result !== "") {
-                result += DELIMITER;
-            }
-            result += TIME_WINDOW_FILTER_KEY;
+            tags.push(TIME_WINDOW_FILTER_KEY);
         }
         if (this.usesTargetingFilter) {
-            if (result !== "") {
-                result += DELIMITER;
-            }
-            result += TARGETING_FILTER_KEY;
+            tags.push(TARGETING_FILTER_KEY);
         }
-        return result;
+        return tags.join(DELIMITER);
     }
 
     createFeaturesString(): string {
-        if (!this.usesAnyTracingFeature()) {
-            return "";
-        }
-
-        let result: string = "";
+        const tags: string[] = [];
         if (this.usesSeed) {
-            result += FF_SEED_USED_TAG;
+            tags.push(FF_SEED_USED_TAG);
         }
         if (this.usesTelemetry) {
-            if (result !== "") {
-                result += DELIMITER;
-            }
-            result += FF_TELEMETRY_USED_TAG;
+            tags.push(FF_TELEMETRY_USED_TAG);
         }
-        return result;
+        return tags.join(DELIMITER);
     }
 }

src/requestTracing/utils.ts

@@ -130,28 +130,13 @@ export function createCorrelationContextHeader(requestTracingOptions: RequestTra
         keyValues.set(FM_VERSION_KEY, requestTracingOptions.fmVersion);
     }
 
-    // Compact tags: Features=LB+AI+AICC...
-    if (appConfigOptions?.loadBalancingEnabled || requestTracingOptions.aiConfigurationTracing?.usesAnyTracingFeature()) {
-        const tags: string[] = [];
-        if (appConfigOptions?.loadBalancingEnabled) {
-            tags.push(LOAD_BALANCE_CONFIGURED_TAG);
-        }
-        if (requestTracingOptions.aiConfigurationTracing?.usesAIConfiguration) {
-            tags.push(AI_CONFIGURATION_TAG);
-        }
-        if (requestTracingOptions.aiConfigurationTracing?.usesAIChatCompletionConfiguration) {
-            tags.push(AI_CHAT_COMPLETION_CONFIGURATION_TAG);
-        }
-
-        if (tags.length > 0) {
-            keyValues.set(FEATURES_KEY, tags.join(DELIMITER));
-        }
-    }
+    // Use compact tags for new tracing features: Features=LB+AI+AICC...
+    keyValues.set(FEATURES_KEY, usesAnyTracingFeature(requestTracingOptions) ? createFeaturesString(requestTracingOptions) : undefined);
 
     const contextParts: string[] = [];
-    for (const [k, v] of keyValues) {
-        if (v !== undefined) {
-            contextParts.push(`${k}=${v}`);
+    for (const [key, value] of keyValues) {
+        if (value !== undefined) {
+            contextParts.push(`${key}=${value}`);
         }
     }
     for (const tag of tags) {
@@ -167,6 +152,25 @@ export function requestTracingEnabled(): boolean {
     return !disabled;
 }
 
+function usesAnyTracingFeature(requestTracingOptions: RequestTracingOptions): boolean {
+    return (requestTracingOptions.appConfigOptions?.loadBalancingEnabled ?? false) ||
+        (requestTracingOptions.aiConfigurationTracing?.usesAnyTracingFeature() ?? false);
+}
+
+function createFeaturesString(requestTracingOptions: RequestTracingOptions): string {
+    const tags: string[] = [];
+    if (requestTracingOptions.appConfigOptions?.loadBalancingEnabled) {
+        tags.push(LOAD_BALANCE_CONFIGURED_TAG);
+    }
+    if (requestTracingOptions.aiConfigurationTracing?.usesAIConfiguration) {
+        tags.push(AI_CONFIGURATION_TAG);
+    }
+    if (requestTracingOptions.aiConfigurationTracing?.usesAIChatCompletionConfiguration) {
+        tags.push(AI_CHAT_COMPLETION_CONFIGURATION_TAG);
+    }
+    return tags.join(DELIMITER);
+}
+
 function getEnvironmentVariable(name: string) {
     // Make it compatible with non-Node.js runtime
     if (typeof process !== "undefined" && typeof process?.env === "object") {