diff --git a/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj b/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj
index b446cd8..44ee6aa 100644
--- a/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj
+++ b/examples/aspnetcore-fsharp/aspnetcore-fsharp.fsproj
@@ -4,6 +4,7 @@
     <!-- <OutputType>Exe</OutputType> -->
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>aspnetcore_fsharp</RootNamespace>
+    <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/aspnetcore-redis/aspnetcoreredis.csproj b/examples/aspnetcore-redis/aspnetcoreredis.csproj
index 5d36ce1..8a22cf9 100644
--- a/examples/aspnetcore-redis/aspnetcoreredis.csproj
+++ b/examples/aspnetcore-redis/aspnetcoreredis.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/aspnetcore/aspnetcore.csproj b/examples/aspnetcore/aspnetcore.csproj
index bd0ff22..7c739c6 100644
--- a/examples/aspnetcore/aspnetcore.csproj
+++ b/examples/aspnetcore/aspnetcore.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -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>
diff --git a/examples/console/console.csproj b/examples/console/console.csproj
index 4e96811..5dc65ce 100644
--- a/examples/console/console.csproj
+++ b/examples/console/console.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
+    <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Honeycomb.OpenTelemetry/BaggageSpanProcessor.cs b/src/Honeycomb.OpenTelemetry/BaggageSpanProcessor.cs
deleted file mode 100644
index 3c520a0..0000000
--- a/src/Honeycomb.OpenTelemetry/BaggageSpanProcessor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using OpenTelemetry;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Honeycomb.OpenTelemetry
-{
-    /// <summary>
-    /// Span processor that adds <see cref="Baggage"/> fields to every new span
-    /// </summary>
-    public class BaggageSpanProcessor : BaseProcessor<Activity>
-    {
-        /// <inheritdoc />
-        public override void OnStart(Activity activity)
-        {
-            foreach (var entry in Baggage.Current)
-            {
-                activity.SetTag(entry.Key, entry.Value);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj b/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
index 5a5623b..8dac14d 100644
--- a/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
+++ b/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
@@ -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>
@@ -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" />
diff --git a/src/Honeycomb.OpenTelemetry/HoneycombOptions.cs b/src/Honeycomb.OpenTelemetry/HoneycombOptions.cs
index da94ddc..b48fb9a 100644
--- a/src/Honeycomb.OpenTelemetry/HoneycombOptions.cs
+++ b/src/Honeycomb.OpenTelemetry/HoneycombOptions.cs
@@ -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;
 
diff --git a/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs b/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
index 64e37bf..6b8850d 100644
--- a/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
+++ b/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
@@ -79,7 +79,7 @@ public static TracerProviderBuilder AddHoneycomb(this TracerProviderBuilder buil
 
             if (options.AddBaggageSpanProcessor)
             {
-                builder.AddBaggageSpanProcessor();
+                builder.AddBaggageActivityProcessor();
             }
 
             if (!string.IsNullOrWhiteSpace(tracesApiKey))
@@ -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>