cleanup and updates

Aaronontheweb · Aaronontheweb · commit 8957e951f6dc · 2024-03-22T10:32:55.000-05:00
diff --git a/RELEASE_NOTES.md b/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
diff --git a/k8s/local/services/local-services.yaml b/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:
diff --git a/src/Directory.Build.props b/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>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -17,7 +17,7 @@
   </ItemGroup>
   <!-- Phobos -->
   <ItemGroup>
-    <PackageVersion Include="Phobos.Hosting" Version="2.5.0" />
+    <PackageVersion Include="Phobos.Hosting" Version="2.5.1" />
   </ItemGroup>
   <!-- Petabridge.Cmd -->
   <ItemGroup>
@@ -37,8 +37,8 @@
     <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="$(OTelInstrumentationVersion)" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OTelInstrumentationVersion)" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
   </ItemGroup>
   <!-- Ms.Ext.Hosting -->
   <ItemGroup>
diff --git a/src/backend/AkkaDotNet.BackEnd/Program.cs b/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();
             
     }
diff --git a/src/backend/AkkaDotNet.BackEnd/appsettings.json b/src/backend/AkkaDotNet.BackEnd/appsettings.json
@@ -7,7 +7,7 @@
     "ShardingOptions": {
       "Enabled": true,
       "UseDData": true,
-      "RememberEntities": true
+      "RememberEntities": false
     },
     "AkkaClusterOptions": {
       "Hostname": "localhost",
diff --git a/src/frontend/AkkaDotNet.FrontEnd/Program.cs b/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) =>
diff --git a/src/shared/AkkaDotNet.Infrastructure/Actors/ItemMessagingActor.cs b/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; }
diff --git a/src/shared/AkkaDotNet.Infrastructure/Sharding/ItemShardExtractor.cs b/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)
     {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## [0.6.4] / 14 December 2022`
	`1`	`+## [0.6.7] / 14 December 2022`
`2`	`2`	`- Bumped version`
`3`	`3`
`4`	`4`	`## [0.6.2] / 14 December 2022`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public ItemMessagingActor(IActorRef itemShardRegion)`
`49`	`49`
`50`	`50`	`protected override void PreStart()`
`51`	`51`	`{`
`52`		`- Timers!.StartPeriodicTimer(ScheduleKey, WriteShard.Instance, TimeSpan.FromSeconds(1),TimeSpan.FromSeconds(1));`
	`52`	`+ Timers!.StartPeriodicTimer(ScheduleKey, WriteShard.Instance, TimeSpan.FromSeconds(1),TimeSpan.FromSeconds(0.1));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public ITimerScheduler? Timers { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace AkkaDotNet.Infrastructure.Sharding;`
`6`	`6`	`public class ItemShardExtractor : HashCodeMessageExtractor`
`7`	`7`	`{`
`8`	`8`	`// 200 nodes, 10 shards per node`
`9`		`- public ItemShardExtractor() : base(30)`
	`9`	`+ public ItemShardExtractor() : base(200)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`