Merge pull request #165 from nenoNaninu/instrumentation

add Hub instrumentation
nenoNaninu · Jan 22, 2024 · 8a270ad · 8a270ad
2 parents 5b541d5 + b8be865
commit 8a270ad
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,6 +5,7 @@
         <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
     <ItemGroup>
+        <PackageVersion Include="AspNetCore.SignalR.OpenTelemetry" Version="0.1.4" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
         <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.4.0" />

diff --git a/samples/SampleServer/Program.cs b/samples/SampleServer/Program.cs
@@ -1,3 +1,4 @@
+using AspNetCore.SignalR.OpenTelemetry;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using SampleServer.Hub;
@@ -8,7 +9,8 @@
 // Add services to the container.
 
 builder.Services.AddControllers();
-builder.Services.AddSignalR();
+builder.Services.AddSignalR()
+    .AddHubInstrumentation();
 
 var app = builder.Build();
 

diff --git a/samples/SampleServer/SampleServer.csproj b/samples/SampleServer/SampleServer.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" />
         <PackageReference Include="TypedSignalR.Client.DevTools" />
     </ItemGroup>
 

diff --git a/tests/TypedSignalR.Client.TypeScript.Tests.Server/Program.cs b/tests/TypedSignalR.Client.TypeScript.Tests.Server/Program.cs
@@ -1,3 +1,6 @@
+#if NET8_0_OR_GREATER
+using AspNetCore.SignalR.OpenTelemetry;
+#endif
 using MessagePack;
 using MessagePack.Resolvers;
 using Microsoft.AspNetCore.HttpLogging;
@@ -10,6 +13,9 @@
 
 builder.Services.AddControllers();
 builder.Services.AddSignalR()
+#if NET8_0_OR_GREATER
+    .AddHubInstrumentation()
+#endif
     .AddJsonProtocol()
    // dotnet tsrts --project path/to/Project.csproj --output generated --serializer MessagePack --naming-style none --enum name
    // .AddMessagePackProtocol(); // default

diff --git a/...SignalR.Client.TypeScript.Tests.Server/TypedSignalR.Client.TypeScript.Tests.Server.csproj b/...SignalR.Client.TypeScript.Tests.Server/TypedSignalR.Client.TypeScript.Tests.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
@@ -19,4 +19,8 @@
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+      <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" />
+    </ItemGroup>
+
 </Project>