Skip to content

Observability: Initial setup for the API Lambda #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 14, 2025
Merged

Observability: Initial setup for the API Lambda #2028

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2024cba
Observability: Initial setup for edge
cotti Oct 9, 2025
7c0e4ee
Remove duplicate OTEL definition
cotti Oct 9, 2025
6626565
Merge branch 'main' into feature/lambda_obs
cotti Oct 10, 2025
f677d2c
Adjust naming for appsettings
cotti Oct 10, 2025
21a466e
Merge branch 'main' into feature/lambda_obs
cotti Oct 13, 2025
fbc0794
Merge branch 'main' into feature/lambda_obs
cotti Oct 13, 2025
1e5e6a7
Merge branch 'main' into feature/lambda_obs
cotti Oct 13, 2025
0f07679
Re-add logging
cotti Oct 13, 2025
c17eced
Merge branch 'main' into feature/lambda_obs
cotti Oct 14, 2025
b69d5b7
Update src/api/Elastic.Documentation.Api.Lambda/Program.cs
cotti Oct 14, 2025
037573c
Merge branch 'main' into feature/lambda_obs
cotti Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<PackageVersion Include="AWSSDK.Core" Version="4.0.0.2" />
<PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.0.1" />
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.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" />
Expand Down Expand Up @@ -75,7 +77,6 @@
<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.AspNetCore" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
</ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/api/Elastic.Documentation.Api.Lambda/Elastic.Documentation.Api.Lambda.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

<ItemGroup>
<PackageReference Include="Amazon.Lambda.AspNetCoreServer.Hosting"/>
<PackageReference Include="Elastic.OpenTelemetry" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
</ItemGroup>

</Project>
25 changes: 24 additions & 1 deletion src/api/Elastic.Documentation.Api.Lambda/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,40 @@
using Elastic.Documentation.Api.Core.Search;
using Elastic.Documentation.Api.Infrastructure;
using Elastic.Documentation.ServiceDefaults;
using OpenTelemetry;
using OpenTelemetry.Metrics;
using OpenTelemetry.Trace;

var builder = WebApplication.CreateSlimBuilder(args);

builder.AddDocumentationServiceDefaults(ref args);

builder.Services.AddAWSLambdaHosting(LambdaEventSource.RestApi, new SourceGeneratorLambdaJsonSerializer<LambdaJsonSerializerContext>());
builder.AddElasticOpenTelemetry(edotBuilder =>
{
_ = edotBuilder
.WithElasticTracing(tracing =>
{
_ = tracing
.AddAspNetCoreInstrumentation()
.AddHttpClientInstrumentation();
})
.WithElasticLogging()
.WithElasticMetrics(metrics =>
{
_ = metrics
.AddAspNetCoreInstrumentation()
.AddHttpClientInstrumentation()
.AddProcessInstrumentation()
.AddRuntimeInstrumentation();
});
});

builder.Services.AddElasticDocsApiUsecases(Environment.GetEnvironmentVariable("ENVIRONMENT"));
builder.WebHost.UseKestrelHttpsConfiguration();

var app = builder.Build();

Console.WriteLine($"Environment: {app.Environment.EnvironmentName}");
var v1 = app.MapGroup("/docs/_api/v1");
v1.MapElasticDocsApiEndpoints();

Expand Down
0 ...n.Api.Lambda/appsettings.Development.json → ...n.Api.Lambda/appsettings.development.json
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions src/api/Elastic.Documentation.Api.Lambda/appsettings.edge.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can the name of this file be appsettings.edge.json? (no capital)

Not a blocker: but do you see a way to configure this outside of the application.

E.g. We want to change it to DEBUG because we need to debug something in production.

Or is this already possible?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can use environment variables too - in this case control can be manual in the AWS web interface or through infra changes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"Elastic": {
"OpenTelemetry": {
"LogLevel": "Debug",
"LogTargets": "stdout",
"SkipInstrumentationAssemblyScanning": true
}
}
}
Loading