From 7b5cb0267b19e5bcdadb0a386af103e4a0b25b61 Mon Sep 17 00:00:00 2001
From: henrik <lasssenn@gmail.com>
Date: Mon, 23 Dec 2024 01:06:30 +0100
Subject: [PATCH] feat: Adds APM to Silo & readded gitversion

---
 .idea/.idea.Pushy/.idea/vcs.xml        | 6 ++++++
 Pushy.Silo/Program.cs                  | 2 ++
 Pushy.Silo/Pushy.Silo.csproj           | 7 +++++++
 Pushy.Silo/appsettings.json            | 3 +++
 Pushy/Pushy.Client/Pushy.Client.csproj | 2 +-
 Pushy/Pushy/Program.cs                 | 2 +-
 Pushy/Pushy/Pushy.csproj               | 6 +++++-
 7 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/.idea/.idea.Pushy/.idea/vcs.xml b/.idea/.idea.Pushy/.idea/vcs.xml
index 94a25f7..4c6280e 100644
--- a/.idea/.idea.Pushy/.idea/vcs.xml
+++ b/.idea/.idea.Pushy/.idea/vcs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
diff --git a/Pushy.Silo/Program.cs b/Pushy.Silo/Program.cs
index b46f95f..bae36e3 100644
--- a/Pushy.Silo/Program.cs
+++ b/Pushy.Silo/Program.cs
@@ -22,5 +22,7 @@ builder.UseOrleans(silo =>
     });
 });
 
+builder.Services.AddAllElasticApm();
+
 var host = builder.Build();
 host.Run();
\ No newline at end of file
diff --git a/Pushy.Silo/Pushy.Silo.csproj b/Pushy.Silo/Pushy.Silo.csproj
index 2f8f33a..aa5f099 100644
--- a/Pushy.Silo/Pushy.Silo.csproj
+++ b/Pushy.Silo/Pushy.Silo.csproj
@@ -6,9 +6,16 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758</UserSecretsId>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+        <Title>Pushy Silo</Title>
+        <Authors>Henrik Lassen</Authors>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
+        <PackageReference Include="GitVersion.MsBuild" Version="6.1.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
         <PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
         <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
diff --git a/Pushy.Silo/appsettings.json b/Pushy.Silo/appsettings.json
index b2dcdb6..d7be3a4 100644
--- a/Pushy.Silo/appsettings.json
+++ b/Pushy.Silo/appsettings.json
@@ -4,5 +4,8 @@
       "Default": "Information",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "ElasticApm": {
+    "ServerUrl":  "http://apm.home.local:8200"
   }
 }
diff --git a/Pushy/Pushy.Client/Pushy.Client.csproj b/Pushy/Pushy.Client/Pushy.Client.csproj
index 2470933..f3eba12 100644
--- a/Pushy/Pushy.Client/Pushy.Client.csproj
+++ b/Pushy/Pushy.Client/Pushy.Client.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-        <PackageReference Include="UnitsNet" Version="5.60.0" />
+        <PackageReference Include="UnitsNet" Version="5.61.0" />
     </ItemGroup>
 
 </Project>
diff --git a/Pushy/Pushy/Program.cs b/Pushy/Pushy/Program.cs
index 84b8c3e..18974c3 100644
--- a/Pushy/Pushy/Program.cs
+++ b/Pushy/Pushy/Program.cs
@@ -51,11 +51,11 @@ if (builder.Environment.IsProduction())
         opt.Transport = new DistributedTransport(transport);
     });   
 }
+builder.Services.AddAllElasticApm();
 
 builder.Services.AddScoped(service => 
         service.GetRequiredService<IClusterClient>().GetGrain<ILinkGenerator>(Guid.Empty)
     );
-builder.Services.AddAllElasticApm();
 
 builder.Services.AddHealthChecks();
 builder.Services.AddCors(policy =>
diff --git a/Pushy/Pushy/Pushy.csproj b/Pushy/Pushy/Pushy.csproj
index b383ec2..5a06ffe 100644
--- a/Pushy/Pushy/Pushy.csproj
+++ b/Pushy/Pushy/Pushy.csproj
@@ -16,13 +16,17 @@
     <ItemGroup>
         <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
         <PackageReference Include="Elastic.Extensions.Logging" Version="8.12.3" />
+        <PackageReference Include="GitVersion.MsBuild" Version="6.1.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
         <PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
         <PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
         <PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="9.0.1" />
         <PackageReference Include="System.Text.Json" Version="9.0.0" />
-        <PackageReference Include="UnitsNet" Version="5.60.0" />
+        <PackageReference Include="UnitsNet" Version="5.61.0" />
         <ProjectReference Include="..\..\Pushy.Domain\Pushy.Domain.csproj" />
         <ProjectReference Include="..\Pushy.Client\Pushy.Client.csproj"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />