fix

Author: reakaleek

src/api/Elastic.Documentation.Api.Core/AskAi/AskAiUsecase.cs

@@ -16,20 +16,22 @@ public class AskAiUsecase(
 
 	public async Task<Stream> AskAi(AskAiRequest askAiRequest, Cancel ctx)
 	{
-		using var activity = AskAiActivitySource.StartActivity("gen_ai.agent");
+		// Start with a placeholder model name - will be updated by transformer
+		using var activity = AskAiActivitySource.StartActivity("chat unknown", ActivityKind.Client);
 
-		// We'll determine the actual agent name after we know which provider is being used
-		_ = (activity?.SetTag("gen_ai.request.input", askAiRequest.Message));
+		// Set required GenAI semantic convention attributes
+		_ = (activity?.SetTag("gen_ai.operation.name", "chat"));
+		_ = (activity?.SetTag("gen_ai.request.model", "unknown")); // Will be updated by transformer
 		_ = (activity?.SetTag("gen_ai.conversation.id", askAiRequest.ThreadId ?? "pending")); // Will be updated when we receive ConversationStart
+		_ = (activity?.SetTag("gen_ai.usage.input_tokens", askAiRequest.Message.Length)); // Approximate token count
 
-		// Add GenAI inference operation details event
-		_ = (activity?.AddEvent(new ActivityEvent("gen_ai.client.inference.operation.details",
+		// Add GenAI prompt event
+		_ = (activity?.AddEvent(new ActivityEvent("gen_ai.content.prompt",
 			timestamp: DateTimeOffset.UtcNow,
 			tags:
 			[
-				new KeyValuePair<string, object?>("gen_ai.operation.name", "chat"),
-				new KeyValuePair<string, object?>("gen_ai.input.messages", $"[{{\"role\":\"user\",\"content\":\"{askAiRequest.Message}\"}}]"),
-				new KeyValuePair<string, object?>("gen_ai.system_instructions", $"[{{\"type\":\"text\",\"content\":\"{AskAiRequest.SystemPrompt}\"}}]")
+				new KeyValuePair<string, object?>("gen_ai.prompt", askAiRequest.Message),
+				new KeyValuePair<string, object?>("gen_ai.system_instructions", AskAiRequest.SystemPrompt)
 			])));
 
 		logger.LogDebug("Processing AskAiRequest: {Request}", askAiRequest);

src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/StreamTransformerBase.cs

@@ -42,7 +42,9 @@ public abstract class StreamTransformerBase(ILogger logger) : IStreamTransformer
 
 	public Task<Stream> TransformAsync(Stream rawStream, CancellationToken cancellationToken = default)
 	{
-		using var activity = StreamTransformerActivitySource.StartActivity("gen_ai.agent");
+		using var activity = StreamTransformerActivitySource.StartActivity($"chat {GetAgentId()}", ActivityKind.Client);
+		_ = (activity?.SetTag("gen_ai.operation.name", "chat"));
+		_ = (activity?.SetTag("gen_ai.request.model", GetAgentId()));
 		_ = (activity?.SetTag("gen_ai.agent.name", GetAgentId()));
 		_ = (activity?.SetTag("gen_ai.provider.name", GetAgentProvider()));
 
@@ -74,7 +76,7 @@ public Task<Stream> TransformAsync(Stream rawStream, CancellationToken cancellat
 	/// </summary>
 	private async Task ProcessPipeAsync(PipeReader reader, PipeWriter writer, Activity? parentActivity, CancellationToken cancellationToken)
 	{
-		using var activity = StreamTransformerActivitySource.StartActivity("StreamTransformer.ProcessPipeAsync");
+		using var activity = StreamTransformerActivitySource.StartActivity("gen_ai.agent.pipe");
 		_ = (activity?.SetTag("transformer.type", GetType().Name));
 
 		try
@@ -204,14 +206,12 @@ protected async Task WriteEventAsync(AskAiEvent? transformedEvent, PipeWriter wr
 		_ = (activity?.SetTag("gen_ai.provider.name", GetAgentProvider()));
 		_ = (activity?.SetTag("gen_ai.response.token_type", transformedEvent.GetType().Name));
 
-		// Add GenAI response event for each token/chunk
-		_ = (activity?.AddEvent(new ActivityEvent("gen_ai.client.inference.operation.details",
+		// Add GenAI completion event for each token/chunk
+		_ = (activity?.AddEvent(new ActivityEvent("gen_ai.content.completion",
 			timestamp: DateTimeOffset.UtcNow,
 			tags:
 			[
-				new KeyValuePair<string, object?>("gen_ai.operation.name", "chat"),
-				new KeyValuePair<string, object?>("gen_ai.response.model", GetAgentId()),
-				new KeyValuePair<string, object?>("gen_ai.output.messages", JsonSerializer.Serialize(transformedEvent, AskAiEventJsonContext.Default.AskAiEvent))
+				new KeyValuePair<string, object?>("gen_ai.completion", JsonSerializer.Serialize(transformedEvent, AskAiEventJsonContext.Default.AskAiEvent))
 			])));
 
 		// Serialize as base AskAiEvent type to include the type discriminator

src/api/Elastic.Documentation.Api.Lambda/Program.cs

@@ -33,7 +33,9 @@
 			{
 				_ = tracing
 					.AddAspNetCoreInstrumentation()
-					.AddHttpClientInstrumentation();
+					.AddHttpClientInstrumentation()
+					.AddSource("Elastic.Documentation.Api.AskAi")
+					.AddSource("Elastic.Documentation.Api.StreamTransformer");
 			})
 			.WithElasticLogging()
 			.WithElasticMetrics(metrics =>