Add the feature flag for the GallerySearch (#6947)

cristinamanum · web-flow · commit cf4911e2a9ef · 2019-03-04T09:27:31.000-08:00
Add the feature flag for the Gallery Search
diff --git a/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs b/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs
@@ -24,7 +24,8 @@ public class ExternalSearchService : ISearchService, IIndexingService, IRawSearc
         private static IEndpointHealthIndicatorStore _healthIndicatorStore;
         // Search client that will be deprecated. It is still needed to allow the feature flag until the new search implementation is enabled.
         private static ISearchClient _deprecatedSearchClient;
-        private ISearchClient _searchClient;
+        private readonly ISearchClient _searchClient;
+        private readonly IFeatureFlagService _featureFlagService;
 
         private JObject _diagCache;
 
@@ -65,10 +66,11 @@ public ExternalSearchService()
             }
         }
 
-        public ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagnostics, ISearchClient searchClient)
+        public ExternalSearchService(IAppConfiguration config, IDiagnosticsService diagnostics, ISearchClient searchClient, IFeatureFlagService featureFlagService)
         {
             ServiceUri = config.ServiceDiscoveryUri;
             _searchClient = searchClient ?? throw new ArgumentNullException(nameof(searchClient));
+            _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));
 
             Trace = diagnostics.SafeGetSource("ExternalSearchService");
 
@@ -330,7 +332,10 @@ internal static Package ReadPackage(JObject doc, string semVerLevel)
         /// It will return the client to use based on the feature flag.
         /// </summary>
         /// <returns>The search client in use. Used for the unit tests.</returns>
-        internal ISearchClient GetClient(){ return _deprecatedSearchClient; }
+        internal ISearchClient GetClient()
+        {
+            return _featureFlagService.IsSearchCircuitBreakerEnabled() ? _searchClient : _deprecatedSearchClient;
+        }
 
         // Bunch of no-ops to disable indexing because an external search service is doing that.
         public void UpdateIndex()
diff --git a/src/NuGetGallery/Queries/AutocompleteServicePackageIdsQuery.cs b/src/NuGetGallery/Queries/AutocompleteServicePackageIdsQuery.cs
@@ -12,8 +12,8 @@ namespace NuGetGallery
     public class AutocompleteServicePackageIdsQuery 
         : AutocompleteServiceQuery, IAutocompletePackageIdsQuery
     {
-        public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)
-            : base(configuration, resilientSearchClient)
+        public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)
+            : base(configuration, resilientSearchClient, featureFlagService)
         {
         }
 
diff --git a/src/NuGetGallery/Queries/AutocompleteServicePackageVersionsQuery.cs b/src/NuGetGallery/Queries/AutocompleteServicePackageVersionsQuery.cs
@@ -12,8 +12,8 @@ namespace NuGetGallery
     public class AutocompleteServicePackageVersionsQuery
         : AutocompleteServiceQuery, IAutocompletePackageVersionsQuery
     {
-        public AutocompleteServicePackageVersionsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)
-            : base(configuration, resilientSearchClient)
+        public AutocompleteServicePackageVersionsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)
+            : base(configuration, resilientSearchClient, featureFlagService)
         {
         }
 
diff --git a/src/NuGetGallery/Queries/AutocompleteServiceQuery.cs b/src/NuGetGallery/Queries/AutocompleteServiceQuery.cs
@@ -21,8 +21,9 @@ public class AutocompleteServiceQuery
         private readonly string _autocompleteServiceResourceType;
         private readonly RetryingHttpClientWrapper _httpClientToDeprecate;
         private readonly IResilientSearchClient _resilientSearchClient;
+        private readonly IFeatureFlagService _featureFlagService;
 
-        public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)
+        public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)
         {
             if (configuration == null)
             {
@@ -33,6 +34,7 @@ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearc
             _autocompleteServiceResourceType = configuration.AutocompleteServiceResourceType;
             _httpClientToDeprecate = new RetryingHttpClientWrapper(new HttpClient(), QuietLog.LogHandledException);
             _resilientSearchClient = resilientSearchClient;
+            _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));
         }
 
         public async Task<IEnumerable<string>> RunServiceQuery(
@@ -41,8 +43,7 @@ public async Task<IEnumerable<string>> RunServiceQuery(
             string semVerLevel = null)
         {
             queryString = BuildQueryString(queryString, includePrerelease, semVerLevel);
-            // This will be under the feature flag.
-            var result = await DeprecatedExecuteQuery(queryString);
+            var result = _featureFlagService.IsSearchCircuitBreakerEnabled() ? await ExecuteQuery(queryString) : await DeprecatedExecuteQuery(queryString);
             var resultObject = JObject.Parse(result);
 
             return resultObject["data"].Select(entry => entry.ToString());
diff --git a/src/NuGetGallery/Services/FeatureFlagService.cs b/src/NuGetGallery/Services/FeatureFlagService.cs
@@ -19,6 +19,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string PackagesAtomFeedFeatureName = GalleryPrefix + "PackagesAtomFeed";
 
         private const string ManageDeprecationFeatureName = GalleryPrefix + "ManageDeprecation";
+        private const string SearchCircuitBreakerFeatureName = GalleryPrefix + "SearchCircuitBreaker";
 
         private readonly IFeatureFlagClient _client;
 
@@ -51,5 +52,10 @@ private bool IsEnabled(string flight, User user, bool defaultValue)
         {
             return _client.IsEnabled(flight, user, defaultValue);
         }
+
+        public bool IsSearchCircuitBreakerEnabled()
+        {
+            return _client.IsEnabled(SearchCircuitBreakerFeatureName, defaultValue: false);
+        }
     }
 }
diff --git a/src/NuGetGallery/Services/IFeatureFlagService.cs b/src/NuGetGallery/Services/IFeatureFlagService.cs
@@ -36,5 +36,11 @@ public interface IFeatureFlagService
         /// <param name="user"></param>
         /// <returns></returns>
         bool IsManageDeprecationEnabled(User user);
+
+        /// <summary>
+        /// Whether or not the search is using circuit breaker.
+        /// </summary>
+        /// <returns></returns>
+        bool IsSearchCircuitBreakerEnabled();
     }
 }
diff --git a/tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs b/tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs
@@ -42,26 +42,32 @@ private IResilientSearchClient GetResilientSearchClient()
             return new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);
         }
 
+        private IFeatureFlagService GetFeatureFlagService()
+        {
+            var mockTelemetryService = new Mock<IFeatureFlagService>();
+            return mockTelemetryService.Object;
+        }
+
         [Fact]
         public async Task ExecuteReturns30ResultsForEmptyQuery()
         {
-            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
             var result = await query.Execute("", false);
             Assert.True(result.Count() == 30);
         }
 
         [Fact]
         public async Task ExecuteReturns30ResultsForNullQuery()
         {
-            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
             var result = await query.Execute(null, false);
             Assert.True(result.Count() == 30);
         }
 
         [Fact]
         public async Task ExecuteReturnsResultsForSpecificQuery()
         {
-            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
             var result = await query.Execute("jquery", false);
             Assert.Contains("jquery", result, StringComparer.OrdinalIgnoreCase);
         }
@@ -74,7 +80,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()
         public void PackageIdQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)
         {
             // Arrange
-            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
 
             // Act
             var actualQueryString = query.BuildQueryString("take=30&q=Json", includePrerelease, semVerLevel);
diff --git a/tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs b/tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs
@@ -42,18 +42,24 @@ private IResilientSearchClient GetResilientSearchClient()
             return new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);
         }
 
+        private IFeatureFlagService GetFeatureFlagService()
+        {
+            var mockTelemetryService = new Mock<IFeatureFlagService>();
+            return mockTelemetryService.Object;
+        }
+
         [Fact]
         public async Task ExecuteThrowsForEmptyId()
         {
-            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
             await Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(string.Empty, false));
         }
 
         [Fact]
         public async Task ExecuteReturnsResultsForSpecificQuery()
         {
 
-            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
             var result = await query.Execute("newtonsoft.json", false);
             Assert.True(result.Any());
         }
@@ -66,7 +72,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()
         public void PackageVersionsQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)
         {
             // Arrange
-            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());
+            var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());
 
             // Act
             var actualQueryString = query.BuildQueryString("id=Newtonsoft.Json", includePrerelease, semVerLevel);
diff --git a/tests/NuGetGallery.Facts/AutocompleteServiceQueryFacts.cs b/tests/NuGetGallery.Facts/AutocompleteServiceQueryFacts.cs
@@ -71,7 +71,9 @@ private TestAutocompleteServiceQuery(Uri baseAddress, string queryString)
                 var mockIResilientSearchClient = new Mock<IResilientSearchClient>();
                 mockIResilientSearchClient.Setup(s => s.GetAsync(_autocompletePath, It.IsAny<string>())).ReturnsAsync(_responseMessage);
 
-                _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object);
+                var mockTelemetryService = new Mock<IFeatureFlagService>();
+
+                _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object, mockTelemetryService.Object);
             }
 
             private static HttpResponseMessage GetResponseMessage(Uri uri, HttpStatusCode statusCode)
diff --git a/tests/NuGetGallery.Facts/Infrastructure/Lucene/ExternalSearchServiceFacts.cs b/tests/NuGetGallery.Facts/Infrastructure/Lucene/ExternalSearchServiceFacts.cs
@@ -41,6 +41,13 @@ private ILogger<ResilientSearchHttpClient> GetLogger()
                 return mockConfiguration.Object;
             }
 
+            private IFeatureFlagService GetFeatureFlagService(bool circuitBreakerIsEnabled)
+            {
+                var mockTelemetryService = new Mock<IFeatureFlagService>();
+                mockTelemetryService.Setup(c => c.IsSearchCircuitBreakerEnabled()).Returns(circuitBreakerIsEnabled);
+                return mockTelemetryService.Object;
+            }
+
             private IResilientSearchClient GetResilientSearchClient(string path, string queryString)
             {
                 var content = new JObject(
@@ -65,17 +72,19 @@ private ISearchClient GetSearchClient(string path, string queryString)
                 return new GallerySearchClient(GetResilientSearchClient(path, queryString));
             }
 
-            [Fact]
-            public void ReturnsTheExpectedClient()
+            [Theory]
+            [InlineData(true, "NuGetGallery.Infrastructure.Search.GallerySearchClient")]
+            [InlineData(false, "NuGet.Services.Search.Client.SearchClient")]
+            public void ReturnsTheExpectedClient(bool circuitBreakerIsEnabled, string expected)
             {
                 // Arrange
-                var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty));
+                var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty), GetFeatureFlagService(circuitBreakerIsEnabled));
 
                 // Act
                 var client = service.GetClient();
                 var clientType = client.GetType();
 
-                Assert.Equal("NuGet.Services.Search.Client.SearchClient", clientType.FullName);
+                Assert.Equal(expected, clientType.FullName);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ namespace NuGetGallery`
`12`	`12`	`public class AutocompleteServicePackageIdsQuery`
`13`	`13`	`: AutocompleteServiceQuery, IAutocompletePackageIdsQuery`
`14`	`14`	`{`
`15`		`- public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)`
`16`		`- : base(configuration, resilientSearchClient)`
	`15`	`+ public AutocompleteServicePackageIdsQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)`
	`16`	`+ : base(configuration, resilientSearchClient, featureFlagService)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ public class AutocompleteServiceQuery`
`21`	`21`	`private readonly string _autocompleteServiceResourceType;`
`22`	`22`	`private readonly RetryingHttpClientWrapper _httpClientToDeprecate;`
`23`	`23`	`private readonly IResilientSearchClient _resilientSearchClient;`
	`24`	`+ private readonly IFeatureFlagService _featureFlagService;`
`24`	`25`
`25`		`- public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient)`
	`26`	`+ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearchClient resilientSearchClient, IFeatureFlagService featureFlagService)`
`26`	`27`	`{`
`27`	`28`	`if (configuration == null)`
`28`	`29`	`{`
`@@ -33,6 +34,7 @@ public AutocompleteServiceQuery(IAppConfiguration configuration, IResilientSearc`
`33`	`34`	`_autocompleteServiceResourceType = configuration.AutocompleteServiceResourceType;`
`34`	`35`	`_httpClientToDeprecate = new RetryingHttpClientWrapper(new HttpClient(), QuietLog.LogHandledException);`
`35`	`36`	`_resilientSearchClient = resilientSearchClient;`
	`37`	`+ _featureFlagService = featureFlagService ?? throw new ArgumentNullException(nameof(featureFlagService));`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`public async Task<IEnumerable<string>> RunServiceQuery(`
`@@ -41,8 +43,7 @@ public async Task<IEnumerable<string>> RunServiceQuery(`
`41`	`43`	`string semVerLevel = null)`
`42`	`44`	`{`
`43`	`45`	`queryString = BuildQueryString(queryString, includePrerelease, semVerLevel);`
`44`		`- // This will be under the feature flag.`
`45`		`- var result = await DeprecatedExecuteQuery(queryString);`
	`46`	`+ var result = _featureFlagService.IsSearchCircuitBreakerEnabled() ? await ExecuteQuery(queryString) : await DeprecatedExecuteQuery(queryString);`
`46`	`47`	`var resultObject = JObject.Parse(result);`
`47`	`48`
`48`	`49`	`return resultObject["data"].Select(entry => entry.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public class FeatureFlagService : IFeatureFlagService`
`19`	`19`	`private const string PackagesAtomFeedFeatureName = GalleryPrefix + "PackagesAtomFeed";`
`20`	`20`
`21`	`21`	`private const string ManageDeprecationFeatureName = GalleryPrefix + "ManageDeprecation";`
	`22`	`+ private const string SearchCircuitBreakerFeatureName = GalleryPrefix + "SearchCircuitBreaker";`
`22`	`23`
`23`	`24`	`private readonly IFeatureFlagClient _client;`
`24`	`25`
`@@ -51,5 +52,10 @@ private bool IsEnabled(string flight, User user, bool defaultValue)`
`51`	`52`	`{`
`52`	`53`	`return _client.IsEnabled(flight, user, defaultValue);`
`53`	`54`	`}`
	`55`	`+`
	`56`	`+ public bool IsSearchCircuitBreakerEnabled()`
	`57`	`+ {`
	`58`	`+ return _client.IsEnabled(SearchCircuitBreakerFeatureName, defaultValue: false);`
	`59`	`+ }`
`54`	`60`	`}`
`55`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,11 @@ public interface IFeatureFlagService`
`36`	`36`	`/// <param name="user"></param>`
`37`	`37`	`/// <returns></returns>`
`38`	`38`	`bool IsManageDeprecationEnabled(User user);`
	`39`	`+`
	`40`	`+ /// <summary>`
	`41`	`+ /// Whether or not the search is using circuit breaker.`
	`42`	`+ /// </summary>`
	`43`	`+ /// <returns></returns>`
	`44`	`+ bool IsSearchCircuitBreakerEnabled();`
`39`	`45`	`}`
`40`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,26 +42,32 @@ private IResilientSearchClient GetResilientSearchClient()`
`42`	`42`	`return new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ private IFeatureFlagService GetFeatureFlagService()`
	`46`	`+ {`
	`47`	`+ var mockTelemetryService = new Mock<IFeatureFlagService>();`
	`48`	`+ return mockTelemetryService.Object;`
	`49`	`+ }`
	`50`	`+`
`45`	`51`	`[Fact]`
`46`	`52`	`public async Task ExecuteReturns30ResultsForEmptyQuery()`
`47`	`53`	`{`
`48`		`- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());`
	`54`	`+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`49`	`55`	`var result = await query.Execute("", false);`
`50`	`56`	`Assert.True(result.Count() == 30);`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`[Fact]`
`54`	`60`	`public async Task ExecuteReturns30ResultsForNullQuery()`
`55`	`61`	`{`
`56`		`- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());`
	`62`	`+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`57`	`63`	`var result = await query.Execute(null, false);`
`58`	`64`	`Assert.True(result.Count() == 30);`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`[Fact]`
`62`	`68`	`public async Task ExecuteReturnsResultsForSpecificQuery()`
`63`	`69`	`{`
`64`		`- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());`
	`70`	`+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`65`	`71`	`var result = await query.Execute("jquery", false);`
`66`	`72`	`Assert.Contains("jquery", result, StringComparer.OrdinalIgnoreCase);`
`67`	`73`	`}`
`@@ -74,7 +80,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()`
`74`	`80`	`public void PackageIdQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)`
`75`	`81`	`{`
`76`	`82`	`// Arrange`
`77`		`- var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient());`
	`83`	`+ var query = new AutocompleteServicePackageIdsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`78`	`84`
`79`	`85`	`// Act`
`80`	`86`	`var actualQueryString = query.BuildQueryString("take=30&q=Json", includePrerelease, semVerLevel);`
Original file line number	Diff line number	Diff line change
`@@ -42,18 +42,24 @@ private IResilientSearchClient GetResilientSearchClient()`
`42`	`42`	`return new ResilientSearchHttpClient(clients, GetLogger(), mockTelemetryService.Object);`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ private IFeatureFlagService GetFeatureFlagService()`
	`46`	`+ {`
	`47`	`+ var mockTelemetryService = new Mock<IFeatureFlagService>();`
	`48`	`+ return mockTelemetryService.Object;`
	`49`	`+ }`
	`50`	`+`
`45`	`51`	`[Fact]`
`46`	`52`	`public async Task ExecuteThrowsForEmptyId()`
`47`	`53`	`{`
`48`		`- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());`
	`54`	`+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`49`	`55`	`await Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(string.Empty, false));`
`50`	`56`	`}`
`51`	`57`
`52`	`58`	`[Fact]`
`53`	`59`	`public async Task ExecuteReturnsResultsForSpecificQuery()`
`54`	`60`	`{`
`55`	`61`
`56`		`- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());`
	`62`	`+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`57`	`63`	`var result = await query.Execute("newtonsoft.json", false);`
`58`	`64`	`Assert.True(result.Any());`
`59`	`65`	`}`
`@@ -66,7 +72,7 @@ public async Task ExecuteReturnsResultsForSpecificQuery()`
`66`	`72`	`public void PackageVersionsQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)`
`67`	`73`	`{`
`68`	`74`	`// Arrange`
`69`		`- var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient());`
	`75`	`+ var query = new AutocompleteServicePackageVersionsQuery(GetConfiguration(), GetResilientSearchClient(), GetFeatureFlagService());`
`70`	`76`
`71`	`77`	`// Act`
`72`	`78`	`var actualQueryString = query.BuildQueryString("id=Newtonsoft.Json", includePrerelease, semVerLevel);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ private TestAutocompleteServiceQuery(Uri baseAddress, string queryString)`
`71`	`71`	`var mockIResilientSearchClient = new Mock<IResilientSearchClient>();`
`72`	`72`	`mockIResilientSearchClient.Setup(s => s.GetAsync(_autocompletePath, It.IsAny<string>())).ReturnsAsync(_responseMessage);`
`73`	`73`
`74`		`- _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object);`
	`74`	`+ var mockTelemetryService = new Mock<IFeatureFlagService>();`
	`75`	`+`
	`76`	`+ _instance = new AutocompleteServiceQuery(mockConfiguration.Object, mockIResilientSearchClient.Object, mockTelemetryService.Object);`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`private static HttpResponseMessage GetResponseMessage(Uri uri, HttpStatusCode statusCode)`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,13 @@ private ILogger<ResilientSearchHttpClient> GetLogger()`
`41`	`41`	`return mockConfiguration.Object;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ private IFeatureFlagService GetFeatureFlagService(bool circuitBreakerIsEnabled)`
	`45`	`+ {`
	`46`	`+ var mockTelemetryService = new Mock<IFeatureFlagService>();`
	`47`	`+ mockTelemetryService.Setup(c => c.IsSearchCircuitBreakerEnabled()).Returns(circuitBreakerIsEnabled);`
	`48`	`+ return mockTelemetryService.Object;`
	`49`	`+ }`
	`50`	`+`
`44`	`51`	`private IResilientSearchClient GetResilientSearchClient(string path, string queryString)`
`45`	`52`	`{`
`46`	`53`	`var content = new JObject(`
`@@ -65,17 +72,19 @@ private ISearchClient GetSearchClient(string path, string queryString)`
`65`	`72`	`return new GallerySearchClient(GetResilientSearchClient(path, queryString));`
`66`	`73`	`}`
`67`	`74`
`68`		`- [Fact]`
`69`		`- public void ReturnsTheExpectedClient()`
	`75`	`+ [Theory]`
	`76`	`+ [InlineData(true, "NuGetGallery.Infrastructure.Search.GallerySearchClient")]`
	`77`	`+ [InlineData(false, "NuGet.Services.Search.Client.SearchClient")]`
	`78`	`+ public void ReturnsTheExpectedClient(bool circuitBreakerIsEnabled, string expected)`
`70`	`79`	`{`
`71`	`80`	`// Arrange`
`72`		`- var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty));`
	`81`	`+ var service = new ExternalSearchService(GetConfiguration(), GetDiagnosticsService(), GetSearchClient(string.Empty, string.Empty), GetFeatureFlagService(circuitBreakerIsEnabled));`
`73`	`82`
`74`	`83`	`// Act`
`75`	`84`	`var client = service.GetClient();`
`76`	`85`	`var clientType = client.GetType();`
`77`	`86`
`78`		`- Assert.Equal("NuGet.Services.Search.Client.SearchClient", clientType.FullName);`
	`87`	`+ Assert.Equal(expected, clientType.FullName);`
`79`	`88`	`}`
`80`	`89`	`}`
`81`	`90`