Sharding example (#94)

* upgrading OTEL packages

* cleanup and updates

.nuke/build.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
   "$ref": "#/definitions/build",
+  "title": "Build Schema",
   "definitions": {
     "build": {
       "type": "object",
@@ -20,22 +20,22 @@
         },
         "CustomNuGetSource": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "DockerPassword": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "DockerRegistryUrl": {
           "type": "string"
         },
         "DockerUsername": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "GitHubToken": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "Help": {
           "type": "boolean",
@@ -48,6 +48,7 @@
             "AppVeyor",
             "AzurePipelines",
             "Bamboo",
+            "Bitbucket",
             "Bitrise",
             "GitHubActions",
             "GitLab",
@@ -67,7 +68,7 @@
         },
         "NugetKey": {
           "type": "string",
-          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
         "NugetPrerelease": {
           "type": "string"
@@ -179,4 +180,4 @@
       }
     }
   }
-}
+}

RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-## [0.6.4] / 14 December 2022
+## [0.6.7] / 14 December 2022
 - Bumped version
 
 ## [0.6.2] / 14 December 2022

k8s/local/environment/prometheus-service.yaml

@@ -31,7 +31,7 @@ spec:
       serviceAccountName: prometheus
       containers:
         - name: prometheus
-          image: prom/prometheus:latest
+          image: prom/prometheus:v2.36.0
           args:
             - "--config.file=/etc/prometheus/prometheus.yml"
             - "--storage.tsdb.path=/prometheus/"

k8s/local/services/local-services.yaml

@@ -79,7 +79,7 @@ spec:
         emptyDir: {}
       containers:
       - name: frontend
-        image: akkadotnet.frontend:0.6.4
+        image: akkadotnet.frontend:0.6.7
         env:
         - name: POD_NAME
           valueFrom:
@@ -208,7 +208,7 @@ spec:
         emptyDir: {}
       containers:
       - name: backend
-        image: akkadotnet.backend:0.6.4
+        image: akkadotnet.backend:0.6.7
         env:
         - name: POD_NAME
           valueFrom:

src/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Copyright>Copyright © 2024 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>0.6.4</VersionPrefix>
+    <VersionPrefix>0.6.7</VersionPrefix>
     <PackageReleaseNotes>• Bumped version</PackageReleaseNotes>
     <PackageIconUrl>
     </PackageIconUrl>
@@ -18,9 +18,8 @@
   <PropertyGroup>
     <NetCoreFramework>net6.0</NetCoreFramework>
     <AkkaVersion>1.5.18</AkkaVersion>
-    <PbmVersion>1.4.0</PbmVersion>
-    <AkkaHostingVersion>1.5.17.1</AkkaHostingVersion>
-    <AkkaManagementVersion>1.5.17.1</AkkaManagementVersion>
-    <OTelInstrumentationVersion>1.5.1-beta.1</OTelInstrumentationVersion>
+    <PbmVersion>1.4.1</PbmVersion>
+    <AkkaHostingVersion>1.5.18</AkkaHostingVersion>
+    <AkkaManagementVersion>1.5.18-beta1</AkkaManagementVersion>
   </PropertyGroup>
 </Project>

src/Directory.Packages.props

@@ -11,13 +11,13 @@
     <PackageVersion Include="Akka.Discovery" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Discovery.KubernetesApi" Version="$(AkkaManagementVersion)" />
     <PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.17.1" />
-    <PackageVersion Include="Akka.Logger.Serilog" Version="1.5.12" />
+    <PackageVersion Include="Akka.Logger.Serilog" Version="1.5.12.1" />
     <PackageVersion Include="Akka.Management" Version="$(AkkaManagementVersion)" />
     <PackageVersion Include="Akka.Persistence.Azure" Version="1.5.17.1" />
   </ItemGroup>
   <!-- Phobos -->
   <ItemGroup>
-    <PackageVersion Include="Phobos.Hosting" Version="2.5.0" />
+    <PackageVersion Include="Phobos.Hosting" Version="2.5.1" />
   </ItemGroup>
   <!-- Petabridge.Cmd -->
   <ItemGroup>
@@ -33,12 +33,12 @@
   </ItemGroup>
   <!-- OpenTelemetry -->
   <ItemGroup>
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.6.0-rc.1" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OTelInstrumentationVersion)" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OTelInstrumentationVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
   </ItemGroup>
   <!-- Ms.Ext.Hosting -->
   <ItemGroup>

src/backend/AkkaDotNet.BackEnd/Program.cs

@@ -38,17 +38,9 @@
                     Role = ActorSystemConstants.BackendRole,
                     StateStoreMode = akkaConfiguration.ShardingOptions.UseDData
                         ? StateStoreMode.DData
-                        : StateStoreMode.Persistence
+                        : StateStoreMode.Persistence,
+                    PassivateIdleEntityAfter = TimeSpan.FromMinutes(2)
                 })
-
-            // duplicate region for producing graphs
-            // .WithShardRegion<OtherRegionMarker>("other", s => ItemActor.PropsFor(s, akkaConfiguration.DistributedPubSubOptions.Enabled), new ItemShardExtractor(),
-            //     new ShardOptions()
-            //     {
-            //         RememberEntities = akkaConfiguration.ShardingOptions.RememberEntities,
-            //         Role = ActorSystemConstants.BackendRole,
-            //         StateStoreMode = akkaConfiguration.ShardingOptions.UseDData ? StateStoreMode.DData : StateStoreMode.Persistence
-            //     })
             .WithItemMessagingActor();
 
     }

src/backend/AkkaDotNet.BackEnd/appsettings.json

@@ -7,7 +7,7 @@
     "ShardingOptions": {
       "Enabled": true,
       "UseDData": true,
-      "RememberEntities": true
+      "RememberEntities": false
     },
     "AkkaClusterOptions": {
       "Hostname": "localhost",

src/frontend/AkkaDotNet.FrontEnd/Program.cs

@@ -1,11 +1,14 @@
 using Akka.Actor;
+using Akka.Cluster.Hosting;
 using Akka.Hosting;
 using AkkaDotNet.FrontEnd.Actors;
 using AkkaDotNet.Infrastructure;
 using AkkaDotNet.Infrastructure.Actors;
 using AkkaDotNet.Infrastructure.Configuration;
 using AkkaDotNet.Infrastructure.Logging;
 using AkkaDotNet.Infrastructure.OpenTelemetry;
+using AkkaDotNet.Infrastructure.Sharding;
+using AkkaDotNet.Messages;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -20,7 +23,9 @@
     configurationBuilder.WithStressCluster(akkaConfiguration,
         new[] { ActorSystemConstants.FrontendRole, ActorSystemConstants.DistributedPubSubRole });
     configurationBuilder.WithSerilog(akkaConfiguration.SerilogOptions);
-    configurationBuilder.WithReadyCheckActors();
+    configurationBuilder.WithReadyCheckActors()
+        .WithShardRegionProxy<IWithItem>("items", ActorSystemConstants.BackendRole, new ItemShardExtractor())
+        .WithItemMessagingActor();
     if (akkaConfiguration.DistributedPubSubOptions.Enabled)
     {
         configurationBuilder.StartActors((system, registry) =>

src/shared/AkkaDotNet.Infrastructure/Actors/ItemMessagingActor.cs

@@ -49,7 +49,7 @@ public ItemMessagingActor(IActorRef itemShardRegion)
 
     protected override void PreStart()
     {
-        Timers!.StartPeriodicTimer(ScheduleKey, WriteShard.Instance, TimeSpan.FromSeconds(1),TimeSpan.FromSeconds(1));
+        Timers!.StartPeriodicTimer(ScheduleKey, WriteShard.Instance, TimeSpan.FromSeconds(1),TimeSpan.FromSeconds(0.1));
     }
 
     public ITimerScheduler? Timers { get; set; }

src/shared/AkkaDotNet.Infrastructure/Sharding/ItemShardExtractor.cs

@@ -6,7 +6,7 @@ namespace AkkaDotNet.Infrastructure.Sharding;
 public class ItemShardExtractor : HashCodeMessageExtractor
 {
     // 200 nodes, 10 shards per node
-    public ItemShardExtractor() : base(30)
+    public ItemShardExtractor() : base(200)
     {
     }
 
@@ -16,12 +16,6 @@ public ItemShardExtractor() : base(30)
         {
             return itemId.ItemId;
         }
-
-        if(message is ShardRegion.StartEntity startEntity)
-        {
-            return startEntity.EntityId;
-        }
-
         return null;
     }
 }