From 49c6a3e182f35a9c46017f00e5ec46ef84e4a853 Mon Sep 17 00:00:00 2001
From: Mike Goldsmth <goldsmith.mike@gmail.com>
Date: Thu, 25 Apr 2024 14:49:15 +0100
Subject: [PATCH] maint: Replace HNY baggage span procesor with published
 BaggageActivityProcessor

---
 .../BaggageSpanProcessor.cs                   | 21 -------------------
 .../Honeycomb.OpenTelemetry.csproj            |  1 +
 .../HoneycombOptions.cs                       |  2 +-
 .../TracerProviderBuilderExtensions.cs        |  4 ++--
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 src/Honeycomb.OpenTelemetry/BaggageSpanProcessor.cs

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 5e6136b..1282078 100644
--- a/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
+++ b/src/Honeycomb.OpenTelemetry/Honeycomb.OpenTelemetry.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" 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.4" />
     <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..88db3f3 100644
--- a/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
+++ b/src/Honeycomb.OpenTelemetry/TracerProviderBuilderExtensions.cs
@@ -121,11 +121,11 @@ public static TracerProviderBuilder AddHoneycomb(this TracerProviderBuilder buil
         }
 
         /// <summary>
-        /// Configures the <see cref="TracerProviderBuilder"/> to add the <see cref="BaggageSpanProcessor"/> span processor.
+        /// Configures the <see cref="TracerProviderBuilder"/> to add the <see cref="BaggageActivityProcessor"/> span processor.
         /// </summary>
         public static TracerProviderBuilder AddBaggageSpanProcessor(this TracerProviderBuilder builder)
         {
-            return builder.AddProcessor(new BaggageSpanProcessor());
+            return builder.AddProcessor(new BaggageActivityProcessor());
         }
 
         /// <summary>