Merge pull request #508 from NuGet/dev

[ReleasePrep][2018.07.31]RI of dev into master

Author: Scott Bommarito

src/NuGet.Services.Revalidate/Configuration/HealthConfiguration.cs

@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGet.Services.Revalidate
+{
+    public class HealthConfiguration
+    {
+        /// <summary>
+        /// The name of the Azure Blob Storage container that stores status information.
+        /// </summary>
+        public string ContainerName { get; set; }
+
+        /// <summary>
+        /// The name of the Azure Blob Storage blob that stores status information.
+        /// </summary>
+        public string StatusBlobName { get; set; }
+
+        /// <summary>
+        /// The path to the component that the revalidation job will monitor. The revalidation job will
+        /// pause if this component isn't healthy.
+        /// </summary>
+        public string ComponentPath { get; set; }
+    }
+}

src/NuGet.Services.Revalidate/Configuration/RevalidationConfiguration.cs

@@ -35,6 +35,11 @@ public class RevalidationConfiguration
         /// </summary>
         public InitializationConfiguration Initialization { get; set; }
 
+        /// <summary>
+        /// The configurations used to determine the health of the ingestion pipeline.
+        /// </summary>
+        public HealthConfiguration Health { get; set; }
+
         /// <summary>
         /// The configurations used by the in-memory queue of revalidations to start.
         /// </summary>

src/NuGet.Services.Revalidate/Job.cs

@@ -96,6 +96,7 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
             services.Configure<RevalidationConfiguration>(configurationRoot.GetSection(JobConfigurationSectionName));
             services.AddSingleton(provider => provider.GetRequiredService<IOptionsSnapshot<RevalidationConfiguration>>().Value);
             services.AddSingleton(provider => provider.GetRequiredService<IOptionsSnapshot<RevalidationConfiguration>>().Value.Initialization);
+            services.AddSingleton(provider => provider.GetRequiredService<IOptionsSnapshot<RevalidationConfiguration>>().Value.Health);
             services.AddSingleton(provider => provider.GetRequiredService<IOptionsSnapshot<RevalidationConfiguration>>().Value.Queue);
 
             services.AddScoped<IGalleryContext>(provider =>

src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj

@@ -43,6 +43,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\HealthConfiguration.cs" />
     <Compile Include="Configuration\InitializationConfiguration.cs" />
     <Compile Include="Configuration\RevalidationQueueConfiguration.cs" />
     <Compile Include="Extensions\IEnumerableExtensions.cs" />
@@ -103,6 +104,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="NuGet.Services.Status">
+      <Version>2.27.0</Version>
+    </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
       <Version>2.27.0</Version>
     </PackageReference>

src/NuGet.Services.Revalidate/Services/HealthService.cs

@@ -1,17 +1,52 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using NuGet.Services.Status;
+using NuGetGallery;
 
 namespace NuGet.Services.Revalidate
 {
     public class HealthService : IHealthService
     {
-        public Task<bool> IsHealthyAsync()
+        private readonly ICoreFileStorageService _storage;
+        private readonly HealthConfiguration _config;
+        private readonly ILogger<HealthService> _logger;
+
+        public HealthService(
+            ICoreFileStorageService storage,
+            HealthConfiguration config,
+            ILogger<HealthService> logger)
+        {
+            _storage = storage ?? throw new ArgumentNullException(nameof(storage));
+            _config = config ?? throw new ArgumentNullException(nameof(config));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public async Task<bool> IsHealthyAsync()
         {
-            // TODO:
-            // We are software gods that never make mistakes.
-            return Task.FromResult(true);
+            using (var stream = await _storage.GetFileAsync(_config.ContainerName, _config.StatusBlobName))
+            using (var reader = new StreamReader(stream))
+            {
+                var json = await reader.ReadToEndAsync();
+                var status = JsonConvert.DeserializeObject<ServiceStatus>(json);
+                var component = status.ServiceRootComponent.GetByPath(_config.ComponentPath);
+
+                if (component == null)
+                {
+                    _logger.LogError(
+                        "Assuming that the service is unhealthy as the component path {ComponentPath} could not be found",
+                        _config.ComponentPath);
+
+                    return false;
+                }
+
+                return component.Status == ComponentStatus.Up;
+            }
         }
     }
-}
+}

src/NuGet.Services.Revalidate/Settings/dev.json

@@ -10,6 +10,12 @@
       "SleepDurationBetweenBatches": "00:00:01"
     },
 
+    "Health": {
+      "ContainerName": "status",
+      "StatusBlobName": "status.json",
+      "ComponentPath":  "NuGet/Package Publishing"
+    },
+
     "MinPackageEventRate": 120,
     "MaxPackageEventRate": 500,
 

src/NuGet.Services.Revalidate/Settings/int.json

@@ -10,6 +10,12 @@
       "SleepDurationBetweenBatches": "00:00:30"
     },
 
+    "Health": {
+      "ContainerName": "status",
+      "StatusBlobName": "status.json",
+      "ComponentPath": "NuGet/Package Publishing"
+    },
+
     "MinPackageEventRate": 120,
     "MaxPackageEventRate": 500,
 

src/NuGet.Services.Revalidate/Settings/prod.json

@@ -10,6 +10,12 @@
       "SleepDurationBetweenBatches": "00:00:30"
     },
 
+    "Health": {
+      "ContainerName": "status",
+      "StatusBlobName": "status.json",
+      "ComponentPath": "NuGet/Package Publishing"
+    },
+
     "MinPackageEventRate": 120,
     "MaxPackageEventRate": 500,
 

src/StatusAggregator/MessageUpdater.cs

@@ -60,7 +60,7 @@ public async Task CreateMessageForEventStart(EventEntity eventEntity, DateTime c
             }
         }
 
-        private const string _messageForEventStartTemplate = "<b>{0} is {1}.</b> You may encounter issues {2}.";
+        private const string _messageForEventStartTemplate = "**{0} is {1}.** You may encounter issues {2}.";
 
         private bool TryGetContentsForMessageForEventStart(EventEntity eventEntity, out string contents)
         {
@@ -102,7 +102,7 @@ private Task CreateMessage(EventEntity eventEntity, DateTime time, string conten
             return _table.InsertOrReplaceAsync(messageEntity);
         }
 
-        private const string _messageForEventEndTemplate = "<b>{0} is no longer {1}.</b> You should no longer encounter any issues {2}. Thank you for your patience.";
+        private const string _messageForEventEndTemplate = "**{0} is no longer {1}.** You should no longer encounter any issues {2}. Thank you for your patience.";
 
         private bool TryGetContentsForMessageForEventEnd(EventEntity eventEntity, out string contents)
         {

src/Validation.Common.Job/LoggerDiagnosticsSource.cs

@@ -91,7 +91,7 @@ private static IDictionary<string, string> GetProperties(
 
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
         {
-            _logger.Log<TState>(logLevel, eventId, state, exception, formatter);
+            _logger.Log(logLevel, eventId, state, exception, formatter);
         }
 
         public bool IsEnabled(LogLevel logLevel)
@@ -101,7 +101,7 @@ public bool IsEnabled(LogLevel logLevel)
 
         public IDisposable BeginScope<TState>(TState state)
         {
-            return _logger.BeginScope<TState>(state);
+            return _logger.BeginScope(state);
         }
 
         /// <summary>