From 02d8a7ea6083ba037fc73ae4e9d54ce23e78c539 Mon Sep 17 00:00:00 2001
From: Konstantin Lepeshenkov <5447190+scale-tone@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:36:37 +0200
Subject: [PATCH] Fixed feature flag parsing

---
 .../Common/DetailedOrchestrationStatus.cs                       | 2 +-
 .../Common/DetailedOrchestrationStatus.cs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/durablefunctionsmonitor.dotnetbackend/Common/DetailedOrchestrationStatus.cs b/durablefunctionsmonitor.dotnetbackend/Common/DetailedOrchestrationStatus.cs
index e71f753..9c2b7eb 100644
--- a/durablefunctionsmonitor.dotnetbackend/Common/DetailedOrchestrationStatus.cs
+++ b/durablefunctionsmonitor.dotnetbackend/Common/DetailedOrchestrationStatus.cs
@@ -109,7 +109,7 @@ internal static async Task<string> GetParentInstanceIdDirectlyFromTable(IDurable
                 // Also need to put it under a feature switch, as it still might be a performance issue
 
                 string featureFlags = Environment.GetEnvironmentVariable(EnvVariableNames.AzureWebJobsFeatureFlags);
-                bool isDisabled = featureFlags.Contains(Globals.DfMonDisableNewParentIdResolutionAlgorithm);
+                bool isDisabled = featureFlags == null ? false : featureFlags.Contains(Globals.DfMonDisableNewParentIdResolutionAlgorithm);
                 if (isDisabled)
                 {
                     return null;
diff --git a/durablefunctionsmonitor.dotnetisolated.core/Common/DetailedOrchestrationStatus.cs b/durablefunctionsmonitor.dotnetisolated.core/Common/DetailedOrchestrationStatus.cs
index 28d54fe..bed3ce4 100644
--- a/durablefunctionsmonitor.dotnetisolated.core/Common/DetailedOrchestrationStatus.cs
+++ b/durablefunctionsmonitor.dotnetisolated.core/Common/DetailedOrchestrationStatus.cs
@@ -108,7 +108,7 @@ internal static async Task<string> GetParentInstanceIdDirectlyFromTable(DurableT
                 // Also need to put it under a feature switch, as it still might be a performance issue
 
                 string featureFlags = Environment.GetEnvironmentVariable(EnvVariableNames.AzureWebJobsFeatureFlags);
-                bool isDisabled = featureFlags.Contains(Globals.DfMonDisableNewParentIdResolutionAlgorithm);
+                bool isDisabled = featureFlags == null ? false : featureFlags.Contains(Globals.DfMonDisableNewParentIdResolutionAlgorithm);
                 if (isDisabled)
                 {
                     return null;