# This is a combination of 3 commits.

# This is the 1st commit message:

Only require endpoint name to be present to consider an endpoint detected

# This is the commit message #2:

Isolate changes

# This is the commit message #3:

More rollbacks

Only require endpoint name to be available when detecting receiving endpoint details

Fix merge

Author: andreasohlund

src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_ingesting_failed_message_with_missing_headers.cs

@@ -45,10 +45,6 @@ public async Task Should_include_headers_required_by_ServicePulse()
             {
                 c.AddMinimalRequiredHeaders();
 
-                // This is needed for ServiceControl to be able to detect both endpoint (via failed q header) and host via the processing machine header
-                // Missing endpoint or host will cause a null ref in ServicePulse
-                c.Headers[Headers.ProcessingMachine] = "MyMachine";
-
                 c.Headers[FaultsHeaderKeys.ExceptionType] = "SomeExceptionType";
                 c.Headers[FaultsHeaderKeys.Message] = "Some message";
             })
@@ -63,7 +59,6 @@ public async Task Should_include_headers_required_by_ServicePulse()
         // ServicePulse assumes that the receiving endpoint name is present
         Assert.That(failure.ReceivingEndpoint, Is.Not.Null);
         Assert.That(failure.ReceivingEndpoint.Name, Is.EqualTo(context.EndpointNameOfReceivingEndpoint));
-        Assert.That(failure.ReceivingEndpoint.Host, Is.EqualTo("MyMachine"));
 
         // ServicePulse needs both an exception type and description to render the UI in a resonable way
         Assert.That(failure.Exception.ExceptionType, Is.EqualTo("SomeExceptionType"));

src/ServiceControl/Operations/EndpointDetailsParser.cs

@@ -80,8 +80,8 @@ public static EndpointDetails ReceivingEndpoint(IReadOnlyDictionary<string, stri
                     endpoint.Host = queueAndMachinename.Machine;
                 }
 
-                // If we've been now able to get the endpoint details, return the new info.
-                if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))
+                // If we've been now able to get at least the endpoint name, return the new info.
+                if (!string.IsNullOrEmpty(endpoint.Name))
                 {
                     return endpoint;
                 }