Skip to content

Commit 3b5e839

Browse files
committed
Add OpenTelemetry and update job template packaging
Added `OpenTelemetry.Exporter.OpenTelemetryProtocol` (v1.15.3) to multiple projects to enable OpenTelemetry protocol exporting. Updated its version in `BlazorOrchestrator.ServiceDefaults.csproj` for consistency. Refined MSBuild configuration in `BlazorOrchestrator.Web.csproj` to improve readability and streamline `JobTemplateInputs` and `PackageJobTemplate` targets. Updated `BlazorDataOrchestrator.JobCreatorTemplate.zip` binary to reflect changes in the packaged job template.
1 parent 23ad9a2 commit 3b5e839

7 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/BlazorDataOrchestrator.Core/BlazorDataOrchestrator.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<PackageReference Include="Anthropic.SDK" Version="5.10.0" />
3232
<!-- Google AI packages -->
3333
<PackageReference Include="Mscc.GenerativeAI" Version="3.1.0" />
34+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
3435
<PackageReference Include="Radzen.Blazor" Version="*" />
3536
</ItemGroup>
3637

src/BlazorOrchestrator.Agent/BlazorOrchestrator.Agent.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="13.2.0" />
1717
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="13.2.0" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
19+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

src/BlazorOrchestrator.AppHost/BlazorOrchestrator.AppHost.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="13.2.0" />
1515
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.2.0" />
1616
<PackageReference Include="Azure.Storage.Blobs" Version="12.27.0" />
17+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<ProjectReference Include="..\BlazorOrchestrator.Web\BlazorOrchestrator.Web.csproj" />

src/BlazorOrchestrator.Scheduler/BlazorOrchestrator.Scheduler.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
1717
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.2.0" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
19+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

src/BlazorOrchestrator.ServiceDefaults/BlazorOrchestrator.ServiceDefaults.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
1919
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.4.0" />
20-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
20+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
2121
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
2222
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
2323
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />

src/BlazorOrchestrator.Web/BlazorOrchestrator.Web.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88

99
<!-- Auto-package the JobCreatorTemplate zip before build -->
1010
<ItemGroup>
11-
<JobTemplateInputs Include="$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\**\*.*"
12-
Exclude="$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\bin\**;$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\obj\**" />
11+
<JobTemplateInputs Include="$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\**\*.*" Exclude="$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\bin\**;$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate\obj\**" />
1312
<JobTemplateInputs Include="$(MSBuildProjectDirectory)\..\..\JobTemplate.slnx" />
1413
</ItemGroup>
15-
<Target Name="PackageJobTemplate" BeforeTargets="BeforeBuild"
16-
Inputs="@(JobTemplateInputs)"
17-
Outputs="$(MSBuildProjectDirectory)\JobTemplate\BlazorDataOrchestrator.JobCreatorTemplate.zip">
14+
<Target Name="PackageJobTemplate" BeforeTargets="BeforeBuild" Inputs="@(JobTemplateInputs)" Outputs="$(MSBuildProjectDirectory)\JobTemplate\BlazorDataOrchestrator.JobCreatorTemplate.zip">
1815
<Exec Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\..\scripts\Package-JobTemplate.ps1&quot; -SourceDir &quot;$(MSBuildProjectDirectory)\..\BlazorDataOrchestrator.JobCreatorTemplate&quot; -SlnxFile &quot;$(MSBuildProjectDirectory)\..\..\JobTemplate.slnx&quot; -OutputZip &quot;$(MSBuildProjectDirectory)\JobTemplate\BlazorDataOrchestrator.JobCreatorTemplate.zip&quot;" />
1916
</Target>
2017

@@ -48,6 +45,7 @@
4845
<PackageReference Include="Dapper" Version="2.1.72" />
4946
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
5047
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
48+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
5149
<PackageReference Include="Radzen.Blazor" Version="*" />
5250
<PackageReference Include="SimpleBlazorMonaco" Version="1.0.9" />
5351
<!-- AI packages for ConfigureAIDialog connection testing -->
Binary file not shown.

0 commit comments

Comments
 (0)