fix broken tool spans + cleanup unused methods

Author: alexsohn1126

samples/Sentry.Samples.ME.AI.AspNetCore/Program.cs

@@ -131,7 +131,7 @@
                 }, "CalculateAverageAge",
                 "Calculates the average from a list of ages. You should first get individual ages using GetPersonAge, then use this tool to calculate the average. Takes about 200ms to complete.")
         ]
-    };
+    }.WithSentryToolInstrumentation();
 
     try
     {

samples/Sentry.Samples.ME.AI.Console/Program.cs

@@ -89,7 +89,7 @@
             return $"Complex calculation result for {number}: {result}";
         }, "ComplexCalculation", "Performs a complex mathematical calculation. Takes about 1 second to complete.")
     ]
-};
+}.WithSentryToolInstrumentation();
 
 var response = await client.GetResponseAsync(
     "Please help me with the following tasks: 1) Find Alice's age, 2) Get weather in New York, and 3) Calculate a complex result for number 15. Please use the appropriate tools for each task.",

src/Sentry.Extensions.AI/Extensions/SentryAIExtensions.cs

@@ -10,6 +10,28 @@ namespace Sentry.Extensions.AI;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class SentryAIExtensions
 {
+    /// <summary>
+    /// Wrap tool calls specified in <see cref="ChatOptions"/> with Sentry agent instrumentation
+    /// </summary>
+    /// <param name="options">The <see cref="ChatOptions"/> that contains the <see cref="AIFunction"/> to instrument</param>
+    public static ChatOptions WithSentryToolInstrumentation(this ChatOptions options)
+    {
+        if (options.Tools is null || options.Tools.Count == 0)
+        {
+            return options;
+        }
+
+        for (var i = 0; i < options.Tools.Count; i++)
+        {
+            if (options.Tools[i] is AIFunction fn and not SentryInstrumentedFunction)
+            {
+                options.Tools[i] = new SentryInstrumentedFunction(fn, options);
+            }
+        }
+
+        return options;
+    }
+
     /// <summary>
     /// Wraps an IChatClient with Sentry agent instrumentation.
     /// </summary>

src/Sentry.Extensions.AI/Sentry.Extensions.AI.csproj

@@ -6,6 +6,11 @@
     <Description>Microsoft.Extensions.AI integration for Sentry - captures AI Agent telemetry spans per Sentry AI Agents module.</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Include="Sentry.Extensibility" />
+    <Using Include="Sentry.Integrations" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Sentry\Sentry.csproj" />
   </ItemGroup>

src/Sentry.Extensions.AI/SentryAIConstants.cs

@@ -4,27 +4,6 @@ namespace Sentry.Extensions.AI;
 
 internal static class SentryAIConstants
 {
-    /// <summary>
-    /// <para>
-    /// Sentry will add a <see cref="ISpan"/> to AdditionalAttribute in <see cref="ChatOptions"/>.
-    /// </para>
-    /// <para>
-    /// This constant represents the string key to get the span which represents the agent span.
-    /// </para>
-    /// </summary>
-    internal const string OptionsAdditionalAttributeAgentSpanName = "SentryChatMessageAgentSpan";
-
-    /// <summary>
-    /// <para>
-    /// When an LLM uses a tool, Sentry will add an argument to <see cref="AIFunctionArguments"/>.
-    /// The additional argument will contain the request <see cref="ChatMessage"/> which initialized the tool call.
-    /// </para>
-    /// <para>
-    /// This constant represents the string key to get the message.
-    /// </para>
-    /// </summary>
-    internal const string KeyMessageFunctionArgumentDictKey = "SentrySpanToMessageDictKey";
-
     /// <summary>
     /// The list of strings which FunctionInvokingChatClient(FICC) uses to start the tool call <see cref="Activity"/>.
     /// </summary>

src/Sentry.Extensions.AI/SentryChatClient.cs

@@ -29,7 +29,6 @@ public override async Task<ChatResponse> GetResponseAsync(IEnumerable<ChatMessag
         var chatMessages = messages as ChatMessage[] ?? messages.ToArray();
         var outerSpan = TryGetRootSpan(options);
         var innerSpan = CreateChatSpan(outerSpan, options);
-        WrapTools(options);
 
         try
         {
@@ -69,7 +68,6 @@ public override async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseA
         var chatMessages = messages as ChatMessage[] ?? messages.ToArray();
         var outerSpan = TryGetRootSpan(options);
         var innerSpan = CreateChatSpan(outerSpan, options);
-        WrapTools(options);
 
         var hasNext = true;
         var responses = new List<ChatResponseUpdate>();
@@ -146,20 +144,4 @@ private ISpan CreateChatSpan(ISpan? outerSpan, ChatOptions? options)
             ? outerSpan.StartChild(SentryAIConstants.SpanAttributes.ChatOperation, chatSpanName)
             : _hub.StartSpan(SentryAIConstants.SpanAttributes.ChatOperation, chatSpanName);
     }
-
-    private static void WrapTools(ChatOptions? options)
-    {
-        if (options?.Tools is null || options.Tools.Count == 0)
-        {
-            return;
-        }
-        // We wrap tools here so we don't have to wrap them each time we grab the response
-        for (var i = 0; i < options.Tools.Count; i++)
-        {
-            if (options.Tools[i] is AIFunction fn and not SentryInstrumentedFunction)
-            {
-                options.Tools[i] = new SentryInstrumentedFunction(fn, options);
-            }
-        }
-    }
 }