Made the endpoint name configurable for the job service instance endpoint.

Author: phatboyg

src/MassTransit/DependencyInjection/Configuration/JobServiceEndpointDefinition.cs

@@ -1,34 +1,28 @@
+#nullable enable
 namespace MassTransit.Configuration
 {
-    using System.Text;
     using JobService;
-    using NewIdFormatters;
 
 
     public class JobServiceEndpointDefinition :
         IEndpointDefinition<JobService>
     {
         readonly InstanceJobServiceSettings _jobServiceSettings;
         readonly IEndpointSettings<IEndpointDefinition<JobService>> _settings;
+        string? _endpointName;
 
         public JobServiceEndpointDefinition(IEndpointSettings<IEndpointDefinition<JobService>> settings, InstanceJobServiceSettings jobServiceSettings)
         {
             _settings = settings;
             _jobServiceSettings = jobServiceSettings;
-
-            var instanceId = NewId.Next();
-
-            InstanceName = instanceId.ToString(ZBase32Formatter.LowerCase);
         }
 
-        string InstanceName { get; }
-
         public bool IsTemporary => true;
         public int? PrefetchCount => _settings.PrefetchCount;
         public int? ConcurrentMessageLimit => _settings.ConcurrentMessageLimit;
         public bool ConfigureConsumeTopology => _settings.ConfigureConsumeTopology;
 
-        public void Configure<T>(T configurator, IRegistrationContext context)
+        public void Configure<T>(T configurator, IRegistrationContext? context)
             where T : IReceiveEndpointConfigurator
         {
             _jobServiceSettings.ApplyConfiguration(configurator);
@@ -38,13 +32,14 @@ public void Configure<T>(T configurator, IRegistrationContext context)
 
         public string GetEndpointName(IEndpointNameFormatter formatter)
         {
-            var sb = new StringBuilder(InstanceName.Length + 9);
-
-            sb.Append("Instance");
-            sb.Append('_');
-            sb.Append(InstanceName);
-
-            return formatter.SanitizeName(sb.ToString());
+            string FormatName()
+            {
+                return _settings.Name ?? "Instance";
+            }
+
+            return _endpointName ??= string.IsNullOrWhiteSpace(_settings.InstanceId)
+                ? formatter.SanitizeName(FormatName())
+                : formatter.SanitizeName(FormatName() + formatter.Separator + _settings.InstanceId);
         }
     }
 }

src/MassTransit/DependencyInjection/DependencyInjection/Registration/Activites/JobServiceRegistration.cs

@@ -25,6 +25,7 @@ public JobServiceRegistration()
 
             _endpointConfigurator = new EndpointRegistrationConfigurator<JobService>
             {
+                Name = "Instance",
                 InstanceId = NewId.Next().ToString(ZBase32Formatter.LowerCase),
                 Temporary = true
             };

tests/MassTransit.Azure.ServiceBus.Core.Tests/JobConsumer_Specs.cs

@@ -3,7 +3,6 @@ namespace MassTransit.Azure.ServiceBus.Core.Tests
     using System;
     using System.Threading.Tasks;
     using Contracts.JobService;
-    using global::Azure;
     using JobConsumerTests;
     using Microsoft.Extensions.DependencyInjection;
     using NUnit.Framework;
@@ -59,7 +58,7 @@ public async Task Should_cancel_the_job()
 
             IRequestClient<SubmitJob<OddJob>> client = harness.GetRequestClient<SubmitJob<OddJob>>();
 
-            MassTransit.Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
+            Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
             {
                 JobId = jobId,
                 Job = new { Duration = TimeSpan.FromSeconds(10) }
@@ -93,7 +92,7 @@ public async Task Should_cancel_the_job_and_get_the_status()
 
             IRequestClient<SubmitJob<OddJob>> client = harness.GetRequestClient<SubmitJob<OddJob>>();
 
-            MassTransit.Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
+            Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
             {
                 JobId = jobId,
                 Job = new { Duration = TimeSpan.FromSeconds(10) }
@@ -111,7 +110,7 @@ await Assert.MultipleAsync(async () =>
 
             IRequestClient<GetJobState> stateClient = harness.GetRequestClient<GetJobState>();
 
-            MassTransit.Response<JobState> jobState = await stateClient.GetResponse<JobState>(new { JobId = jobId });
+            Response<JobState> jobState = await stateClient.GetResponse<JobState>(new { JobId = jobId });
 
             Assert.That(jobState.Message.CurrentState, Is.EqualTo("Started"));
 
@@ -141,7 +140,7 @@ public async Task Should_cancel_the_job_and_retry_it()
 
             IRequestClient<SubmitJob<OddJob>> client = harness.GetRequestClient<SubmitJob<OddJob>>();
 
-            MassTransit.Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
+            Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
             {
                 JobId = jobId,
                 Job = new { Duration = TimeSpan.FromSeconds(10) }
@@ -188,7 +187,7 @@ public async Task Should_cancel_the_job_while_waiting()
 
             IRequestClient<SubmitJob<OddJob>> client = harness.GetRequestClient<SubmitJob<OddJob>>();
 
-            MassTransit.Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
+            Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
             {
                 JobId = previousJobId,
                 Job = new { Duration = TimeSpan.FromSeconds(10) }
@@ -232,7 +231,7 @@ public async Task Should_complete_the_job()
 
             IRequestClient<SubmitJob<OddJob>> client = harness.GetRequestClient<SubmitJob<OddJob>>();
 
-            MassTransit.Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
+            Response<JobSubmissionAccepted> response = await client.GetResponse<JobSubmissionAccepted>(new
             {
                 JobId = jobId,
                 Job = new { Duration = TimeSpan.FromSeconds(1) }
@@ -314,7 +313,11 @@ static ServiceProvider SetupServiceCollection()
 
                     x.AddJobSagaStateMachines();
                     x.SetJobConsumerOptions(options => options.HeartbeatInterval = TimeSpan.FromSeconds(10))
-                        .Endpoint(e => e.PrefetchCount = 100);
+                        .Endpoint(e =>
+                        {
+                            e.Name = "Prefix-Instance";
+                            e.PrefetchCount = 100;
+                        });
 
                     x.UsingTestAzureServiceBus();
                 })