Merge pull request #25 from mmckechney/AzureSDK_update

Updating the Azure SDK to the new Azure.Messaging.EventHubs
serilog-contrib · Jun 4, 2021 · 5c29219 · 5c29219
2 parents 2f78f69 + 4f444dc
commit 5c29219
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 65 deletions.
diff --git a/src/Serilog.Sinks.AzureEventHub/AuditLoggerConfigurationAzureEventHubExtensions.cs b/src/Serilog.Sinks.AzureEventHub/AuditLoggerConfigurationAzureEventHubExtensions.cs
@@ -14,7 +14,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Azure.EventHubs;
+using Azure.Messaging.EventHubs.Producer;
 using Serilog.Configuration;
 using Serilog.Core;
 using Serilog.Events;
@@ -45,7 +45,7 @@ public static class AuditLoggerConfigurationAzureEventHubExtensions
         /// <exception cref="ArgumentNullException">A required parameter is null.</exception>
         public static LoggerConfiguration AzureEventHub(
             this LoggerAuditSinkConfiguration loggerConfiguration,
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             string outputTemplate = DefaultOutputTemplate,
             IFormatProvider formatProvider = null,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum
@@ -75,7 +75,7 @@ public static LoggerConfiguration AzureEventHub(
         public static LoggerConfiguration AzureEventHub(
             this LoggerAuditSinkConfiguration loggerConfiguration,
             ITextFormatter formatter,
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum)
         {
             if (loggerConfiguration == null)
@@ -115,12 +115,7 @@ public static LoggerConfiguration AzureEventHub(
             if (string.IsNullOrWhiteSpace(eventHubName))
                 throw new ArgumentNullException("eventHubName");
 
-            var connectionstringBuilder = new EventHubsConnectionStringBuilder(connectionString)
-            {
-                EntityPath = eventHubName
-            };
-
-            var client = EventHubClient.CreateFromConnectionString(connectionstringBuilder.ToString());
+            var client = new EventHubProducerClient(connectionString, eventHubName);
 
             return AzureEventHub(loggerConfiguration, client, outputTemplate, formatProvider, restrictedToMinimumLevel);
         }
@@ -150,11 +145,7 @@ public static LoggerConfiguration AzureEventHub(
             if (string.IsNullOrWhiteSpace(eventHubName))
                 throw new ArgumentNullException("eventHubName");
 
-            var connectionStringBuilder = new EventHubsConnectionStringBuilder(connectionString)
-            {
-                EntityPath = eventHubName
-            };
-            var client = EventHubClient.CreateFromConnectionString(connectionStringBuilder.ToString());
+            var client = new EventHubProducerClient(connectionString, eventHubName);
             return AzureEventHub(loggerConfiguration, formatter, client, restrictedToMinimumLevel);
         }
     }

diff --git a/src/Serilog.Sinks.AzureEventHub/LoggerConfigurationAzureEventHubExtensions.cs b/src/Serilog.Sinks.AzureEventHub/LoggerConfigurationAzureEventHubExtensions.cs
@@ -14,7 +14,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Azure.EventHubs;
+using Azure.Messaging.EventHubs.Producer;
 using Serilog.Configuration;
 using Serilog.Core;
 using Serilog.Events;
@@ -59,7 +59,7 @@ public static class LoggerConfigurationAzureEventHubExtensions
         /// <exception cref="ArgumentNullException">A required parameter is null.</exception>
         public static LoggerConfiguration AzureEventHub(
             this LoggerSinkConfiguration loggerConfiguration,
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             string outputTemplate = DefaultOutputTemplate,
             IFormatProvider formatProvider = null,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
@@ -96,7 +96,7 @@ public static LoggerConfiguration AzureEventHub(
         public static LoggerConfiguration AzureEventHub(
             this LoggerSinkConfiguration loggerConfiguration,
             ITextFormatter formatter,
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
             bool writeInBatches = false,
             TimeSpan? period = null,
@@ -153,12 +153,7 @@ public static LoggerConfiguration AzureEventHub(
             if (string.IsNullOrWhiteSpace(eventHubName))
                 throw new ArgumentNullException("eventHubName");
 
-            var connectionstringBuilder = new EventHubsConnectionStringBuilder(connectionString)
-            {
-                EntityPath = eventHubName
-            };
-
-            var client = EventHubClient.CreateFromConnectionString(connectionstringBuilder.ToString());
+            var client = new EventHubProducerClient(connectionString, eventHubName);
 
             return AzureEventHub(loggerConfiguration, client, outputTemplate, formatProvider, restrictedToMinimumLevel, writeInBatches, period, batchPostingLimit);
         }
@@ -195,11 +190,7 @@ public static LoggerConfiguration AzureEventHub(
             if (string.IsNullOrWhiteSpace(eventHubName))
                 throw new ArgumentNullException("eventHubName");
 
-            var connectionStringBuilder = new EventHubsConnectionStringBuilder(connectionString)
-            {
-                EntityPath = eventHubName
-            };
-            var client = EventHubClient.CreateFromConnectionString(connectionStringBuilder.ToString());
+            var client = new EventHubProducerClient(connectionString, eventHubName);
 
             return AzureEventHub(loggerConfiguration, formatter, client, restrictedToMinimumLevel, writeInBatches, period, batchPostingLimit);
         }

diff --git a/src/Serilog.Sinks.AzureEventHub/Serilog.Sinks.AzureEventHub.csproj b/src/Serilog.Sinks.AzureEventHub/Serilog.Sinks.AzureEventHub.csproj
@@ -1,29 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<Description>Write Serilog events to Azure Event Hub</Description>
-		<VersionPrefix>6.0.0</VersionPrefix>
-		<Authors>Serilog Contributors</Authors>
-		<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<AssemblyName>Serilog.Sinks.AzureEventHub</AssemblyName>
-		<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
-		<SignAssembly>true</SignAssembly>
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-		<PackageId>Serilog.Sinks.AzureEventHub</PackageId>
-		<PackageTags>serilog;azure;eventhub</PackageTags>
-		<PackageProjectUrl>http://serilog.net</PackageProjectUrl>
-		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-		<RepositoryUrl>https://github.com/serilog/serilog-sinks-azureeventhub</RepositoryUrl>
-    	        <RepositoryType>git</RepositoryType>
-		<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-		<RootNamespace>Serilog</RootNamespace>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Azure.EventHubs" Version="4.*" />
-		<PackageReference Include="Serilog" Version="2.5.0" />
-		<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
-	</ItemGroup>
-
-</Project>
+  <PropertyGroup>
+    <Description>Write Serilog events to Azure Event Hub</Description>
+    <VersionPrefix>6.0.0</VersionPrefix>
+    <Authors>Serilog Contributors</Authors>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Serilog.Sinks.AzureEventHub</AssemblyName>
+    <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>Serilog.Sinks.AzureEventHub</PackageId>
+    <PackageTags>serilog;azure;eventhub</PackageTags>
+    <PackageProjectUrl>http://serilog.net</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/serilog/serilog-sinks-azureeventhub</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <RootNamespace>Serilog</RootNamespace>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- <PackageReference Include="Microsoft.Azure.EventHubs" Version="4.*"/> -->
+    <PackageReference Include="Serilog" Version="2.5.0"/>
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1"/>
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.4.1"/>
+  </ItemGroup>
+</Project>
diff --git a/src/Serilog.Sinks.AzureEventHub/Serilog.Sinks.AzureEventHub.nuspec b/src/Serilog.Sinks.AzureEventHub/Serilog.Sinks.AzureEventHub.nuspec
@@ -14,7 +14,7 @@
     <dependencies>
       <dependency id="Serilog" version="[2.2.0,2.5.0]" />
       <dependency id="Serilog.Sinks.PeriodicBatching" version="[2,2.1.1]" />
-      <dependency id="Microsoft.Azure.EventHubs" version="4.*" />
+      <dependency id="Azure.Messaging.EventHubs" version="5.*" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Serilog.Sinks.AzureEventHub/Sinks/AzureEventHub/AzureEventHubBatchingSink.cs b/src/Serilog.Sinks.AzureEventHub/Sinks/AzureEventHub/AzureEventHubBatchingSink.cs
@@ -17,7 +17,8 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Azure.EventHubs;
+using Azure.Messaging.EventHubs;
+using Azure.Messaging.EventHubs.Producer;
 using Serilog.Events;
 using Serilog.Formatting;
 using Serilog.Sinks.PeriodicBatching;
@@ -29,7 +30,7 @@ namespace Serilog.Sinks.AzureEventHub
     /// </summary>
     public class AzureEventHubBatchingSink : PeriodicBatchingSink
     {
-        private readonly EventHubClient _eventHubClient;
+        private readonly EventHubProducerClient _eventHubClient;
         private readonly ITextFormatter _formatter;
 
         /// <summary>
@@ -40,7 +41,7 @@ public class AzureEventHubBatchingSink : PeriodicBatchingSink
         /// <param name="batchSizeLimit"></param>
         /// <param name="period"></param>
         public AzureEventHubBatchingSink(
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             ITextFormatter formatter,
             int batchSizeLimit,
             TimeSpan period)
@@ -83,7 +84,7 @@ protected override Task EmitBatchAsync(IEnumerable<LogEvent> events)
 
                 batchedEvents.Add(eventHubData);
             }
-            return _eventHubClient.SendAsync(batchedEvents, batchPartitionKey);
+            return _eventHubClient.SendAsync(batchedEvents, new SendEventOptions() { PartitionKey = batchPartitionKey });
         }
     }
 }
diff --git a/src/Serilog.Sinks.AzureEventHub/Sinks/AzureEventHub/AzureEventHubSink.cs b/src/Serilog.Sinks.AzureEventHub/Sinks/AzureEventHub/AzureEventHubSink.cs
@@ -13,9 +13,11 @@
 // limitations under the License.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Microsoft.Azure.EventHubs;
+using Azure.Messaging.EventHubs;
+using Azure.Messaging.EventHubs.Producer;
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
@@ -27,7 +29,7 @@ namespace Serilog.Sinks.AzureEventHub
     /// </summary>
     public class AzureEventHubSink : ILogEventSink
     {
-        readonly EventHubClient _eventHubClient;
+        readonly EventHubProducerClient _eventHubClient;
         readonly ITextFormatter _formatter;
 
         /// <summary>
@@ -36,7 +38,7 @@ public class AzureEventHubSink : ILogEventSink
         /// <param name="eventHubClient">The EventHubClient to use in this sink.</param>
         /// <param name="formatter">Provides formatting for outputting log data</param>
         public AzureEventHubSink(
-            EventHubClient eventHubClient,
+            EventHubProducerClient eventHubClient,
             ITextFormatter formatter)
         {
             _eventHubClient = eventHubClient;
@@ -61,7 +63,7 @@ public void Emit(LogEvent logEvent)
 
             //Unfortunately no support for async in Serilog yet
             //https://github.com/serilog/serilog/issues/134
-            _eventHubClient.SendAsync(eventHubData, Guid.NewGuid().ToString()).GetAwaiter().GetResult();
+            _eventHubClient.SendAsync(new List<EventData>() { eventHubData } , new SendEventOptions() { PartitionKey = Guid.NewGuid().ToString() }).GetAwaiter().GetResult();
         }
     }
 }