fix: use null-coalescing for dataset and namespace

intility · Nov 26, 2024 · c1d7a2d · c1d7a2d
1 parent 0c4f2f4
commit c1d7a2d
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/src/Intility.Extensions.Logging.Elasticsearch/LoggerBuilderExtensions.cs b/src/Intility.Extensions.Logging.Elasticsearch/LoggerBuilderExtensions.cs
@@ -47,25 +47,15 @@ public static ILoggerBuilder UseElasticsearch(this ILoggerBuilder builder, strin
             var llmPolicy = elasticConfig["LLMPolicy"];
             var indexFormat = elasticConfig["IndexFormat"];
 
-            var dataSet = elasticConfig["DataSet"];
-            var namespaceName = elasticConfig["Namespace"];
+            var dataSet = string.IsNullOrWhiteSpace(elasticConfig["DataSet"]) ? "generic" : elasticConfig["DataSet"];
+            var namespaceName = string.IsNullOrWhiteSpace(elasticConfig["Namespace"]) ? "default" : elasticConfig["Namespace"];
 
             if (string.IsNullOrWhiteSpace(indexFormat))
             {
                 throw new Exception("Failed to initialize Elasticsearch sink",
                     new ArgumentException($"missing elastic config: {configSection}:IndexFormat"));
             }
 
-            if (string.IsNullOrWhiteSpace(dataSet))
-            {
-                dataSet = "generic";
-            }
-
-            if (string.IsNullOrWhiteSpace(namespaceName))
-            {
-                namespaceName = "default";
-            }
-
             var endpoints = elasticEndpoints.Split(',')
                 .Select(endpoint => new Uri(endpoint));
 
@@ -77,7 +67,7 @@ public static ILoggerBuilder UseElasticsearch(this ILoggerBuilder builder, strin
                 var transport = new DistributedTransport(settings);
                 var sinkOptions = new ElasticsearchSinkOptions(transport)
                 {
-                    DataStream = new DataStreamName(indexFormat),
+                    DataStream = new DataStreamName(indexFormat, dataSet, namespaceName),
                     BootstrapMethod = BootstrapMethod.Failure,
                     ChannelDiagnosticsCallback = channel => {
                         SelfLog.WriteLine(