feat(*): upgrade dotnet 8 + orleans 3.7.1 (#56)

jonathansant · Jan 30, 2024 · 81d55f3 · 81d55f3
1 parent 0957864
commit 81d55f3
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 54 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,15 +21,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <!-- Shared Package Versions -->
   <PropertyGroup>
-    <OrleansVersion>3.6.0</OrleansVersion>
+    <OrleansVersion>3.7.1</OrleansVersion>
     <StreamUtilsVersion>11.1.0</StreamUtilsVersion>
     <ConfluentKafkaVersion>2.1.0</ConfluentKafkaVersion>
     <ConfluentAvroVersion>1.7.7.7</ConfluentAvroVersion>
-    <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsVersion>8.0.*</MicrosoftExtensionsVersion>
   </PropertyGroup>
 </Project>
diff --git a/Orleans.Streams.Kafka.E2E/Orleans.Streams.Kafka.E2E.csproj b/Orleans.Streams.Kafka.E2E/Orleans.Streams.Kafka.E2E.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>10</LangVersion>
   </PropertyGroup>

diff --git a/Orleans.Streams.Kafka/Consumer/ConsumeResultExtensions.cs b/Orleans.Streams.Kafka/Consumer/ConsumeResultExtensions.cs
@@ -24,7 +24,7 @@ QueueProperties queueProperties
 
 				var message = serializationContext
 					.ExternalStreamDeserializer
-					.Deserialize(queueProperties, queueProperties.ExternalContractType, result);
+					.Deserialize(queueProperties, queueProperties.ExternalContractType, result.Message.Value);
 
 				return new KafkaBatchContainer(
 					StreamProviderUtils.GenerateStreamGuid(key),

diff --git a/Orleans.Streams.Kafka/Core/KafkaAdapterFactory.cs b/Orleans.Streams.Kafka/Core/KafkaAdapterFactory.cs
@@ -17,8 +17,6 @@
 
 namespace Orleans.Streams.Kafka.Core
 {
-	using System.Globalization;
-
 	public class KafkaAdapterFactory : IQueueAdapterFactory
 	{
 		private readonly string _name;
@@ -34,29 +32,14 @@ public class KafkaAdapterFactory : IQueueAdapterFactory
 		private readonly AdminClientBuilder _adminConfig;
 		private readonly AdminClientConfig _config;
 
-		public KafkaAdapterFactory(
-			string name,
-			KafkaStreamOptions options,
-			SimpleQueueCacheOptions cacheOptions,
-			SerializationManager serializationManager,
-			ILoggerFactory loggerFactory,
-			IGrainFactory grainFactory
-		) : this(name, options, cacheOptions, serializationManager, loggerFactory, grainFactory, null)
-		{
-			if (options.Topics.Any(topic => topic.IsExternal))
-				throw new InvalidOperationException(
-				"Cannot have external topic with no 'IExternalDeserializer' defined. Use 'AddJson' or 'AddAvro'"
-			);
-		}
-
 		public KafkaAdapterFactory(
 			string name,
 			KafkaStreamOptions options,
 			SimpleQueueCacheOptions cacheOptions,
 			SerializationManager serializationManager,
 			ILoggerFactory loggerFactory,
 			IGrainFactory grainFactory,
-			IExternalStreamDeserializer externalDeserializer
+			IServiceProvider services
 		)
 		{
 			_options = options ?? throw new ArgumentNullException(nameof(options));
@@ -65,7 +48,7 @@ IExternalStreamDeserializer externalDeserializer
 			_serializationManager = serializationManager;
 			_loggerFactory = loggerFactory;
 			_grainFactory = grainFactory;
-			_externalDeserializer = externalDeserializer;
+			_externalDeserializer = services.GetServiceByName<IExternalStreamDeserializer>(name);
 			_logger = loggerFactory.CreateLogger<KafkaAdapterFactory>();
 			_adminConfig = new AdminClientBuilder(options.ToAdminProperties());
 
@@ -108,23 +91,19 @@ public static KafkaAdapterFactory Create(IServiceProvider services, string name)
 		{
 			var streamsConfig = services.GetOptionsByName<KafkaStreamOptions>(name);
 			var cacheOptions = services.GetOptionsByName<SimpleQueueCacheOptions>(name);
-			var deserializer = services.GetServiceByName<IExternalStreamDeserializer>(name);
+			var serializer = services.GetRequiredService<SerializationManager>();
+			var logger = services.GetRequiredService<ILoggerFactory>();
+			var grainFactory = services.GetRequiredService<IGrainFactory>();
 
-			KafkaAdapterFactory factory;
-			if (deserializer != null)
-				factory = ActivatorUtilities.CreateInstance<KafkaAdapterFactory>(
+			var factory = ActivatorUtilities.CreateInstance<KafkaAdapterFactory>(
 					services,
 					name,
 					streamsConfig,
 					cacheOptions,
-					deserializer
-				);
-			else
-				factory = ActivatorUtilities.CreateInstance<KafkaAdapterFactory>(
-					services,
-					name,
-					streamsConfig,
-					cacheOptions
+					serializer,
+					logger,
+					grainFactory,
+					services
 				);
 
 			return factory;
@@ -139,7 +118,7 @@ private IEnumerable<QueueProperties> GetQueuesProperties()
 				var currentMetaTopics = meta.Topics.ToList();
 
 				var props = new List<QueueProperties>();
-				var autoProps = new List<(QueueProperties props, short replicationFactor, ulong? retentionPeriodInMs )>();
+				var autoProps = new List<(QueueProperties props, short replicationFactor, ulong? retentionPeriodInMs)>();
 
 				foreach (var topic in _options.Topics)
 				{
@@ -195,21 +174,21 @@ private static Task CreateAutoTopics(IAdminClient admin, IEnumerable<(QueuePrope
 							var tuple = queues.First();
 
 							var topicSpecification = new TopicSpecification
-							                         {
-								                         Name = queues.Key,
-								                         NumPartitions = queues.Count(),
-								                         ReplicationFactor = tuple.replicationFactor
-							                         };
+							{
+								Name = queues.Key,
+								NumPartitions = queues.Count(),
+								ReplicationFactor = tuple.replicationFactor
+							};
 
 							if (tuple.retentionPeriodInMs.HasValue)
 							{
 								topicSpecification.Configs = new Dictionary<string, string>()
-								                             {
-									                             {
-										                             "retention.ms",
-										                             tuple.retentionPeriodInMs.ToString()
-									                             }
-								                             };
+															 {
+																 {
+																	 "retention.ms",
+																	 tuple.retentionPeriodInMs.ToString()
+																 }
+															 };
 							}
 
 							result.Add(topicSpecification);

diff --git a/Orleans.Streams.Kafka/Orleans.Streams.Kafka.csproj b/Orleans.Streams.Kafka/Orleans.Streams.Kafka.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Description>Orleans streaming provider for Kafka.</Description>
     <PackageTags>orleans kafka streams providers streamprovider confluent</PackageTags>
     <LangVersion>10</LangVersion>

diff --git a/Samples/ConfluentSample/ConfluentSample.csproj b/Samples/ConfluentSample/ConfluentSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Samples/TestClient/TestClient.csproj b/Samples/TestClient/TestClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Samples/TestGrains/TestGrains.csproj b/Samples/TestGrains/TestGrains.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/Samples/TestSilo/TestSilo.csproj b/Samples/TestSilo/TestSilo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orleans.streams.kafka",
-  "version": "6.2.1",
+  "version": "6.3.0",
   "description": "Orleans Kafka Stream Provider",
   "solution": "Orleans.Streams.Kafka-build.sln",
   "dependencies": {},