Code clean-up.

Author: gfraiteur

Diagnostics/PostSharp.Samples.Logging.ElasticStack/ClientExample/InstrumentOutgoingRequestsAspect.cs

@@ -1,6 +1,7 @@
 using ClientExample;
 using PostSharp.Aspects;
 using PostSharp.Patterns.Diagnostics;
+using PostSharp.Patterns.Diagnostics.Contexts;
 using PostSharp.Patterns.Formatters;
 using PostSharp.Serialization;
 using System;
@@ -44,45 +45,10 @@ public override async Task OnInvokeAsync(MethodInterceptionArgs args)
 
 
           // Generate the Correlation-Context header.
-          UnsafeStringBuilder correlationContextBuilder = null;
-          var propertyNames = new HashSet<string>();
-          try
+          var correlationContext = GetCorrelationContext(http, activity.Context);
+          if (correlationContext != null)
           {
-            activity.Context.ForEachProperty((LoggingProperty property, object value, ref object _) =>
-            {
-              if (!property.IsBaggage || !propertyNames.Add(property.Name))
-              {
-                return;
-              }
-
-              if (correlationContextBuilder == null)
-              {
-                propertyNames = new HashSet<string>();
-                correlationContextBuilder = new UnsafeStringBuilder(1024);
-              }
-
-              if (correlationContextBuilder.Length > 0)
-              {
-                correlationContextBuilder.Append(", ");
-              }
-
-              correlationContextBuilder.Append(property.Name);
-              correlationContextBuilder.Append('=');
-
-              var formatter =
-                              property.Formatter ?? LoggingServices.Formatters.Get(value.GetType());
-
-              formatter.Write(correlationContextBuilder, value);
-            });
-
-            if (correlationContextBuilder != null)
-            {
-              http.DefaultRequestHeaders.Add("Correlation-Context", correlationContextBuilder.ToString());
-            }
-          }
-          finally
-          {
-            correlationContextBuilder?.Dispose();
+            http.DefaultRequestHeaders.Add("Correlation-Context", correlationContext);
           }
 
 
@@ -129,6 +95,49 @@ public override async Task OnInvokeAsync(MethodInterceptionArgs args)
       }
     }
 
+    private static string GetCorrelationContext(HttpClient http, ILoggingContext context)
+    {
+      UnsafeStringBuilder correlationContextBuilder = null;
+      var propertyNames = new HashSet<string>();
+      try
+      {
+        context.ForEachProperty((LoggingProperty property, object value, ref object _) =>
+        {
+          if (!property.IsBaggage || !propertyNames.Add(property.Name))
+          {
+            return;
+          }
+
+          if (correlationContextBuilder == null)
+          {
+            propertyNames = new HashSet<string>();
+            correlationContextBuilder = new UnsafeStringBuilder(1024);
+          }
+
+          if (correlationContextBuilder.Length > 0)
+          {
+            correlationContextBuilder.Append(", ");
+          }
+
+          correlationContextBuilder.Append(property.Name);
+          correlationContextBuilder.Append('=');
+
+          var formatter =
+                          property.Formatter ?? LoggingServices.Formatters.Get(value.GetType());
+
+          formatter.Write(correlationContextBuilder, value);
+        });
+
+        return correlationContextBuilder?.ToString();
+
+      }
+      finally
+      {
+        correlationContextBuilder?.Dispose();
+      }
+
+    }
+
     private static string Trim(string s, string suffix)
         => s.EndsWith(suffix) ? s.Substring(0, s.Length - suffix.Length) : s;
   }

Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/LoggingActionFilter.cs

@@ -35,21 +35,7 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
       string correlationContext = context.HttpContext.Request.Headers["Correlation-Context"];
       if (!string.IsNullOrEmpty(correlationContext))
       {
-        var properties = new List<LoggingProperty>();
-        foreach (var pair in correlationContext.Split(',', StringSplitOptions.RemoveEmptyEntries))
-        {
-          var posOfEqual = pair.IndexOf('=');
-          if (posOfEqual <= 0)
-          {
-            continue;
-          }
-
-          var propertyName = pair.Substring(0, posOfEqual);
-          var propertyValue = pair.Substring(posOfEqual + 1);
-          properties.Add(new LoggingProperty(propertyName, propertyValue) { IsBaggage = true });
-        }
-
-        options.Properties = properties.ToArray();
+        options.Properties = ParseCorrelationContext(correlationContext)?.ToArray();
       }
 
       var request = context.HttpContext.Request;
@@ -79,5 +65,24 @@ public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionE
         }
       }
     }
+
+    private static List<LoggingProperty> ParseCorrelationContext(string correlationContext)
+    {
+      var properties = new List<LoggingProperty>();
+      foreach (var pair in correlationContext.Split(',', StringSplitOptions.RemoveEmptyEntries))
+      {
+        var posOfEqual = pair.IndexOf('=');
+        if (posOfEqual <= 0)
+        {
+          continue;
+        }
+
+        var propertyName = pair.Substring(0, posOfEqual);
+        var propertyValue = pair.Substring(posOfEqual + 1);
+        properties.Add(new LoggingProperty(propertyName, propertyValue) { IsBaggage = true });
+      }
+
+      return properties;
+    }
   }
 }