8.0.0-rc1

Surveily · Dec 18, 2023 · 208c4b3 · 208c4b3
1 parent 77cc531
commit 208c4b3
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 39 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.5"
 services:
   vscode:
     container_name: orleans.streaming.grains
-    image: mcr.microsoft.com/vscode/devcontainers/dotnet:dev-7.0
+    image: mcr.microsoft.com/vscode/devcontainers/dotnet:8.0
     volumes:
       - ../:/workspace:delegated
       - ~/.ssh:/home/vscode/.ssh-localhost:ro

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -49,7 +49,7 @@ jobs:
           push: false
           build-args: |
             password=${{ secrets.NUGET }}
-            version=7.2.${{ github.run_number }}
+            version=8.0.${{ github.run_number }}-rc1
           tags: |
             surveily/orleans.streaming.grains:${{ steps.date.outputs.date }}.${{ github.run_number }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "release",
-            "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Release/net7.0/Orleans.Streaming.Grains.Performance.dll",
+            "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Release/net8.0/Orleans.Streaming.Grains.Performance.dll",
             "args": [
                 "--filter",
                 "*Channel*",
@@ -22,7 +22,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Debug/net7.0/Orleans.Streaming.Grains.Performance.dll",
+            "program": "${workspaceFolder}/src/Orleans.Streaming.Grains.Performance/bin/Debug/net8.0/Orleans.Streaming.Grains.Performance.dll",
             "args": [
                 "--filter",
                 "*Channel*",

diff --git a/src/Orleans.Streaming.Grains.Performance/Orleans.Streaming.Grains.Performance.csproj b/src/Orleans.Streaming.Grains.Performance/Orleans.Streaming.Grains.Performance.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
@@ -24,8 +24,9 @@
     <ProjectReference Include="..\Orleans.Streaming.Grains.Tests\Orleans.Streaming.Grains.Tests.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-2.final" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-    <PackageReference Include="Microsoft.Orleans.BroadcastChannel" Version="7.2.3" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+    <PackageReference Include="Microsoft.Orleans.BroadcastChannel" Version="8.0.0-rc1" />
   </ItemGroup>
 </Project>
diff --git a/src/Orleans.Streaming.Grains.Tests/Orleans.Streaming.Grains.Tests.csproj b/src/Orleans.Streaming.Grains.Tests/Orleans.Streaming.Grains.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <PropertyGroup>
@@ -10,22 +10,22 @@
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="Polly" Version="7.2.4" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Polly" Version="8.2.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.16.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Should-DotNetStandard" Version="1.0.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.2.3" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.2.3" />
-    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="7.2.3" />
-    <PackageReference Include="Microsoft.Orleans.BroadcastChannel" Version="7.2.3" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="8.0.0-rc1" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0-rc1" />
+    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="8.0.0-rc1" />
+    <PackageReference Include="Microsoft.Orleans.BroadcastChannel" Version="8.0.0-rc1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orleans.Streaming.Grains\Orleans.Streaming.Grains.csproj" />

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/BlobReceiverGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/BlobReceiverGrain.cs
@@ -3,6 +3,7 @@
 // </copyright>
 
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
 using Orleans.BroadcastChannel;
 using Orleans.Providers;
 using Orleans.Runtime;
@@ -30,7 +31,7 @@ public BlobReceiverGrain(IProcessor processor)
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/CompoundReceiverGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/CompoundReceiverGrain.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Orleans.BroadcastChannel;
 using Orleans.Concurrency;
 using Orleans.Providers;
@@ -28,8 +29,8 @@ public class CompoundReceiverGrain : Grain, ICompoundReceiverGrain, IOnBroadcast
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
-            var broadcastProvider = ServiceProvider.GetServiceByName<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var broadcastProvider = ServiceProvider.GetKeyedService<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/EmitterGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/EmitterGrain.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Surveily Sp. z o.o.. All rights reserved.
 // </copyright>
 
+using Microsoft.Extensions.DependencyInjection;
 using Orleans.BroadcastChannel;
 using Orleans.Concurrency;
 using Orleans.Providers;
@@ -27,8 +28,8 @@ public class EmitterGrain : Grain, IEmitterGrain
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
-            var broadcastProvider = ServiceProvider.GetServiceByName<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var broadcastProvider = ServiceProvider.GetKeyedService<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/ExplosiveReceiverGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/ExplosiveReceiverGrain.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Orleans.BroadcastChannel;
 using Orleans.Concurrency;
 using Orleans.Providers;
@@ -26,8 +27,8 @@ public class ExplosiveReceiverGrain : Grain, IExplosiveReceiverGrain, IOnBroadca
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
-            var broadcastProvider = ServiceProvider.GetServiceByName<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var broadcastProvider = ServiceProvider.GetKeyedService<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {
@@ -78,7 +79,7 @@ public class ExplosiveSecondReceiverGrain : Grain, IExplosiveReceiverGrain, IOnB
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {
@@ -116,8 +117,8 @@ public class ExplosiveNextFirstReceiverGrain : Grain, IExplosiveReceiverGrain, I
 
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
-            var broadcastProvider = ServiceProvider.GetServiceByName<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var broadcastProvider = ServiceProvider.GetKeyedService<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {
@@ -194,8 +195,8 @@ public class ExplosiveNextSecondReceiverGrain : Grain, IExplosiveReceiverGrain,
 
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
-            var broadcastProvider = ServiceProvider.GetServiceByName<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var broadcastProvider = ServiceProvider.GetKeyedService<IBroadcastChannelProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {

diff --git a/src/Orleans.Streaming.Grains.Tests/Streams/Grains/SimpleReceiverGrain.cs b/src/Orleans.Streaming.Grains.Tests/Streams/Grains/SimpleReceiverGrain.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Surveily Sp. z o.o.. All rights reserved.
 // </copyright>
 
+using Microsoft.Extensions.DependencyInjection;
 using Orleans.BroadcastChannel;
 using Orleans.Providers;
 using Orleans.Runtime;
@@ -29,7 +30,7 @@ public SimpleReceiverGrain(IProcessor processor)
         public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var id = this.GetPrimaryKey();
-            var streamProvider = ServiceProvider.GetServiceByName<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
+            var streamProvider = ServiceProvider.GetKeyedService<IStreamProvider>(ProviderConstants.DEFAULT_STORAGE_PROVIDER_NAME);
 
             if (streamProvider != null)
             {

diff --git a/src/Orleans.Streaming.Grains/Extensions/ISiloBuilderExtensions.cs b/src/Orleans.Streaming.Grains/Extensions/ISiloBuilderExtensions.cs
@@ -79,8 +79,8 @@ private static ISiloBuilder AddGrainsStreams(this ISiloBuilder builder, string n
 
                               if (!fireAndForgetDelivery)
                               {
-                                  services.AddSingletonNamedService<IStreamQueueBalancer>(name, (f, n) => new GrainsQueueBalancer());
-                                  services.AddSingletonNamedService<IStreamQueueMapper>(name, (f, n) => new GrainsQueueMapper(queueCount));
+                                  services.AddKeyedSingleton<IStreamQueueBalancer>(name, (f, n) => new GrainsQueueBalancer());
+                                  services.AddKeyedSingleton<IStreamQueueMapper>(name, (f, n) => new GrainsQueueMapper(queueCount));
                               }
                           })
                           .Configure<GrainsOptions>(options =>

diff --git a/src/Orleans.Streaming.Grains/Orleans.Streaming.Grains.csproj b/src/Orleans.Streaming.Grains/Orleans.Streaming.Grains.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -31,8 +31,8 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="7.2.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="7.2.3" PrivateAssets="all"  />
-    <PackageReference Include="Microsoft.Orleans.Streaming" Version="7.2.3" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="8.0.0-rc1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="8.0.0-rc1" PrivateAssets="all"  />
+    <PackageReference Include="Microsoft.Orleans.Streaming" Version="8.0.0-rc1" />
   </ItemGroup>
 </Project>
diff --git a/src/Orleans.Streaming.Grains/Streams/GrainsQueueAdapterFactory.cs b/src/Orleans.Streaming.Grains/Streams/GrainsQueueAdapterFactory.cs
@@ -49,7 +49,7 @@ public GrainsQueueAdapterFactory(string name,
         public static GrainsQueueAdapterFactory Create(IServiceProvider services, string name)
         {
             var grainsOptions = services.GetOptionsByName<GrainsOptions>(name);
-            var queueMapper = services.GetServiceByName<IStreamQueueMapper>(name);
+            var queueMapper = services.GetKeyedService<IStreamQueueMapper>(name);
             var cacheOptions = services.GetOptionsByName<SimpleQueueCacheOptions>(name);
             var queueOptions = services.GetOptionsByName<HashRingStreamQueueMapperOptions>(name);
 

diff --git a/src/benchmark.dockerfile b/src/benchmark.dockerfile
@@ -11,4 +11,4 @@ ADD src/ .
 
 # Build and test
 RUN dotnet build . -c Release
-RUN dotnet Orleans.Streaming.Grains.Performance/bin/Release/net7.0/Orleans.Streaming.Grains.Performance.dll -m -t --filter "*Test*"
+RUN dotnet Orleans.Streaming.Grains.Performance/bin/Release/net8.0/Orleans.Streaming.Grains.Performance.dll -m -t --filter "*Test*"