wip

Author: reakaleek

Directory.Packages.props

@@ -25,7 +25,7 @@
     <PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
     <PackageVersion Include="AWSSDK.S3" Version="4.0.7.14" />
     <PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
     <PackageVersion Include="KubernetesClient" Version="17.0.14" />
     <PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
@@ -76,10 +76,10 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
   </ItemGroup>
   <!-- Test packages -->
   <ItemGroup>
@@ -99,4 +99,4 @@
     </PackageVersion>
     <PackageVersion Include="xunit.v3" Version="2.0.2" />
   </ItemGroup>
-</Project>
+</Project>

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

@@ -29,6 +29,7 @@ public async Task<Stream> AskAi(AskAiRequest askAiRequest, Cancel ctx)
 		};
 		var inputMessagesJson = JsonSerializer.Serialize(inputMessages, ApiJsonContext.Default.InputMessageArray);
 		_ = activity?.SetTag("gen_ai.input.messages", inputMessagesJson);
+		logger.LogInformation("AskAI input message: {InputMessage}", askAiRequest.Message);
 		logger.LogInformation("Streaming AskAI response");
 		var rawStream = await askAiGateway.AskAi(askAiRequest, ctx);
 		// The stream transformer will handle disposing the activity when streaming completes

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

@@ -212,6 +212,7 @@ private async Task ProcessStreamAsync(PipeReader reader, PipeWriter writer, Acti
 				case AskAiEvent.ChunkComplete chunkComplete:
 					{
 						outputMessageParts.Add(new MessagePart("text", chunkComplete.FullContent));
+						Logger.LogInformation("AskAI output message: {OutputMessage}", chunkComplete.FullContent);
 						break;
 					}
 				case AskAiEvent.ConversationEnd:

src/api/Elastic.Documentation.Api.Infrastructure/OpenTelemetryExtensions.cs

@@ -3,18 +3,14 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.OpenTelemetry;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using OpenTelemetry;
-using OpenTelemetry.Instrumentation.AspNetCore;
-using OpenTelemetry.Instrumentation.Http;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 
 namespace Elastic.Documentation.Api.Infrastructure;
 
-public static partial class OpenTelemetryExtensions
+public static class OpenTelemetryExtensions
 {
 	/// <summary>
 	/// Configures Elastic OpenTelemetry (EDOT) for the Docs API.
@@ -28,12 +24,13 @@ public static TBuilder AddDocsApiOpenTelemetry<TBuilder>(
 	{
 		var options = new ElasticOpenTelemetryOptions
 		{
+			SkipOtlpExporter = true, // Disable OTLP exporter
 			SkipInstrumentationAssemblyScanning = true // Disable instrumentation assembly scanning for AOT
 		};
-		_ = builder.AddElasticOpenTelemetry(edotBuilder =>
+		_ = builder.AddElasticOpenTelemetry(options, edotBuilder =>
 		{
 			_ = edotBuilder
-				.WithElasticDefaults(options)
+				.WithElasticLogging()
 				.WithElasticTracing(tracing =>
 				{
 					_ = tracing
@@ -42,18 +39,13 @@ public static TBuilder AddDocsApiOpenTelemetry<TBuilder>(
 						.AddAspNetCoreInstrumentation()
 						.AddHttpClientInstrumentation();
 				})
-				.WithElasticLogging()
 				.WithElasticMetrics(metrics =>
 				{
 					_ = metrics
 						.AddAspNetCoreInstrumentation()
 						.AddHttpClientInstrumentation();
 				});
 		});
-
-		Console.WriteLine("[OTEL] Elastic OpenTelemetry configured successfully");
-		Console.WriteLine($"[OTEL] Service: {builder.Environment.ApplicationName}");
-		Console.WriteLine($"[OTEL] Environment: {builder.Environment.EnvironmentName}");
 		return builder;
 	}
 }

src/api/Elastic.Documentation.Api.Lambda/appsettings.development.json

@@ -4,5 +4,12 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "Elastic": {
+    "OpenTelemetry": {
+      "LogLevel": "Debug",
+      "LogTargets": "stdout",
+      "SkipInstrumentationAssemblyScanning": true
+    }
   }
 }

src/api/Elastic.Documentation.Api.Lambda/appsettings.json

@@ -5,5 +5,12 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
+  "Elastic": {
+    "OpenTelemetry": {
+      "LogLevel": "Information",
+      "LogTargets": "stdout",
+      "SkipInstrumentationAssemblyScanning": true
+    }
+  },
   "AllowedHosts": "*"
 }