Changed to include Event Collector URI in the HTTP Request.

merbla · merbla · commit f1a0047e0696 · 2016-03-14T19:39:33.000+10:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,8 @@
-##2.0 Support for DotNet Core
+##2.0 
+ - Support for DotNet Core
  - Event Collector Sink targeting core
  - TCP/UDP Sinks targeting 4.5
+ - Changed HTTP Client to include URI endpoint to host: "services/collector/event"
 
 ##1.7
  - Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
diff --git a/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorClient.cs b/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorClient.cs
@@ -10,5 +10,10 @@ public EventCollectorClient(string eventCollectorToken) : base()
         {
             DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Splunk", eventCollectorToken);
         }
+
+        public EventCollectorClient(string eventCollectorToken, HttpMessageHandler messageHandler) : base(messageHandler)
+        {
+            DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Splunk", eventCollectorToken);
+        }
     }
 }
diff --git a/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorRequest.cs b/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorRequest.cs
@@ -46,8 +46,10 @@ internal class EventCollectorRequest : HttpRequestMessage
     {
         internal EventCollectorRequest(string splunkHost, string jsonPayLoad)
         {
+            var hostUrl = $@"{splunkHost}/services/collector/event";
+
             var stringContent = new StringContent(jsonPayLoad, Encoding.UTF8, "application/json");
-            RequestUri = new Uri(splunkHost);
+            RequestUri = new Uri(hostUrl);
             Content = stringContent;
             Method = HttpMethod.Post;
         }
diff --git a/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorSink.cs b/src/Serilog.Sinks.Splunk/Sinks/Splunk/EventCollectorSink.cs
@@ -19,6 +19,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Serilog.Core;
@@ -52,8 +53,7 @@ public class EventCollectorSink : ILogEventSink, IDisposable
             HttpStatusCode.Forbidden,
             HttpStatusCode.MethodNotAllowed,
             HttpStatusCode.BadRequest
-        };
-
+        }; 
 
         /// <summary>
         /// Creates a new instance of the sink
@@ -86,14 +86,12 @@ public EventCollectorSink(
             var cancellationToken = new CancellationToken();
 
           //  _timer = new PortableTimer(async c => await ProcessQueue());
-
-
-
+           
             RepeatAction.OnInterval(
                 batchInterval,
                 async () => await ProcessQueue(),
                 cancellationToken);
-        }
+        } 
 
         /// <summary>
         /// Creates a new instance of the sink
diff --git a/src/Serilog.Sinks.Splunk/SplunkLoggingConfigurationExtensions.cs b/src/Serilog.Sinks.Splunk/SplunkLoggingConfigurationExtensions.cs
@@ -14,88 +14,85 @@
 
 
 using System;
-using System.Runtime.CompilerServices;
+using System.Net.Http;
 using Serilog.Configuration;
 using Serilog.Events;
 using Serilog.Sinks.Splunk;
 
 namespace Serilog
 {
     /// <summary>
-    /// Fluent configuration methods for Logger configuration
+    ///     Fluent configuration methods for Logger configuration
     /// </summary>
     public static class SplunkLoggingConfigurationExtensions
-    { 
+    {
+        internal const string DefaultOutputTemplate =
+            "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}";
 
-            internal const string DefaultOutputTemplate =
-                "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}";
+        /// <summary>
+        ///     Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
+        /// </summary>
+        /// <param name="configuration">The logger config</param>
+        /// <param name="splunkHost">The Splunk host that is configured with an Event Collector</param>
+        /// <param name="eventCollectorToken">The token provided to authenticate to the Splunk Event Collector</param>
+        /// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
+        /// <param name="outputTemplate">The output template to be used when logging</param>
+        /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
+        /// <param name="renderTemplate">If ture, the message template will be rendered</param>
+        /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
+        /// <param name="batchSizeLimit">The size of the batch</param>
+        /// <returns></returns>
+        public static LoggerConfiguration EventCollector(
+            this LoggerSinkConfiguration configuration,
+            string splunkHost,
+            string eventCollectorToken,
+            LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+            string outputTemplate = DefaultOutputTemplate,
+            IFormatProvider formatProvider = null,
+            bool renderTemplate = true,
+            int batchIntervalInSeconds = 2,
+            int batchSizeLimit = 100)
+        {
+            if (configuration == null) throw new ArgumentNullException(nameof(configuration));
+            if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
 
-            /// <summary>
-            /// Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
-            /// </summary>
-            /// <param name="configuration">The logger config</param>
-            /// <param name="splunkHost">The Splunk host that is configured with an Event Collector</param>
-            /// <param name="eventCollectorToken">The token provided to authenticate to the Splunk Event Collector</param>
-            /// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
-            /// <param name="outputTemplate">The output template to be used when logging</param>
-            /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
-            /// <param name="renderTemplate">If ture, the message template will be rendered</param>
-            /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
-            /// <param name="batchSizeLimit">The size of the batch</param>
-            /// <returns></returns>
-            public static LoggerConfiguration EventCollector(
-                this LoggerSinkConfiguration configuration,
-                string splunkHost,
-                string eventCollectorToken,
-                LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
-                string outputTemplate = DefaultOutputTemplate,
-                IFormatProvider formatProvider = null,
-                bool renderTemplate = true,
-                int batchIntervalInSeconds = 2,
-                int batchSizeLimit = 100)
-            {
-                if (configuration == null) throw new ArgumentNullException(nameof(configuration));
-                if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
+            var eventCollectorSink = new EventCollectorSink(
+                splunkHost,
+                eventCollectorToken,
+                batchIntervalInSeconds,
+                batchSizeLimit,
+                formatProvider,
+                renderTemplate);
 
-                var eventCollectorSink = new EventCollectorSink(
-                    splunkHost,
-                    eventCollectorToken,
-                    batchIntervalInSeconds,
-                    batchSizeLimit,
-                    formatProvider,
-                    renderTemplate);
-
-                return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
-            }
-
-
-            /// <summary>
-            /// Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
-            /// </summary>
-            /// <param name="configuration">The logger config</param>
-            /// <param name="splunkHost">The Splunk host that is configured with an Event Collector</param>
-            /// <param name="eventCollectorToken">The token provided to authenticate to the Splunk Event Collector</param>
-            /// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
-            /// <param name="outputTemplate">The output template to be used when logging</param>
-            /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
-            /// <param name="renderTemplate">If ture, the message template will be rendered</param>
-            /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
-            /// <param name="batchSizeLimit">The size of the batch</param>
-            /// <returns></returns>
-            public static LoggerConfiguration SplunkViaEventCollector(
-                this LoggerSinkConfiguration configuration,
-                string splunkHost,
-                string eventCollectorToken,
-                LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
-                string outputTemplate = DefaultOutputTemplate,
-                IFormatProvider formatProvider = null,
-                bool renderTemplate = true,
-                int batchIntervalInSeconds = 2,
-                int batchSizeLimit = 100)
-            {
-                return EventCollector(configuration, splunkHost, eventCollectorToken, restrictedToMinimumLevel,
-                    outputTemplate, formatProvider, renderTemplate, batchIntervalInSeconds, batchSizeLimit);
-            }
+            return configuration.Sink(eventCollectorSink, restrictedToMinimumLevel);
+        }
 
+        /// <summary>
+        ///     Adds a sink that writes log events as to a Splunk instance via the HTTP Event Collector.
+        /// </summary>
+        /// <param name="configuration">The logger config</param>
+        /// <param name="splunkHost">The Splunk host that is configured with an Event Collector</param>
+        /// <param name="eventCollectorToken">The token provided to authenticate to the Splunk Event Collector</param>
+        /// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
+        /// <param name="outputTemplate">The output template to be used when logging</param>
+        /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
+        /// <param name="renderTemplate">If ture, the message template will be rendered</param>
+        /// <param name="batchIntervalInSeconds">The interval in seconds that the queue should be instpected for batching</param>
+        /// <param name="batchSizeLimit">The size of the batch</param>
+        /// <returns></returns>
+        public static LoggerConfiguration SplunkViaEventCollector(
+            this LoggerSinkConfiguration configuration,
+            string splunkHost,
+            string eventCollectorToken,
+            LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+            string outputTemplate = DefaultOutputTemplate,
+            IFormatProvider formatProvider = null,
+            bool renderTemplate = true,
+            int batchIntervalInSeconds = 2,
+            int batchSizeLimit = 100)
+        {
+            return EventCollector(configuration, splunkHost, eventCollectorToken, restrictedToMinimumLevel,
+                outputTemplate, formatProvider, renderTemplate, batchIntervalInSeconds, batchSizeLimit);
         }
+    }
 }
diff --git a/src/sample/Program.cs b/src/sample/Program.cs
@@ -14,29 +14,14 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            string splunkHost = "http://192.168.71.1:8088/services/collector/event";
+            string splunkHost = "http://192.168.71.1:8088";
             string splunkEventCollectorToken = "274AD921-FB85-429B-B09E-4EE069843218";
-
-#if ServiceManager
-
-            ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
-
+ 
             Log.Logger = new LoggerConfiguration() 
                 .WriteTo.LiterateConsole()
                 .WriteTo.EventCollector (splunkHost, splunkEventCollectorToken)
                 .CreateLogger();
-#else
-            var handler = new System.Net.Http.WinHttpHandler();
-            handler.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
-
-
-            Log.Logger = new LoggerConfiguration() 
-                .WriteTo.LiterateConsole()
-                .WriteTo.EventCollector (splunkHost, splunkEventCollectorToken, handler)
-                .CreateLogger();
-
-#endif
-
+ 
             Serilog.Debugging.SelfLog.Out = Console.Out;
 
             Log.Information("Sample starting up");
diff --git a/src/sample/project.lock.json b/src/sample/project.lock.json
@@ -49,7 +49,7 @@
           "lib/net45/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -144,7 +144,7 @@
           "lib/dotnet5.1/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
@@ -791,7 +791,7 @@
           "lib/net45/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -853,7 +853,7 @@
           "lib/net45/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -1181,7 +1181,7 @@
           "lib/dotnet5.1/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
@@ -2197,7 +2197,7 @@
           "lib/dotnet5.1/Serilog.Sinks.Literate.dll": {}
         }
       },
-      "Serilog.Sinks.Splunk/2.0.0": {
+      "Serilog.Sinks.Splunk/2.0.0-1": {
         "type": "project",
         "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
@@ -2902,7 +2902,7 @@
     }
   },
   "libraries": {
-    "Serilog.Sinks.Splunk/2.0.0": {
+    "Serilog.Sinks.Splunk/2.0.0-1": {
       "type": "project",
       "path": "../Serilog.Sinks.Splunk/project.json"
     },

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,10 @@ public EventCollectorClient(string eventCollectorToken) : base()`
`10`	`10`	`{`
`11`	`11`	`DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Splunk", eventCollectorToken);`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ public EventCollectorClient(string eventCollectorToken, HttpMessageHandler messageHandler) : base(messageHandler)`
	`15`	`+ {`
	`16`	`+ DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Splunk", eventCollectorToken);`
	`17`	`+ }`
`13`	`18`	`}`
`14`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,10 @@ internal class EventCollectorRequest : HttpRequestMessage`
`46`	`46`	`{`
`47`	`47`	`internal EventCollectorRequest(string splunkHost, string jsonPayLoad)`
`48`	`48`	`{`
	`49`	`+ var hostUrl = $@"{splunkHost}/services/collector/event";`
	`50`	`+`
`49`	`51`	`var stringContent = new StringContent(jsonPayLoad, Encoding.UTF8, "application/json");`
`50`		`- RequestUri = new Uri(splunkHost);`
	`52`	`+ RequestUri = new Uri(hostUrl);`
`51`	`53`	`Content = stringContent;`
`52`	`54`	`Method = HttpMethod.Post;`
`53`	`55`	`}`