Skip to content

Commit 037573c

Browse files
cotticotti
committed
Merge branch 'main' into feature/lambda_obs
# Conflicts: # src/api/Elastic.Documentation.Api.Lambda/Program.cs
2 parents b69d5b7 + 918b97e commit 037573c

File tree

3 files changed

+115
-39
lines changed

3 files changed

+115
-39
lines changed

‎src/api/Elastic.Documentation.Api.Infrastructure/Adapters/AskAi/LlmGatewayAskAiGateway.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,20 @@ public async Task<Stream> AskAi(AskAiRequest askAiRequest, Cancel ctx = default)
2525
request.Headers.Add("User-Agent", "elastic-docs-proxy/1.0");
2626
request.Headers.Add("Accept", "text/event-stream");
2727
request.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
28+
29+
// Use HttpCompletionOption.ResponseHeadersRead to get headers immediately
30+
// This allows us to start streaming as soon as headers are received
2831
var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, ctx);
32+
33+
// Ensure the response is successful before streaming
34+
if (!response.IsSuccessStatusCode)
35+
{
36+
var errorContent = await response.Content.ReadAsStringAsync(ctx);
37+
throw new HttpRequestException($"LLM Gateway returned {response.StatusCode}: {errorContent}");
38+
}
39+
40+
// Return the response stream directly - this enables true streaming
41+
// The stream will be consumed as data arrives from the LLM Gateway
2942
return await response.Content.ReadAsStreamAsync(ctx);
3043
}
3144
}

‎src/api/Elastic.Documentation.Api.Infrastructure/ServicesExtension.cs‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,23 @@ private static void AddParameterProvider(IServiceCollection services, AppEnv app
7878
case AppEnv.Edge:
7979
{
8080
logger?.LogInformation("Configuring LambdaExtensionParameterProvider for environment {AppEnvironment}", appEnv);
81-
_ = services.AddHttpClient(LambdaExtensionParameterProvider.HttpClientName, client =>
81+
try
8282
{
83-
client.BaseAddress = new Uri("http://localhost:2773");
84-
client.DefaultRequestHeaders.Add("X-Aws-Parameters-Secrets-Token", Environment.GetEnvironmentVariable("AWS_SESSION_TOKEN"));
85-
});
86-
_ = services.AddSingleton<IParameterProvider, LambdaExtensionParameterProvider>();
83+
_ = services.AddHttpClient(LambdaExtensionParameterProvider.HttpClientName, client =>
84+
{
85+
client.BaseAddress = new Uri("http://localhost:2773");
86+
client.DefaultRequestHeaders.Add("X-Aws-Parameters-Secrets-Token", Environment.GetEnvironmentVariable("AWS_SESSION_TOKEN"));
87+
});
88+
logger?.LogInformation("Lambda extension HTTP client configured");
89+
90+
_ = services.AddSingleton<IParameterProvider, LambdaExtensionParameterProvider>();
91+
logger?.LogInformation("LambdaExtensionParameterProvider registered successfully");
92+
}
93+
catch (Exception ex)
94+
{
95+
logger?.LogError(ex, "Failed to configure LambdaExtensionParameterProvider for environment {AppEnvironment}", appEnv);
96+
throw;
97+
}
8798
break;
8899
}
89100
case AppEnv.Dev:
@@ -104,10 +115,26 @@ private static void AddAskAiUsecase(IServiceCollection services, AppEnv appEnv)
104115
{
105116
var logger = GetLogger(services);
106117
logger?.LogInformation("Configuring AskAi use case for environment {AppEnvironment}", appEnv);
107-
_ = services.AddSingleton<GcpIdTokenProvider>();
108-
_ = services.AddScoped<LlmGatewayOptions>();
109-
_ = services.AddScoped<AskAiUsecase>();
110-
_ = services.AddScoped<IAskAiGateway<Stream>, LlmGatewayAskAiGateway>();
118+
119+
try
120+
{
121+
_ = services.AddSingleton<GcpIdTokenProvider>();
122+
logger?.LogInformation("GcpIdTokenProvider registered successfully");
123+
124+
_ = services.AddScoped<LlmGatewayOptions>();
125+
logger?.LogInformation("LlmGatewayOptions registered successfully");
126+
127+
_ = services.AddScoped<AskAiUsecase>();
128+
logger?.LogInformation("AskAiUsecase registered successfully");
129+
130+
_ = services.AddScoped<IAskAiGateway<Stream>, LlmGatewayAskAiGateway>();
131+
logger?.LogInformation("LlmGatewayAskAiGateway registered successfully");
132+
}
133+
catch (Exception ex)
134+
{
135+
logger?.LogError(ex, "Failed to configure AskAi use case for environment {AppEnvironment}", appEnv);
136+
throw;
137+
}
111138
}
112139
private static void AddSearchUsecase(IServiceCollection services, AppEnv appEnv)
113140
{

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

Lines changed: 66 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,75 @@
1313
using OpenTelemetry.Metrics;
1414
using OpenTelemetry.Trace;
1515

16-
var builder = WebApplication.CreateSlimBuilder(args);
16+
try
17+
{
18+
var process = System.Diagnostics.Process.GetCurrentProcess();
19+
Console.WriteLine($"Starting Lambda application... Memory: {process.WorkingSet64 / 1024 / 1024} MB");
20+
21+
var builder = WebApplication.CreateSlimBuilder(args);
22+
process.Refresh();
23+
Console.WriteLine($"WebApplication builder created. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
24+
25+
_ = builder.AddDocumentationServiceDefaults(ref args);
26+
process.Refresh();
27+
Console.WriteLine($"Documentation service defaults added. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
28+
29+
_ = builder.AddElasticOpenTelemetry(edotBuilder =>
30+
{
31+
_ = edotBuilder
32+
.WithElasticTracing(tracing =>
33+
{
34+
_ = tracing
35+
.AddAspNetCoreInstrumentation()
36+
.AddHttpClientInstrumentation();
37+
})
38+
.WithElasticLogging()
39+
.WithElasticMetrics(metrics =>
40+
{
41+
_ = metrics
42+
.AddAspNetCoreInstrumentation()
43+
.AddHttpClientInstrumentation()
44+
.AddProcessInstrumentation()
45+
.AddRuntimeInstrumentation();
46+
});
47+
});
48+
49+
process.Refresh();
50+
Console.WriteLine($"Elastic OTel configured. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
51+
52+
_ = builder.Services.AddAWSLambdaHosting(LambdaEventSource.RestApi, new SourceGeneratorLambdaJsonSerializer<LambdaJsonSerializerContext>());
53+
process.Refresh();
54+
Console.WriteLine($"AWS Lambda hosting configured. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
55+
56+
var environment = Environment.GetEnvironmentVariable("ENVIRONMENT");
57+
Console.WriteLine($"Environment: {environment}");
58+
59+
builder.Services.AddElasticDocsApiUsecases(environment);
60+
process.Refresh();
61+
Console.WriteLine($"Elastic docs API use cases added. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
62+
63+
_ = builder.WebHost.UseKestrelHttpsConfiguration();
64+
process.Refresh();
65+
Console.WriteLine($"Kestrel HTTPS configuration applied. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
66+
67+
var app = builder.Build();
68+
process.Refresh();
69+
Console.WriteLine($"Application built successfully. Memory: {process.WorkingSet64 / 1024 / 1024} MB");
1770

18-
builder.AddDocumentationServiceDefaults(ref args);
71+
var v1 = app.MapGroup("/docs/_api/v1");
72+
v1.MapElasticDocsApiEndpoints();
73+
Console.WriteLine("API endpoints mapped");
1974

20-
builder.Services.AddAWSLambdaHosting(LambdaEventSource.RestApi, new SourceGeneratorLambdaJsonSerializer<LambdaJsonSerializerContext>());
21-
builder.AddElasticOpenTelemetry(edotBuilder =>
75+
Console.WriteLine("Application startup completed successfully");
76+
app.Run();
77+
}
78+
catch (Exception ex)
2279
{
23-
_ = edotBuilder
24-
.WithElasticTracing(tracing =>
25-
{
26-
_ = tracing
27-
.AddAspNetCoreInstrumentation()
28-
.AddHttpClientInstrumentation();
29-
})
30-
.WithElasticLogging()
31-
.WithElasticMetrics(metrics =>
32-
{
33-
_ = metrics
34-
.AddAspNetCoreInstrumentation()
35-
.AddHttpClientInstrumentation()
36-
.AddProcessInstrumentation()
37-
.AddRuntimeInstrumentation();
38-
});
39-
});
40-
41-
builder.Services.AddElasticDocsApiUsecases(Environment.GetEnvironmentVariable("ENVIRONMENT"));
42-
builder.WebHost.UseKestrelHttpsConfiguration();
43-
44-
var app = builder.Build();
45-
var v1 = app.MapGroup("/docs/_api/v1");
46-
v1.MapElasticDocsApiEndpoints();
47-
48-
app.Run();
80+
Console.WriteLine($"FATAL ERROR during startup: {ex}");
81+
Console.WriteLine($"Exception type: {ex.GetType().Name}");
82+
Console.WriteLine($"Stack trace: {ex.StackTrace}");
83+
throw;
84+
}
4985

5086
[JsonSerializable(typeof(APIGatewayProxyRequest))]
5187
[JsonSerializable(typeof(APIGatewayProxyResponse))]

0 commit comments

Comments
 (0)