Merge branch 'develop' into jacksonweber/fix-auto-attach-version

microsoft · Feb 26, 2024 · 7f66f40 · 7f66f40
2 parents 5a68d40 + 1b53f5a
commit 7f66f40
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 20 deletions.
diff --git a/AutoCollection/CorrelationContextManager.ts b/AutoCollection/CorrelationContextManager.ts
@@ -178,8 +178,13 @@ export class CorrelationContextManager {
                     this.cls = require("continuation-local-storage");
                 }
             }
-
-            CorrelationContextManager.session = this.cls.createNamespace("AI-CLS-Session");
+            try {
+                CorrelationContextManager.session = this.cls.createNamespace("AI-CLS-Session");
+            } catch (error) {
+                Logging.warn("Failed to create AI-CLS-Session namespace. Correlation of requests may be lost", Util.dumpObj(error));
+                this.enabled = false;
+                return;
+            }
 
             DiagChannel.registerContextPreservation((cb) => {
                 try {
@@ -295,7 +300,13 @@ export class CorrelationContextManager {
     public static reset() {
         if (CorrelationContextManager.hasEverEnabled) {
             CorrelationContextManager.session = null;
-            CorrelationContextManager.session = this.cls.createNamespace("AI-CLS-Session");
+            try {
+                CorrelationContextManager.session = this.cls.createNamespace("AI-CLS-Session");
+            } catch (error) {
+                Logging.warn("Failed to create AI-CLS-Session namespace. Correlation of requests may be lost", Util.dumpObj(error));
+                this.enabled = false;
+                return;
+            }
         }
     }
 

diff --git a/package-lock.json b/package-lock.json