From 60a84779e60a0b866b9f39ddef411bced0847f32 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Wed, 13 Mar 2024 08:18:27 -0500
Subject: [PATCH] Modernize (#92)

* re-enabled Phobos

* moved onto latest versions of all packages
---
 AkkaDotNet.LargeNetworkTests.sln                     |  6 ++++++
 src/Directory.Build.props                            | 12 ++++++------
 src/Directory.Packages.props                         | 10 +++++-----
 .../AkkaDotNet.Infrastructure.csproj                 |  7 +------
 .../Configuration/StressHostingExtensions.cs         |  9 +++++----
 .../OpenTelemetryConfigurationExtensions.cs          |  4 ++--
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/AkkaDotNet.LargeNetworkTests.sln b/AkkaDotNet.LargeNetworkTests.sln
index 13e20af..18d63d4 100644
--- a/AkkaDotNet.LargeNetworkTests.sln
+++ b/AkkaDotNet.LargeNetworkTests.sln
@@ -27,6 +27,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{BE2E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkkaDotNet.Messages", "src\shared\AkkaDotNet.Messages\AkkaDotNet.Messages.csproj", "{8F96042B-A435-4789-A92A-67B9C433E293}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{A0685D0A-4F42-433E-8727-101007B3DF9D}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 084afdc..a147004 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Copyright>Copyright © 2022 Petabridge</Copyright>
+    <Copyright>Copyright © 2024 Petabridge</Copyright>
     <Authors>Petabridge</Authors>
     <VersionPrefix>0.6.4</VersionPrefix>
     <PackageReleaseNotes>• Bumped version</PackageReleaseNotes>
@@ -17,10 +17,10 @@
 	</ItemGroup>
   <PropertyGroup>
     <NetCoreFramework>net6.0</NetCoreFramework>
-    <AkkaVersion>1.5.12</AkkaVersion>
-    <PbmVersion>1.3.2</PbmVersion>
-    <AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
-    <AkkaManagementVersion>1.5.7</AkkaManagementVersion>
-    <OTelInstrumentationVersion>1.5.1-beta.1</OTelInstrumentationVersion>
+    <AkkaVersion>1.5.18</AkkaVersion>
+    <PbmVersion>1.4.0</PbmVersion>
+    <AkkaHostingVersion>1.5.17.1</AkkaHostingVersion>
+    <AkkaManagementVersion>1.5.17.1</AkkaManagementVersion>
+    <OTelInstrumentationVersion>1.7.1</OTelInstrumentationVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 1369697..abad29e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -10,14 +10,14 @@
     <PackageVersion Include="Akka.Coordination.KubernetesApi" Version="$(AkkaManagementVersion)" />
     <PackageVersion Include="Akka.Discovery" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Discovery.KubernetesApi" Version="$(AkkaManagementVersion)" />
-    <PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.9" />
+    <PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.17.1" />
     <PackageVersion Include="Akka.Logger.Serilog" Version="1.5.12" />
     <PackageVersion Include="Akka.Management" Version="$(AkkaManagementVersion)" />
-    <PackageVersion Include="Akka.Persistence.Azure" Version="1.5.1" />
+    <PackageVersion Include="Akka.Persistence.Azure" Version="1.5.17.1" />
   </ItemGroup>
   <!-- Phobos -->
   <ItemGroup>
-    <PackageVersion Include="Phobos.Hosting" Version="2.4.1" />
+    <PackageVersion Include="Phobos.Hosting" Version="2.5.0" />
   </ItemGroup>
   <!-- Petabridge.Cmd -->
   <ItemGroup>
@@ -49,7 +49,7 @@
     <PackageVersion Include="Akka.TestKit.XUnit2" Version="$(AkkaVersion)" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageVersion Include="xunit" Version="2.5.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj b/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj
index 9bd9c1f..430c27a 100644
--- a/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj
+++ b/src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj
@@ -30,7 +30,7 @@
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
         
-        <!--<PackageReference Include="Phobos.Hosting" />-->
+        <PackageReference Include="Phobos.Hosting" />
 
         <PackageReference Include="Microsoft.Extensions.Hosting" />
     </ItemGroup>
@@ -38,10 +38,5 @@
     <ItemGroup>
       <ProjectReference Include="..\AkkaDotNet.Messages\AkkaDotNet.Messages.csproj" />
     </ItemGroup>
-    
-    <ItemGroup>
-      <PackageVersion Update="Akka.Discovery" Version="1.5.12" />
-      <PackageVersion Update="OpenTelemetry.Exporter.Console" Version="1.6.0" />
-    </ItemGroup>
 
 </Project>
diff --git a/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs b/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs
index cf51c8b..00b376e 100644
--- a/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs
+++ b/src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs
@@ -15,6 +15,7 @@
 using Petabridge.Cmd.Cluster.Sharding;
 using Petabridge.Cmd.Host;
 using Petabridge.Cmd.Remote;
+using Phobos.Hosting;
 
 namespace AkkaDotNet.Infrastructure.Configuration;
 
@@ -174,10 +175,10 @@ public static AkkaConfigurationBuilder WithStressCluster(this AkkaConfigurationB
             .WithRemoting("0.0.0.0", options.AkkaClusterOptions.Port, options.AkkaClusterOptions.Hostname)
             .WithClustering(clusterOptions)
             .AddPersistence(options.PersistenceOptions)
-            // .WithPhobos(AkkaRunMode.AkkaCluster, _ =>
-            // {
-            //     
-            // })
+            .WithPhobos(AkkaRunMode.AkkaCluster, _ =>
+            {
+                
+            })
             .StartActors((system, _) =>
             {
                 system.ActorOf(Props.Create(() => new DispatcherConfigLogger()));
diff --git a/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs b/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs
index 4435eb3..9499a84 100644
--- a/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs
+++ b/src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs
@@ -39,7 +39,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi
                 
                 builder
                     .SetResourceBuilder(resource)
-                    //.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
+                    .AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
                     .AddHttpClientInstrumentation()
                     .AddAspNetCoreInstrumentation(options =>
                     {
@@ -61,7 +61,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi
                 builder
                     .SetResourceBuilder(ResourceBuilder.CreateDefault()
                         .AddService(Assembly.GetEntryAssembly()?.GetName().Name ?? "OpenTelemetryMetrics", serviceInstanceId: $"{Dns.GetHostName()}"))
-                    //.AddPhobosInstrumentation()
+                    .AddPhobosInstrumentation()
                     .AddHttpClientInstrumentation()
                     .AddAspNetCoreInstrumentation()
                     .AddMeter(AkkaStressSource)