From c0f3a357bb7fb517f2731b49335ef085258ee82a Mon Sep 17 00:00:00 2001
From: Kristian Hellang <kristian@identitystream.com>
Date: Mon, 25 Mar 2024 14:13:42 +0100
Subject: [PATCH 1/2] Bump to latest dependencies

---
 Humio.cs                   | 15 ++++++++++-----
 HumioSinkExtensions.cs     | 10 +++++++++-
 Serilog.Sinks.Humio.csproj | 10 +++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Humio.cs b/Humio.cs
index 9423307..1676922 100644
--- a/Humio.cs
+++ b/Humio.cs
@@ -13,20 +13,20 @@
 using Serilog.Sinks.PeriodicBatching;
 
 namespace Serilog.Sinks.Humio {
-	public class Humio : PeriodicBatchingSink {
+	public class Humio : IBatchedLogEventSink {
 		private readonly string _ingestToken;
 		private readonly ITextFormatter _formatter;
 		private static readonly HttpClient HttpClient = new HttpClient();
 		private readonly Uri _uri;
 
-		public Humio(string ingestToken, string url) : base(10, TimeSpan.FromSeconds(5)) {
+		public Humio(string ingestToken, string url) {
 			_ingestToken = ingestToken;
 			_formatter = new JsonFormatter();
 			_uri = new Uri(
 				$"{url}/api/v1/ingest/humio-structured");
 		}
 
-		protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events) {
+		public async Task EmitBatchAsync(IEnumerable<LogEvent> events) {
 			try {
 				/*
 				 * Example structured payload. See ingest structured data docs https://docs.humio.com/api/ingest-api/#structured-data
@@ -38,7 +38,7 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events) {
 				 * [
 					  {
 						"tags": {
-						  "host": "server1", 
+						  "host": "server1",
 						  "source": "application.log"
 						},
 						"events": [
@@ -84,5 +84,10 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events) {
 				Console.WriteLine($"Failed to ship logs to Humio: {e}");
 			}
 		}
-	}
+
+        public Task OnEmptyBatchAsync()
+        {
+			return Task.CompletedTask;
+        }
+    }
 }
\ No newline at end of file
diff --git a/HumioSinkExtensions.cs b/HumioSinkExtensions.cs
index f76f089..5fb5d20 100644
--- a/HumioSinkExtensions.cs
+++ b/HumioSinkExtensions.cs
@@ -1,12 +1,20 @@
 using Serilog.Configuration;
 using Serilog.Events;
+using Serilog.Sinks.PeriodicBatching;
+using System;
 
 namespace Serilog.Sinks.Humio {
 	public static class HumioSinkExtensions {
 		public static LoggerConfiguration Humio(
 				  this LoggerSinkConfiguration loggerConfiguration,
 				  string ingestToken = null, string url = "https://cloud.humio.com", LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum) {
-			return loggerConfiguration.Sink(new Humio(ingestToken, url), restrictedToMinimumLevel);
+			var batchingOptions = new PeriodicBatchingSinkOptions
+			{
+				Period = TimeSpan.FromSeconds(5),
+				BatchSizeLimit = 10,
+			};
+			var sink = new PeriodicBatchingSink(new Humio(ingestToken, url), batchingOptions);
+			return loggerConfiguration.Sink(sink, restrictedToMinimumLevel);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Serilog.Sinks.Humio.csproj b/Serilog.Sinks.Humio.csproj
index 1e12dd5..d97cf26 100644
--- a/Serilog.Sinks.Humio.csproj
+++ b/Serilog.Sinks.Humio.csproj
@@ -6,12 +6,12 @@
 
   <PropertyGroup>
     <PackageId>Serilog.Sinks.Humio2</PackageId>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Authors>IdentityStream</Authors>
     <Company>IdentityStream</Company>
     <Description>A Serilog sink for logging to Humio.</Description>
     <PackageTags>Serilog;sink;Humio</PackageTags>
-    <RepositoryUrl>https://github.com/IdentityStream-AS/Serilog.Sinks.Humio</RepositoryUrl>
+    <RepositoryUrl>https://github.com/IdentityStream/Serilog.Sinks.Humio</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
@@ -21,9 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.0.1" />
   </ItemGroup>
 
 </Project>

From 68148d279270efbcbe93d76245881e68e2855862 Mon Sep 17 00:00:00 2001
From: Kristian Hellang <kristian@identitystream.com>
Date: Mon, 25 Mar 2024 14:16:11 +0100
Subject: [PATCH 2/2] Add SourceLink, snupkg and README to package

---
 Serilog.Sinks.Humio.csproj | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Serilog.Sinks.Humio.csproj b/Serilog.Sinks.Humio.csproj
index d97cf26..0848182 100644
--- a/Serilog.Sinks.Humio.csproj
+++ b/Serilog.Sinks.Humio.csproj
@@ -14,16 +14,23 @@
     <RepositoryUrl>https://github.com/IdentityStream/Serilog.Sinks.Humio</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="images\icon.png" Pack="true" PackagePath="\" />
+    <None Include="README.md" Pack="true" Visible="false" PackagePath="/" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>