Skip to content
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

maint: Replace baggage span processor with OTel version #383

Closed
wants to merge 6 commits into from
Closed

maint: Replace baggage span processor with OTel version #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22ccd6d
maint: Use OTel baggage span processor
MikeGoldsmith May 8, 2024
5f59e47
add nowarn to examples too
MikeGoldsmith May 8, 2024
c87743b
fix code class reference
MikeGoldsmith May 9, 2024
9025363
fix package ref styling
MikeGoldsmith May 9, 2024
e3c5e0f
ignore prerelease package warning
MikeGoldsmith May 9, 2024
0adb2af
add disagnosticsource to example app for smoke tests
MikeGoldsmith May 9, 2024
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 examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<!-- <OutputType>Exe</OutputType> -->
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>aspnetcore_fsharp</RootNamespace>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions examples/aspnetcore-redis/aspnetcoreredis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions examples/aspnetcore/aspnetcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,6 +14,7 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions examples/console/console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<NoWarn>NU1605</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
21 changes: 0 additions & 21 deletions src/Honeycomb.OpenTelemetry/BaggageSpanProcessor.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<PackageIcon>honeycomb.png</PackageIcon>
<RepositoryUrl>https://github.com/honeycombio/honeycomb-opentelemetry-dotnet</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<NoWarn>NU1605,NU5104</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -32,6 +33,7 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="OpenTelemetry.Extensions" Version="1.0.0-beta.5" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Text.Json" Version="7.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion src/Honeycomb.OpenTelemetry/HoneycombOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ internal static bool IsClassicKey(string apikey)
public ResourceBuilder ResourceBuilder { get; set; } = ResourceBuilder.CreateDefault();

/// <summary>
/// Determines whether the <see cref="BaggageSpanProcessor"/> is added when configuring a <see cref="TracerProviderBuilder"/>.
/// Determines whether the <see cref="BaggageActivityProcessor"/> is added when configuring a <see cref="TracerProviderBuilder"/>.
/// </summary>
public bool AddBaggageSpanProcessor { get; set; } = true;

Expand Down
10 changes: 1 addition & 9 deletions src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static TracerProviderBuilder AddHoneycomb(this TracerProviderBuilder buil

if (options.AddBaggageSpanProcessor)
{
builder.AddBaggageSpanProcessor();
builder.AddBaggageActivityProcessor();
}

if (!string.IsNullOrWhiteSpace(tracesApiKey))
Expand Down Expand Up @@ -120,14 +120,6 @@ public static TracerProviderBuilder AddHoneycomb(this TracerProviderBuilder buil
return builder;
}

/// <summary>
/// Configures the <see cref="TracerProviderBuilder"/> to add the <see cref="BaggageSpanProcessor"/> span processor.
/// </summary>
public static TracerProviderBuilder AddBaggageSpanProcessor(this TracerProviderBuilder builder)
{
return builder.AddProcessor(new BaggageSpanProcessor());
}

/// <summary>
/// Configures the <see cref="TracerProviderBuilder"/> to add the <see cref="DeterministicSampler"/> trace sampler.
/// </summary>
Expand Down
Loading