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

Modernize #92

Merged
merged 2 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions AkkaDotNet.LargeNetworkTests.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
10 changes: 5 additions & 5 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,13 @@
<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>

<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>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Petabridge.Cmd.Cluster.Sharding;
using Petabridge.Cmd.Host;
using Petabridge.Cmd.Remote;
using Phobos.Hosting;

namespace AkkaDotNet.Infrastructure.Configuration;

Expand Down Expand Up @@ -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()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
{
Expand All @@ -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)
Expand Down
Loading