Rename StreamWriterUpdater to AuxiliaryFileUpdater

joelverhagen · joelverhagen · commit e00eca963aa2 · 2021-05-16T14:45:23.000-07:00
Fix up timer order
Other renaming polish
diff --git a/src/Logic/Timers/ITimer.cs b/src/Logic/Timers/ITimer.cs
@@ -13,7 +13,7 @@ public interface ITimer
         /// <summary>
         /// Use to group timers that can be run in parallel. Return 0 (<c>default</c>) for simple, parallel execution.
         /// </summary>
-        int Precedence { get; }
+        int Order { get; }
 
         Task<bool> IsRunningAsync();
         Task InitializeAsync();
diff --git a/src/Logic/Timers/TimerExecutionService.cs b/src/Logic/Timers/TimerExecutionService.cs
@@ -59,7 +59,7 @@ public async Task InitializeAsync()
         public async Task<IReadOnlyList<TimerState>> GetStateAsync()
         {
             var pairs = _nameToTimer
-                .OrderBy(x => x.Value.Precedence)
+                .OrderBy(x => x.Value.Order)
                 .ThenBy(x => x.Key, StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
@@ -116,7 +116,7 @@ public async Task<bool> ExecuteNowAsync(string timerName)
 
         public async Task ExecuteAsync()
         {
-            await using (var lease = await _leaseService.TryAcquireAsync(nameof(TimerExecutionService)))
+            await using (var lease = await _leaseService.TryAcquireAsync("TimerExecutionService"))
             {
                 if (!lease.Acquired)
                 {
@@ -210,9 +210,9 @@ private async Task<bool> ExecuteAsync(ISet<string> timerNames, bool executeNow)
                 }
             }
 
-            // Execute timers by precedence.
+            // Execute timers in ordered groups.
             var anyExecuted = false;
-            foreach (var group in toExecute.GroupBy(x => x.timer.Precedence).OrderBy(x => x.Key))
+            foreach (var group in toExecute.GroupBy(x => x.timer.Order).OrderBy(x => x.Key))
             {
                 var executed = await Task.WhenAll(group.Select(x => ExecuteAsync(x.timer, x.entity, x.persistAsync, now)));
                 anyExecuted |= executed.Any(x => x);
diff --git a/src/Worker.Logic/CatalogScan/CatalogScanUpdateTimer.cs b/src/Worker.Logic/CatalogScan/CatalogScanUpdateTimer.cs
@@ -25,7 +25,7 @@ public CatalogScanUpdateTimer(
         public TimeSpan Frequency => _options.Value.CatalogScanUpdateFrequency;
         public bool AutoStart => _options.Value.AutoStartCatalogScanUpdate;
         public bool IsEnabled => true;
-        public int Precedence => default;
+        public int Order => 10;
 
         public async Task<bool> ExecuteAsync()
         {
diff --git a/src/Worker.Logic/ExplorePackagesWorkerSettings.cs b/src/Worker.Logic/ExplorePackagesWorkerSettings.cs
@@ -13,7 +13,7 @@ public ExplorePackagesWorkerSettings()
             AppendResultStorageBucketCount = 1000; // Azure Data Explorer can only import up to 1000 blobs.
             AllowBatching = true;
             RunAllCatalogScanDriversAsBatch = false;
-            OnlyKeepLatestInStreamWriterUpdater = true;
+            OnlyKeepLatestInAuxiliaryFileUpdater = true;
             MoveTempToHome = false;
             DisabledDrivers = new List<CatalogScanDriverType>();
             OldCatalogIndexScansToKeep = 9;
@@ -71,7 +71,7 @@ public ExplorePackagesWorkerSettings()
         public int AppendResultStorageBucketCount { get; set; }
         public bool AllowBatching { get; set; }
         public bool RunAllCatalogScanDriversAsBatch { get; set; }
-        public bool OnlyKeepLatestInStreamWriterUpdater { get; set; }
+        public bool OnlyKeepLatestInAuxiliaryFileUpdater { get; set; }
         public bool MoveTempToHome { get; set; }
         public List<CatalogScanDriverType> DisabledDrivers { get; set; }
         public int OldCatalogIndexScansToKeep { get; set; }
diff --git a/src/Worker.Logic/Management/QueueSizeMetricsTimer.cs b/src/Worker.Logic/Management/QueueSizeMetricsTimer.cs
@@ -21,7 +21,7 @@ public QueueSizeMetricsTimer(
         public TimeSpan Frequency => TimeSpan.FromSeconds(30);
         public bool AutoStart => true;
         public bool IsEnabled => true;
-        public int Precedence => default;
+        public int Order => default;
 
         public async Task<bool> ExecuteAsync()
         {
diff --git a/src/Worker.Logic/Management/UpdateSecretsTimer.cs b/src/Worker.Logic/Management/UpdateSecretsTimer.cs
@@ -37,7 +37,7 @@ public UpdateSecretsTimer(
 
         public string Name => "UpdateSecrets";
         public bool AutoStart => true;
-        public int Precedence => int.MaxValue;
+        public int Order => int.MaxValue;
 
         public TimeSpan Frequency
         {
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterMessage.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterMessage.cs
@@ -1,8 +1,8 @@
 ﻿using Newtonsoft.Json;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public class StreamWriterUpdaterMessage<T> : ITaskStateMessage
+    public class AuxiliaryFileUpdaterMessage<T> : ITaskStateMessage
     {
         [JsonProperty("ts")]
         public TaskStateKey TaskStateKey { get; set; }
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterProcessor.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterProcessor.cs
@@ -11,26 +11,25 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public class StreamWriterUpdaterProcessor<T> : ITaskStateMessageProcessor<StreamWriterUpdaterMessage<T>>
-        where T : IAsyncDisposable, IAsOfData
+    public class AuxiliaryFileUpdaterProcessor<T> : ITaskStateMessageProcessor<AuxiliaryFileUpdaterMessage<T>> where T : IAsOfData
     {
         private const string AsOfTimestampMetadata = "asOfTimestamp";
         private const string VersionSetCommitTimestampMetadata = "versionSetCommitTimestamp";
 
         private readonly ServiceClientFactory _serviceClientFactory;
         private readonly IVersionSetProvider _versionSetProvider;
-        private readonly IStreamWriterUpdater<T> _updater;
+        private readonly IAuxiliaryFileUpdater<T> _updater;
         private readonly IOptions<ExplorePackagesWorkerSettings> _options;
-        private readonly ILogger<StreamWriterUpdaterProcessor<T>> _logger;
+        private readonly ILogger<AuxiliaryFileUpdaterProcessor<T>> _logger;
 
-        public StreamWriterUpdaterProcessor(
+        public AuxiliaryFileUpdaterProcessor(
             ServiceClientFactory serviceClientFactory,
             IVersionSetProvider versionSetProvider,
-            IStreamWriterUpdater<T> updater,
+            IAuxiliaryFileUpdater<T> updater,
             IOptions<ExplorePackagesWorkerSettings> options,
-            ILogger<StreamWriterUpdaterProcessor<T>> logger)
+            ILogger<AuxiliaryFileUpdaterProcessor<T>> logger)
         {
             _serviceClientFactory = serviceClientFactory;
             _versionSetProvider = versionSetProvider;
@@ -44,7 +43,7 @@ public static string GetLatestBlobName(string blobName)
             return $"latest_{blobName}.csv.gz";
         }
 
-        public async Task<bool> ProcessAsync(StreamWriterUpdaterMessage<T> message, long dequeueCount)
+        public async Task<bool> ProcessAsync(AuxiliaryFileUpdaterMessage<T> message, long dequeueCount)
         {
             await InitializeAsync();
 
@@ -84,7 +83,7 @@ public async Task<bool> ProcessAsync(StreamWriterUpdaterMessage<T> message, long
                 }
             }
 
-            if (_options.Value.OnlyKeepLatestInStreamWriterUpdater)
+            if (_options.Value.OnlyKeepLatestInAuxiliaryFileUpdater)
             {
                 await WriteDataAsync(versionSet, data, latestBlob);
             }
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterService.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterService.cs
@@ -1,19 +1,18 @@
-﻿using System;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public class StreamWriterUpdaterService<T> : IStreamWriterUpdaterService<T> where T : IAsyncDisposable, IAsOfData
+    public class AuxiliaryFileUpdaterService<T> : IAuxiliaryFileUpdaterService<T> where T : IAsOfData
     {
         private static readonly string StorageSuffix = string.Empty;
 
-        private readonly IStreamWriterUpdater<T> _updater;
+        private readonly IAuxiliaryFileUpdater<T> _updater;
         private readonly IMessageEnqueuer _messageEnqueuer;
         private readonly TaskStateStorageService _taskStateStorageService;
         private readonly AutoRenewingStorageLeaseService _leaseService;
 
-        public StreamWriterUpdaterService(
-            IStreamWriterUpdater<T> updater,
+        public AuxiliaryFileUpdaterService(
+            IAuxiliaryFileUpdater<T> updater,
             IMessageEnqueuer messageEnqueuer,
             TaskStateStorageService taskStateStorageService,
             AutoRenewingStorageLeaseService leaseService)
@@ -35,7 +34,7 @@ public async Task InitializeAsync()
 
         public async Task<bool> StartAsync()
         {
-            await using (var lease = await _leaseService.TryAcquireAsync($"Start-{_updater.OperationName}"))
+            await using (var lease = await _leaseService.TryAcquireAsync($"Start-AuxiliaryFileUpdater-{_updater.OperationName}"))
             {
                 if (!lease.Acquired)
                 {
@@ -46,7 +45,7 @@ public async Task<bool> StartAsync()
                     StorageSuffix,
                     _updater.OperationName,
                     StorageUtility.GenerateDescendingId().ToString());
-                await _messageEnqueuer.EnqueueAsync(new[] { new StreamWriterUpdaterMessage<T> { TaskStateKey = taskStateKey } });
+                await _messageEnqueuer.EnqueueAsync(new[] { new AuxiliaryFileUpdaterMessage<T> { TaskStateKey = taskStateKey } });
                 await _taskStateStorageService.AddAsync(taskStateKey);
                 return true;
             }
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterTimer.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/AuxiliaryFileUpdaterTimer.cs
@@ -1,16 +1,16 @@
 ﻿using System;
 using System.Threading.Tasks;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public class StreamWriterUpdaterTimer<T> : ITimer where T : IAsyncDisposable, IAsOfData
+    public class AuxiliaryFileUpdaterTimer<T> : ITimer where T : IAsOfData
     {
-        private readonly IStreamWriterUpdaterService<T> _service;
-        private readonly IStreamWriterUpdater<T> _updater;
+        private readonly IAuxiliaryFileUpdaterService<T> _service;
+        private readonly IAuxiliaryFileUpdater<T> _updater;
 
-        public StreamWriterUpdaterTimer(
-            IStreamWriterUpdaterService<T> service,
-            IStreamWriterUpdater<T> updater)
+        public AuxiliaryFileUpdaterTimer(
+            IAuxiliaryFileUpdaterService<T> service,
+            IAuxiliaryFileUpdater<T> updater)
         {
             _service = service;
             _updater = updater;
@@ -20,7 +20,7 @@ public StreamWriterUpdaterTimer(
         public TimeSpan Frequency => _updater.Frequency;
         public bool IsEnabled => _service.HasRequiredConfiguration;
         public bool AutoStart => _updater.AutoStart;
-        public int Precedence => default;
+        public int Order => 20;
 
         public async Task<bool> ExecuteAsync()
         {
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/IAuxiliaryFileUpdater.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/IAuxiliaryFileUpdater.cs
@@ -3,9 +3,9 @@
 using System.Threading.Tasks;
 using Knapcode.ExplorePackages.Worker.BuildVersionSet;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public interface IStreamWriterUpdater<T> where T : IAsOfData
+    public interface IAuxiliaryFileUpdater<T> where T : IAsOfData
     {
         string OperationName { get; }
         string BlobName { get; }
diff --git a/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/IAuxiliaryFileUpdaterService.cs b/src/Worker.Logic/MessageProcessors/AuxiliaryFileUpdater/IAuxiliaryFileUpdaterService.cs
@@ -1,8 +1,8 @@
 ﻿using System.Threading.Tasks;
 
-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater
+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater
 {
-    public interface IStreamWriterUpdaterService<T>
+    public interface IAuxiliaryFileUpdaterService<T>
     {
         Task InitializeAsync();
         Task<bool> StartAsync();
diff --git a/src/Worker.Logic/MessageProcessors/DownloadsToCsv/DownloadsToCsvUpdater.cs b/src/Worker.Logic/MessageProcessors/DownloadsToCsv/DownloadsToCsvUpdater.cs
@@ -4,13 +4,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Knapcode.ExplorePackages.Worker.BuildVersionSet;
-using Knapcode.ExplorePackages.Worker.StreamWriterUpdater;
+using Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater;
 using Microsoft.Extensions.Options;
 using NuGet.Versioning;
 
 namespace Knapcode.ExplorePackages.Worker.DownloadsToCsv
 {
-    public class DownloadsToCsvUpdater : IStreamWriterUpdater<PackageDownloadSet>
+    public class DownloadsToCsvUpdater : IAuxiliaryFileUpdater<PackageDownloadSet>
     {
         private readonly IPackageDownloadsClient _packageDownloadsClient;
         private readonly IOptions<ExplorePackagesWorkerSettings> _options;
diff --git a/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoBlobIngestionMessageProcessor.cs b/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoBlobIngestionMessageProcessor.cs
@@ -78,7 +78,7 @@ public async Task ProcessAsync(KustoBlobIngestionMessage message, long dequeueCo
                     Size = blob.RawSizeBytes,
                 };
 
-                await using var lease = await _leaseService.TryAcquireAsync("KustoBlobIngestion-" + blob.GetContainerName() + "-" + blob.GetBlobName());
+                await using var lease = await _leaseService.TryAcquireAsync($"KustoBlobIngestion-{blob.GetContainerName()}-{blob.GetBlobName()}");
                 if (!lease.Acquired)
                 {
                     _logger.LogWarning("Kusto blob ingestion lease for {ContainerName} and blob {BlobName} is not available.", blob.GetContainerName(), blob.GetBlobName());
diff --git a/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoContainerIngestionMessageProcessor.cs b/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoContainerIngestionMessageProcessor.cs
@@ -164,7 +164,7 @@ public async Task ProcessAsync(KustoContainerIngestionMessage message, long dequ
         private async Task<IAsyncDisposable> LeaseOrNullAsync(KustoContainerIngestionMessage message, KustoContainerIngestion container, string finalTableName)
         {
             // Lease on the Kusto table name to avoid weird concurrency issues.
-            var lease = await _leaseService.TryAcquireAsync("KustoContainerIngestion-" + finalTableName);
+            var lease = await _leaseService.TryAcquireAsync($"KustoContainerIngestion-{finalTableName}");
             if (!lease.Acquired)
             {
                 _logger.LogWarning("Container {ContainerName} lease is not available.", container.GetContainerName());
diff --git a/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoIngestionTimer.cs b/src/Worker.Logic/MessageProcessors/KustoIngestion/KustoIngestionTimer.cs
@@ -20,7 +20,7 @@ public KustoIngestionTimer(
         public TimeSpan Frequency => TimeSpan.FromDays(1);
         public bool AutoStart => false;
         public bool IsEnabled => _kustoIngestionService.HasRequiredConfiguration;
-        public int Precedence => default;
+        public int Order => 30;
 
         public async Task InitializeAsync()
         {
diff --git a/src/Worker.Logic/MessageProcessors/OwnersToCsv/OwnersToCsvUpdater.cs b/src/Worker.Logic/MessageProcessors/OwnersToCsv/OwnersToCsvUpdater.cs
@@ -4,13 +4,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Knapcode.ExplorePackages.Worker.BuildVersionSet;
-using Knapcode.ExplorePackages.Worker.StreamWriterUpdater;
+using Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace Knapcode.ExplorePackages.Worker.OwnersToCsv
 {
-    public class OwnersToCsvUpdater : IStreamWriterUpdater<PackageOwnerSet>
+    public class OwnersToCsvUpdater : IAuxiliaryFileUpdater<PackageOwnerSet>
     {
         private readonly PackageOwnersClient _packageOwnersClient;
         private readonly IOptions<ExplorePackagesWorkerSettings> _options;
diff --git a/src/Worker.Logic/MessageProcessors/Workflow/WorkflowService.cs b/src/Worker.Logic/MessageProcessors/Workflow/WorkflowService.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Knapcode.ExplorePackages.Worker.KustoIngestion;
-using Knapcode.ExplorePackages.Worker.StreamWriterUpdater;
+using Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater;
 
 namespace Knapcode.ExplorePackages.Worker.Workflow
 {
@@ -11,8 +11,8 @@ public class WorkflowService
         private readonly WorkflowStorageService _workflowStorageService;
         private readonly AutoRenewingStorageLeaseService _leaseService;
         private readonly CatalogScanStorageService _catalogScanStorageService;
-        private readonly IStreamWriterUpdaterService<PackageOwnerSet> _ownersService;
-        private readonly IStreamWriterUpdaterService<PackageDownloadSet> _downloadsService;
+        private readonly IAuxiliaryFileUpdaterService<PackageOwnerSet> _ownersService;
+        private readonly IAuxiliaryFileUpdaterService<PackageDownloadSet> _downloadsService;
         private readonly KustoIngestionService _kustoIngestionService;
         private readonly KustoIngestionStorageService _kustoIngestionStorageService;
         private readonly IMessageEnqueuer _messageEnqueuer;
@@ -21,8 +21,8 @@ public WorkflowService(
             WorkflowStorageService workflowStorageService,
             AutoRenewingStorageLeaseService leaseService,
             CatalogScanStorageService catalogScanStorageService,
-            IStreamWriterUpdaterService<PackageOwnerSet> ownersService,
-            IStreamWriterUpdaterService<PackageDownloadSet> downloadsService,
+            IAuxiliaryFileUpdaterService<PackageOwnerSet> ownersService,
+            IAuxiliaryFileUpdaterService<PackageDownloadSet> downloadsService,
             KustoIngestionService kustoIngestionService,
             KustoIngestionStorageService kustoIngestionStorageService,
             IMessageEnqueuer messageEnqueuer)
diff --git a/src/Worker.Logic/MessageProcessors/Workflow/WorkflowTimer.cs b/src/Worker.Logic/MessageProcessors/Workflow/WorkflowTimer.cs
@@ -16,7 +16,7 @@ public WorkflowTimer(WorkflowService service)
         public TimeSpan Frequency => TimeSpan.FromDays(1);
         public bool AutoStart => false;
         public bool IsEnabled => _service.HasRequiredConfiguration;
-        public int Precedence => int.MinValue;
+        public int Order => default;
 
         public async Task<bool> ExecuteAsync()
         {
diff --git a/src/Worker.Logic/Serialization/SchemaSerializer.cs b/src/Worker.Logic/Serialization/SchemaSerializer.cs
@@ -12,7 +12,7 @@
 using Knapcode.ExplorePackages.Worker.PackageManifestToCsv;
 using Knapcode.ExplorePackages.Worker.PackageSignatureToCsv;
 using Knapcode.ExplorePackages.Worker.PackageVersionToCsv;
-using Knapcode.ExplorePackages.Worker.StreamWriterUpdater;
+using Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater;
 using Knapcode.ExplorePackages.Worker.TableCopy;
 using Knapcode.ExplorePackages.Worker.Workflow;
 using Microsoft.Extensions.Logging;
@@ -56,8 +56,8 @@ public class SchemaSerializer
 
             new SchemaV1<TableRowCopyMessage<LatestPackageLeaf>>("trc.lpf"),
 
-            new SchemaV1<StreamWriterUpdaterMessage<PackageDownloadSet>>("d2c"),
-            new SchemaV1<StreamWriterUpdaterMessage<PackageOwnerSet>>("o2c"),
+            new SchemaV1<AuxiliaryFileUpdaterMessage<PackageDownloadSet>>("d2c"),
+            new SchemaV1<AuxiliaryFileUpdaterMessage<PackageOwnerSet>>("o2c"),
         };
 
         public static IReadOnlyList<ISchemaDeserializer> ParameterSchemas = new ISchemaDeserializer[]
diff --git a/src/Worker.Logic/ServiceCollectionExtensions.cs b/src/Worker.Logic/ServiceCollectionExtensions.cs
diff --git a/test/Worker.Logic.Test/MessageProcessors/DownloadsToCsv/DownloadsToCsvIntegrationTest.cs b/test/Worker.Logic.Test/MessageProcessors/DownloadsToCsv/DownloadsToCsvIntegrationTest.cs
diff --git a/test/Worker.Logic.Test/MessageProcessors/OwnersToCsv/OwnersToCsvIntegrationTest.cs b/test/Worker.Logic.Test/MessageProcessors/OwnersToCsv/OwnersToCsvIntegrationTest.cs
diff --git a/test/Worker.Logic.Test/MessageProcessors/Workflow/WorkflowServiceTest.cs b/test/Worker.Logic.Test/MessageProcessors/Workflow/WorkflowServiceTest.cs
diff --git a/test/Worker.Test/IntegrationTest.cs b/test/Worker.Test/IntegrationTest.cs

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public async Task InitializeAsync()`
`59`	`59`	`public async Task<IReadOnlyList<TimerState>> GetStateAsync()`
`60`	`60`	`{`
`61`	`61`	`var pairs = _nameToTimer`
`62`		`- .OrderBy(x => x.Value.Precedence)`
	`62`	`+ .OrderBy(x => x.Value.Order)`
`63`	`63`	`.ThenBy(x => x.Key, StringComparer.OrdinalIgnoreCase)`
`64`	`64`	`.ToList();`
`65`	`65`
`@@ -116,7 +116,7 @@ public async Task<bool> ExecuteNowAsync(string timerName)`
`116`	`116`
`117`	`117`	`public async Task ExecuteAsync()`
`118`	`118`	`{`
`119`		`- await using (var lease = await _leaseService.TryAcquireAsync(nameof(TimerExecutionService)))`
	`119`	`+ await using (var lease = await _leaseService.TryAcquireAsync("TimerExecutionService"))`
`120`	`120`	`{`
`121`	`121`	`if (!lease.Acquired)`
`122`	`122`	`{`
`@@ -210,9 +210,9 @@ private async Task<bool> ExecuteAsync(ISet<string> timerNames, bool executeNow)`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`213`		`- // Execute timers by precedence.`
	`213`	`+ // Execute timers in ordered groups.`
`214`	`214`	`var anyExecuted = false;`
`215`		`- foreach (var group in toExecute.GroupBy(x => x.timer.Precedence).OrderBy(x => x.Key))`
	`215`	`+ foreach (var group in toExecute.GroupBy(x => x.timer.Order).OrderBy(x => x.Key))`
`216`	`216`	`{`
`217`	`217`	`var executed = await Task.WhenAll(group.Select(x => ExecuteAsync(x.timer, x.entity, x.persistAsync, now)));`
`218`	`218`	`anyExecuted \|= executed.Any(x => x);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public CatalogScanUpdateTimer(`
`25`	`25`	`public TimeSpan Frequency => _options.Value.CatalogScanUpdateFrequency;`
`26`	`26`	`public bool AutoStart => _options.Value.AutoStartCatalogScanUpdate;`
`27`	`27`	`public bool IsEnabled => true;`
`28`		`- public int Precedence => default;`
	`28`	`+ public int Order => 10;`
`29`	`29`
`30`	`30`	`public async Task<bool> ExecuteAsync()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public QueueSizeMetricsTimer(`
`21`	`21`	`public TimeSpan Frequency => TimeSpan.FromSeconds(30);`
`22`	`22`	`public bool AutoStart => true;`
`23`	`23`	`public bool IsEnabled => true;`
`24`		`- public int Precedence => default;`
	`24`	`+ public int Order => default;`
`25`	`25`
`26`	`26`	`public async Task<bool> ExecuteAsync()`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public UpdateSecretsTimer(`
`37`	`37`
`38`	`38`	`public string Name => "UpdateSecrets";`
`39`	`39`	`public bool AutoStart => true;`
`40`		`- public int Precedence => int.MaxValue;`
	`40`	`+ public int Order => int.MaxValue;`
`41`	`41`
`42`	`42`	`public TimeSpan Frequency`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`
`3`		`-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater`
	`3`	`+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater`
`4`	`4`	`{`
`5`		`- public class StreamWriterUpdaterMessage<T> : ITaskStateMessage`
	`5`	`+ public class AuxiliaryFileUpdaterMessage<T> : ITaskStateMessage`
`6`	`6`	`{`
`7`	`7`	`[JsonProperty("ts")]`
`8`	`8`	`public TaskStateKey TaskStateKey { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -11,26 +11,25 @@`
`11`	`11`	`using Microsoft.Extensions.Logging;`
`12`	`12`	`using Microsoft.Extensions.Options;`
`13`	`13`
`14`		`-namespace Knapcode.ExplorePackages.Worker.StreamWriterUpdater`
	`14`	`+namespace Knapcode.ExplorePackages.Worker.AuxiliaryFileUpdater`
`15`	`15`	`{`
`16`		`- public class StreamWriterUpdaterProcessor<T> : ITaskStateMessageProcessor<StreamWriterUpdaterMessage<T>>`
`17`		`- where T : IAsyncDisposable, IAsOfData`
	`16`	`+ public class AuxiliaryFileUpdaterProcessor<T> : ITaskStateMessageProcessor<AuxiliaryFileUpdaterMessage<T>> where T : IAsOfData`
`18`	`17`	`{`
`19`	`18`	`private const string AsOfTimestampMetadata = "asOfTimestamp";`
`20`	`19`	`private const string VersionSetCommitTimestampMetadata = "versionSetCommitTimestamp";`
`21`	`20`
`22`	`21`	`private readonly ServiceClientFactory _serviceClientFactory;`
`23`	`22`	`private readonly IVersionSetProvider _versionSetProvider;`
`24`		`- private readonly IStreamWriterUpdater<T> _updater;`
	`23`	`+ private readonly IAuxiliaryFileUpdater<T> _updater;`
`25`	`24`	`private readonly IOptions<ExplorePackagesWorkerSettings> _options;`
`26`		`- private readonly ILogger<StreamWriterUpdaterProcessor<T>> _logger;`
	`25`	`+ private readonly ILogger<AuxiliaryFileUpdaterProcessor<T>> _logger;`
`27`	`26`
`28`		`- public StreamWriterUpdaterProcessor(`
	`27`	`+ public AuxiliaryFileUpdaterProcessor(`
`29`	`28`	`ServiceClientFactory serviceClientFactory,`
`30`	`29`	`IVersionSetProvider versionSetProvider,`
`31`		`- IStreamWriterUpdater<T> updater,`
	`30`	`+ IAuxiliaryFileUpdater<T> updater,`
`32`	`31`	`IOptions<ExplorePackagesWorkerSettings> options,`
`33`		`- ILogger<StreamWriterUpdaterProcessor<T>> logger)`
	`32`	`+ ILogger<AuxiliaryFileUpdaterProcessor<T>> logger)`
`34`	`33`	`{`
`35`	`34`	`_serviceClientFactory = serviceClientFactory;`
`36`	`35`	`_versionSetProvider = versionSetProvider;`
`@@ -44,7 +43,7 @@ public static string GetLatestBlobName(string blobName)`
`44`	`43`	`return $"latest_{blobName}.csv.gz";`
`45`	`44`	`}`
`46`	`45`
`47`		`- public async Task<bool> ProcessAsync(StreamWriterUpdaterMessage<T> message, long dequeueCount)`
	`46`	`+ public async Task<bool> ProcessAsync(AuxiliaryFileUpdaterMessage<T> message, long dequeueCount)`
`48`	`47`	`{`
`49`	`48`	`await InitializeAsync();`
`50`	`49`
`@@ -84,7 +83,7 @@ public async Task<bool> ProcessAsync(StreamWriterUpdaterMessage<T> message, long`
`84`	`83`	`}`
`85`	`84`	`}`
`86`	`85`
`87`		`- if (_options.Value.OnlyKeepLatestInStreamWriterUpdater)`
	`86`	`+ if (_options.Value.OnlyKeepLatestInAuxiliaryFileUpdater)`
`88`	`87`	`{`
`89`	`88`	`await WriteDataAsync(versionSet, data, latestBlob);`
`90`	`89`	`}`