General Cleanup

Author: merbla

sample/Serilog.Sinks.Splunk.Sample/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using Splunk.Client;
 
 
@@ -13,8 +14,9 @@ static void Main(string[] args)
             var tcp = new ViaTcp();
             var udp = new ViaUdp();
             var eventCollector = new ViaEventCollector();
-            udp.Configure();
-            tcp.Configure();
+            eventCollector.Configure();
+            //udp.Configure();
+            //tcp.Configure();
 
             Log.Information("Simulation running, press any key to exit.");
 
@@ -28,9 +30,12 @@ class ViaEventCollector : IConfigure
     {
          public void Configure()
          {
-             Log.Logger = new LoggerConfiguration()
+            ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
+
+
+            Log.Logger = new LoggerConfiguration()
                  .WriteTo.LiterateConsole()
-                 .WriteTo.SplunkViaEventCollector("https://mysplunk", "685546AE-0278-4786-97C4-5971676D5D70")
+                 .WriteTo.SplunkViaEventCollector("https://mysplunk:8088/services/collector", "685546AE-0278-4786-97C4-5971676D5D70")
                  .Enrich.WithThreadId()
                  .Enrich.WithProperty("SplunkSample", "ViaEventCollector")
                  .MinimumLevel.Debug()

src/Serilog.Sinks.Splunk.FullNetFx/Serilog.Sinks.Splunk.FullNetFx.csproj

@@ -62,15 +62,23 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\EventCollectorExtensions.cs">
+      <Link>Sinks\Splunk\EventCollectorExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\RepeatAction.cs">
+      <Link>Sinks\Splunk\RepeatAction.cs</Link>
+    </Compile>
     <Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\SplunkJsonFormatter.cs">
       <Link>Sinks\Splunk\SplunkJsonFormatter.cs</Link>
     </Compile>
+    <Compile Include="..\Serilog.Sinks.Splunk\Sinks\Splunk\SplunkViaEventCollectorSink.cs">
+      <Link>Sinks\Splunk\SplunkViaEventCollectorSink.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\assets\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="LoggerConfigurationSplunkExtensions.cs" />
-    <Compile Include="Sinks\Splunk\SplunkViaEventCollector.cs" />
     <Compile Include="Sinks\Splunk\SplunkViaTcpSink.cs" />
     <Compile Include="Sinks\Splunk\SplunkViaUdpSink.cs" />
   </ItemGroup>

src/Serilog.Sinks.Splunk.FullNetFx/Sinks/Splunk/SplunkViaEventCollector.cs

@@ -21,19 +21,31 @@ public class SplunkViaEventCollectorSink : ILogEventSink
     {
         private  string _splunkHost;
         private  string _eventCollectorToken;
-        private  int _batchSizeLimit;
+        private  int _batchSizeLimitLimit;
         private  JsonFormatter _jsonFormatter;
         private  ConcurrentQueue<LogEvent> _queue;
+        private TimeSpan _batchInterval;
+
+
+        //public const int DefaultBatchInterval = 10 * 1000; // 10 seconds
+        //public const int DefaultBatchSize = 10 * 1024; // 10KB
+        //public const int DefaultBatchCount = 10;
+
 
         /// <summary>
         /// Creates a new instance of the sink
         /// </summary>
         /// <param name="splunkHost"></param>
         /// <param name="eventCollectorToken"></param>
+        /// <param name="batchSizeLimit"></param>
         /// <param name="formatProvider"></param>
         /// <param name="renderTemplate"></param>
-        public SplunkViaEventCollectorSink(string splunkHost,
+        /// <param name="batchIntervalInSeconds"></param>
+        public SplunkViaEventCollectorSink(
+            string splunkHost,
             string eventCollectorToken,
+            int batchIntervalInSeconds = 10,
+            int batchSizeLimit = 10,
             IFormatProvider formatProvider = null,
             bool renderTemplate = true
             )
@@ -42,11 +54,11 @@ public SplunkViaEventCollectorSink(string splunkHost,
             _eventCollectorToken = eventCollectorToken;
             _queue = new ConcurrentQueue<LogEvent>();
 
-            _jsonFormatter = new JsonFormatter(renderMessage: true, formatProvider: formatProvider);
-            _batchSizeLimit = 1;
-            var batchInterval = TimeSpan.FromSeconds(5);
+            _jsonFormatter = new SplunkJsonFormatter(renderMessage: true, formatProvider: formatProvider, renderTemplate:renderTemplate);
+            _batchSizeLimitLimit = batchSizeLimit;
+            _batchInterval = TimeSpan.FromSeconds(batchIntervalInSeconds);
 
-            RepeatAction.OnInterval(batchInterval, () => ProcessQueue().Wait(), new CancellationToken());
+            RepeatAction.OnInterval(_batchInterval, () => ProcessQueue().Wait(), new CancellationToken());
         }
 
         /// <summary>
@@ -70,7 +82,7 @@ private async Task ProcessQueue()
                     var events = new Queue<LogEvent>();
                     LogEvent next;
 
-                    while (count < _batchSizeLimit && _queue.TryDequeue(out next))
+                    while (count < _batchSizeLimitLimit && _queue.TryDequeue(out next))
                     {
                         count++;
                         events.Enqueue(next);
@@ -80,10 +92,14 @@ private async Task ProcessQueue()
                         return;
 
                     var sw = new StringWriter();
+                    
+                    //TODO: Check status code against defaults
+                    //TODO: Put items back in queue if matching use case
+                    //TODO: Change to use retry methods
 
+      
                     foreach (var logEvent in events)
-                    {
-                        
+                    {   
                         _jsonFormatter.Format(logEvent, sw);
 
                         var logEventAsAString = sw.ToString();