Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Commit 60a8477

Browse files
AarononthewebAaronontheweb
authored
Modernize (#92)
* re-enabled Phobos * moved onto latest versions of all packages
1 parent 62e5a30 commit 60a8477

6 files changed

+25
-23
lines changed

‎AkkaDotNet.LargeNetworkTests.sln

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "backend", "backend", "{BE2E
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkkaDotNet.Messages", "src\shared\AkkaDotNet.Messages\AkkaDotNet.Messages.csproj", "{8F96042B-A435-4789-A92A-67B9C433E293}"
2929
EndProject
30+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{A0685D0A-4F42-433E-8727-101007B3DF9D}"
31+
ProjectSection(SolutionItems) = preProject
32+
src\Directory.Build.props = src\Directory.Build.props
33+
src\Directory.Packages.props = src\Directory.Packages.props
34+
EndProjectSection
35+
EndProject
3036
Global
3137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3238
Debug|Any CPU = Debug|Any CPU

‎src/Directory.Build.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Copyright>Copyright © 2022 Petabridge</Copyright>
3+
<Copyright>Copyright © 2024 Petabridge</Copyright>
44
<Authors>Petabridge</Authors>
55
<VersionPrefix>0.6.4</VersionPrefix>
66
<PackageReleaseNotes>• Bumped version</PackageReleaseNotes>
@@ -17,10 +17,10 @@
1717
</ItemGroup>
1818
<PropertyGroup>
1919
<NetCoreFramework>net6.0</NetCoreFramework>
20-
<AkkaVersion>1.5.12</AkkaVersion>
21-
<PbmVersion>1.3.2</PbmVersion>
22-
<AkkaHostingVersion>1.5.12.1</AkkaHostingVersion>
23-
<AkkaManagementVersion>1.5.7</AkkaManagementVersion>
24-
<OTelInstrumentationVersion>1.5.1-beta.1</OTelInstrumentationVersion>
20+
<AkkaVersion>1.5.18</AkkaVersion>
21+
<PbmVersion>1.4.0</PbmVersion>
22+
<AkkaHostingVersion>1.5.17.1</AkkaHostingVersion>
23+
<AkkaManagementVersion>1.5.17.1</AkkaManagementVersion>
24+
<OTelInstrumentationVersion>1.7.1</OTelInstrumentationVersion>
2525
</PropertyGroup>
2626
</Project>

‎src/Directory.Packages.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<PackageVersion Include="Akka.Coordination.KubernetesApi" Version="$(AkkaManagementVersion)" />
1111
<PackageVersion Include="Akka.Discovery" Version="$(AkkaVersion)" />
1212
<PackageVersion Include="Akka.Discovery.KubernetesApi" Version="$(AkkaManagementVersion)" />
13-
<PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.9" />
13+
<PackageVersion Include="Akka.HealthCheck.Hosting.Web" Version="1.5.17.1" />
1414
<PackageVersion Include="Akka.Logger.Serilog" Version="1.5.12" />
1515
<PackageVersion Include="Akka.Management" Version="$(AkkaManagementVersion)" />
16-
<PackageVersion Include="Akka.Persistence.Azure" Version="1.5.1" />
16+
<PackageVersion Include="Akka.Persistence.Azure" Version="1.5.17.1" />
1717
</ItemGroup>
1818
<!-- Phobos -->
1919
<ItemGroup>
20-
<PackageVersion Include="Phobos.Hosting" Version="2.4.1" />
20+
<PackageVersion Include="Phobos.Hosting" Version="2.5.0" />
2121
</ItemGroup>
2222
<!-- Petabridge.Cmd -->
2323
<ItemGroup>
@@ -49,7 +49,7 @@
4949
<PackageVersion Include="Akka.TestKit.XUnit2" Version="$(AkkaVersion)" />
5050
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
5151
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
52-
<PackageVersion Include="xunit" Version="2.5.0" />
53-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
52+
<PackageVersion Include="xunit" Version="2.7.0" />
53+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
5454
</ItemGroup>
5555
</Project>

‎src/shared/AkkaDotNet.Infrastructure/AkkaDotNet.Infrastructure.csproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,13 @@
3030
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
3131
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
3232

33-
<!--<PackageReference Include="Phobos.Hosting" />-->
33+
<PackageReference Include="Phobos.Hosting" />
3434

3535
<PackageReference Include="Microsoft.Extensions.Hosting" />
3636
</ItemGroup>
3737

3838
<ItemGroup>
3939
<ProjectReference Include="..\AkkaDotNet.Messages\AkkaDotNet.Messages.csproj" />
4040
</ItemGroup>
41-
42-
<ItemGroup>
43-
<PackageVersion Update="Akka.Discovery" Version="1.5.12" />
44-
<PackageVersion Update="OpenTelemetry.Exporter.Console" Version="1.6.0" />
45-
</ItemGroup>
4641

4742
</Project>

‎src/shared/AkkaDotNet.Infrastructure/Configuration/StressHostingExtensions.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Petabridge.Cmd.Cluster.Sharding;
1616
using Petabridge.Cmd.Host;
1717
using Petabridge.Cmd.Remote;
18+
using Phobos.Hosting;
1819

1920
namespace AkkaDotNet.Infrastructure.Configuration;
2021

@@ -174,10 +175,10 @@ public static AkkaConfigurationBuilder WithStressCluster(this AkkaConfigurationB
174175
.WithRemoting("0.0.0.0", options.AkkaClusterOptions.Port, options.AkkaClusterOptions.Hostname)
175176
.WithClustering(clusterOptions)
176177
.AddPersistence(options.PersistenceOptions)
177-
// .WithPhobos(AkkaRunMode.AkkaCluster, _ =>
178-
// {
179-
//
180-
// })
178+
.WithPhobos(AkkaRunMode.AkkaCluster, _ =>
179+
{
180+
181+
})
181182
.StartActors((system, _) =>
182183
{
183184
system.ActorOf(Props.Create(() => new DispatcherConfigLogger()));

‎src/shared/AkkaDotNet.Infrastructure/OpenTelemetry/OpenTelemetryConfigurationExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi
3939

4040
builder
4141
.SetResourceBuilder(resource)
42-
//.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
42+
.AddPhobosInstrumentation(compressShardTraces:true) // eliminate sharding infrastructure from traces
4343
.AddHttpClientInstrumentation()
4444
.AddAspNetCoreInstrumentation(options =>
4545
{
@@ -61,7 +61,7 @@ public static IServiceCollection WithOpenTelemetry(this IServiceCollection servi
6161
builder
6262
.SetResourceBuilder(ResourceBuilder.CreateDefault()
6363
.AddService(Assembly.GetEntryAssembly()?.GetName().Name ?? "OpenTelemetryMetrics", serviceInstanceId: $"{Dns.GetHostName()}"))
64-
//.AddPhobosInstrumentation()
64+
.AddPhobosInstrumentation()
6565
.AddHttpClientInstrumentation()
6666
.AddAspNetCoreInstrumentation()
6767
.AddMeter(AkkaStressSource)

0 commit comments

Comments
 (0)