Skip to content

Add OpenTelemetry forwarder infrastructure #9136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiktork merged 5 commits into from
Apr 20, 2026
+2 −0
Merged

Add OpenTelemetry forwarder infrastructure #9136

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a495983
Add OpenTelemetry forwarder infrastructure
rajkumar-rangaraj Mar 27, 2026
d54b0b5
Make OpenTelemetry package reference and BUILDING_OTEL unconditional
rajkumar-rangaraj Apr 3, 2026
f52f7cd
Remove BUILDING_OTEL define
rajkumar-rangaraj Apr 3, 2026
343d3a5
Merge branch 'main' into rajrang/otel-infrastructure
rajkumar-rangaraj Apr 3, 2026
67ee27f
Merge branch 'main' into rajrang/otel-infrastructure
rajkumar-rangaraj Apr 20, 2026
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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageVersion Include="NJsonSchema" Version="$(NJsonSchemaVersion)" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="$(NJsonSchemaVersion)" />
<PackageVersion Include="OpenTelemetry.OutOfProcess.Forwarder.Configuration" Version="0.1.0-beta.1" />
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
<PackageVersion Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
Expand Down
1 change: 1 addition & 0 deletions generate-dev-sln.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $ErrorActionPreference = 'Stop'

$resolvedPath = Resolve-Path $DiagRepoRoot
$env:DIAGNOSTICS_REPO_ROOT=$resolvedPath
$env:ENABLE_OTEL="true"

#Generates a solution that spans both the diagnostics and the dotnet-monitor repo.
#This can be used to build both projects in VS.
Expand Down
8 changes: 8 additions & 0 deletions src/Tools/dotnet-monitor/dotnet-monitor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<PackageReference Include="Microsoft.AspNetCore.OpenApi" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup Condition="'$(ENABLE_OTEL)' != ''">
<PackageReference Include="OpenTelemetry.OutOfProcess.Forwarder.Configuration" />
Comment thread
rajkumar-rangaraj marked this conversation as resolved.
Outdated
</ItemGroup>

<ItemGroup Condition="'$(DIAGNOSTICS_REPO_ROOT)' == ''">
Comment thread
rajkumar-rangaraj marked this conversation as resolved.
<PackageReference Include="Microsoft.Diagnostics.Monitoring" />
</ItemGroup>
Expand All @@ -36,6 +40,10 @@
<ProjectReference Include="$(DIAGNOSTICS_REPO_ROOT)\src\Microsoft.Diagnostics.Monitoring\Microsoft.Diagnostics.Monitoring.csproj" />
</ItemGroup>

<PropertyGroup Condition="'$(ENABLE_OTEL)' != ''">
<DefineConstants>$(DefineConstants);BUILDING_OTEL</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Microsoft.Diagnostics.Monitoring.Options\Microsoft.Diagnostics.Monitoring.Options.csproj" />
<ProjectReference Include="..\..\Microsoft.Diagnostics.Monitoring.WebApi\Microsoft.Diagnostics.Monitoring.WebApi.csproj" />
Expand Down