Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Users/dogirala/ptr feature flag vss conn #4821

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changes to adding in a new method without local variable usage for vs…
…sconn
dogirala committed May 29, 2024
commit 6554ee6c4389c7c9b8fb9bb1c8a93c8d80349ee3
Original file line number Diff line number Diff line change
@@ -409,9 +409,8 @@ private void LoadFeatureFlagState()
using (var connection = WorkerUtilities.GetVssConnection(_executionContext))
{
var featureFlagService = _executionContext.GetHostContext().GetService<IFeatureFlagService>();
featureFlagService.InitializeFeatureService(_executionContext, connection);
_calculateTestRunSummary = featureFlagService.GetFeatureFlagState(TestResultsConstants.CalculateTestRunSummaryFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid);
_isFlakyCheckEnabled = featureFlagService.GetFeatureFlagState(TestResultsConstants.EnableFlakyCheckInAgentFeatureFlag, TestResultsConstants.TCMServiceInstanceGuid);
_calculateTestRunSummary = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.CalculateTestRunSummaryFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid, connection);
_isFlakyCheckEnabled = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.EnableFlakyCheckInAgentFeatureFlag, TestResultsConstants.TCMServiceInstanceGuid, connection);
}
}
}
7 changes: 3 additions & 4 deletions src/Agent.Worker/TestResults/ResultsCommandExtension.cs
Original file line number Diff line number Diff line change
@@ -442,10 +442,9 @@ private void LoadFeatureFlagState()
using (var connection = WorkerUtilities.GetVssConnection(_executionContext))
{
var featureFlagService = _executionContext.GetHostContext().GetService<IFeatureFlagService>();
featureFlagService.InitializeFeatureService(_executionContext, connection);
_publishTestResultsLibFeatureState = featureFlagService.GetFeatureFlagState(TestResultsConstants.UsePublishTestResultsLibFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid);
_enableAzureTestPlanFeatureState = featureFlagService.GetFeatureFlagState(TestResultsConstants.EnableAzureTestPlanTaskFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid);
_triggerCoverageMergeJobFeatureState = featureFlagService.GetFeatureFlagState(CodeCoverageConstants.TriggerCoverageMergeJobFF, TestResultsConstants.TFSServiceInstanceGuid);
_publishTestResultsLibFeatureState = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.UsePublishTestResultsLibFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid, connection);
_enableAzureTestPlanFeatureState = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.EnableAzureTestPlanTaskFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid, connection);
_triggerCoverageMergeJobFeatureState = featureFlagService.GetFeatureFlagStateByName(_executionContext, CodeCoverageConstants.TriggerCoverageMergeJobFF, TestResultsConstants.TFSServiceInstanceGuid, connection);
}
}
}
5 changes: 2 additions & 3 deletions src/Agent.Worker/TestResults/TestDataPublisher.cs
Original file line number Diff line number Diff line change
@@ -324,9 +324,8 @@ private void LoadFeatureFlagState()
using (var connection = WorkerUtilities.GetVssConnection(_executionContext))
{
var featureFlagService = _executionContext.GetHostContext().GetService<IFeatureFlagService>();
featureFlagService.InitializeFeatureService(_executionContext, connection);
_calculateTestRunSummary = featureFlagService.GetFeatureFlagState(TestResultsConstants.CalculateTestRunSummaryFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid);
_isFlakyCheckEnabled = featureFlagService.GetFeatureFlagState(TestResultsConstants.EnableFlakyCheckInAgentFeatureFlag, TestResultsConstants.TCMServiceInstanceGuid);
_calculateTestRunSummary = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.CalculateTestRunSummaryFeatureFlag, TestResultsConstants.TFSServiceInstanceGuid, connection);
_isFlakyCheckEnabled = featureFlagService.GetFeatureFlagStateByName(_executionContext, TestResultsConstants.EnableFlakyCheckInAgentFeatureFlag, TestResultsConstants.TCMServiceInstanceGuid, connection);
}
}
}
22 changes: 22 additions & 0 deletions src/Agent.Worker/TestResults/Utils/FeatureFlagService.cs
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@ public interface IFeatureFlagService : IAgentService
void InitializeFeatureService(IExecutionContext executionContext, VssConnection connection);

bool GetFeatureFlagState(string featureFlagName, Guid serviceInstanceId);

bool GetFeatureFlagStateByName(IExecutionContext executionContext, string featureFlagName, Guid serviceInstanceId, VssConnection connection);
}

public class FeatureFlagService : AgentService, IFeatureFlagService
@@ -50,5 +52,25 @@ public bool GetFeatureFlagState(string featureFlagName, Guid serviceInstanceId)
}
return false;
}

public bool GetFeatureFlagStateByName(IExecutionContext executionContext, string featureFlagName, Guid serviceInstanceId, VssConnection connection)
{
try
{
FeatureAvailabilityHttpClient featureAvailabilityHttpClient = connection.GetClient<FeatureAvailabilityHttpClient>(serviceInstanceId);
var featureFlag = featureAvailabilityHttpClient?.GetFeatureFlagByNameAsync(featureFlagName).Result;
if (featureFlag != null && featureFlag.EffectiveState.Equals("On", StringComparison.OrdinalIgnoreCase))
{
executionContext.Debug(StringUtil.Format("{0} is on", featureFlagName));
return true;
}
executionContext.Debug(StringUtil.Format("{0} is off", featureFlagName));
}
catch
{
executionContext.Debug(StringUtil.Format("Failed to get FF {0} Value.", featureFlagName));
}
return false;
}
}
}