Skip to content

feat(mcp): add deeper OpenTelemetry integration for MCP tool calls #3493

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
Mpdreamz merged 2 commits into from
Jun 15, 2026
Merged

feat(mcp): add deeper OpenTelemetry integration for MCP tool calls #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16493f9
feat(mcp): add deeper OpenTelemetry integration for MCP tool calls
Mpdreamz Jun 12, 2026
553a06b
revert back to Development
Mpdreamz Jun 15, 2026
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
29 changes: 15 additions & 14 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,21 @@
<PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="3.0.0" />
<PackageVersion Include="Amazon.Lambda.SQSEvents" Version="3.0.0" />
<PackageVersion Include="AngleSharp" Version="1.4.0" />
<PackageVersion Include="Aspire.Hosting" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting" Version="13.4.3" />
<PackageVersion Include="MessagePack" Version="2.5.302" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="13.4.3" />
<PackageVersion Include="AWSSDK.Core" Version="4.0.7.3" />
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.18.4" />
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.32" />
<PackageVersion Include="AWSSDK.S3" Version="4.0.23.3" />
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.3.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.6.0" />
<PackageVersion Include="Nullean.ScopedFileSystem" Version="0.4.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageVersion Include="Generator.Equals" Version="4.0.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
<PackageVersion Include="KubernetesClient" Version="19.0.2" />
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.4.1" />
<PackageVersion Include="FakeItEasy" Version="9.0.1" />
Expand Down Expand Up @@ -79,13 +80,13 @@
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
<PackageVersion Include="Errata" Version="0.16.0" />
<PackageVersion Include="Github.Actions.Core" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Conso8e" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.8" />
<PackageVersion Include="Markdig" Version="1.1.2" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
<PackageVersion Include="ModelContextProtocol" Version="1.0.0" />
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.0.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.19.1" />
<PackageVersion Include="ModelContextProtocol" Version="1.4.0" />
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.4.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.19.1" />
<PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageVersion Include="Riok.Mapperly" Version="4.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageVersion Include="Proc" Version="0.13.0" />
Expand All @@ -95,7 +96,7 @@
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
<PackageVersion Include="System.IO.Abstractions" Version="22.1.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
Expand All @@ -104,7 +105,7 @@
</ItemGroup>
<!-- Test packages -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.6.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
Expand All @@ -114,7 +115,7 @@
</ItemGroup>
<!-- Test packages -->
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.3" />
<PackageVersion Include="AngleSharp.Diffing" Version="1.1.1" />
<PackageVersion Include="DiffPlex" Version="1.9.0" />
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
Expand Down
29 changes: 22 additions & 7 deletions src/Elastic.Documentation.ServiceDefaults/AppDefaultsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Elastic.Documentation.ServiceDefaults.Logging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console;
Expand All @@ -25,12 +26,18 @@ public static TBuilder AddDocumentationServiceDefaults<TBuilder>(this TBuilder b
public static TBuilder AddDocumentationServiceDefaults<TBuilder>(this TBuilder builder, Action<IServiceCollection, ConfigurationFileProvider>? configure)
where TBuilder : IHostApplicationBuilder => builder.AddDocumentationServiceDefaults(new GlobalCliOptions(), configure);

public static TBuilder AddDocumentationServiceDefaults<TBuilder>(this TBuilder builder, GlobalCliOptions cliOptions, Action<IServiceCollection, ConfigurationFileProvider>? configure = null)
public static TBuilder AddDocumentationServiceDefaults<TBuilder>(
this TBuilder builder,
GlobalCliOptions cliOptions,
Action<IServiceCollection, ConfigurationFileProvider>? configure = null)
where TBuilder : IHostApplicationBuilder
{
var services = builder.Services;
_ = services.AddElasticDocumentationLogging(cliOptions.LogLevel);
_ = services
var services = builder.Services
.AddElasticDocumentationLogging(cliOptions.LogLevel)
.ConfigureHttpClientDefaults(http =>
{
_ = http.AddStandardResilienceHandler();
})
.AddConfigurationFileProvider(cliOptions.SkipPrivateRepositories, cliOptions.ConfigSource, (s, p) =>
{
var versionConfiguration = p.CreateVersionConfiguration();
Expand All @@ -41,13 +48,13 @@ public static TBuilder AddDocumentationServiceDefaults<TBuilder>(this TBuilder b
_ = s.AddSingleton(versionConfiguration);
_ = s.AddSingleton(search);
configure?.Invoke(s, p);
});
_ = services.AddSingleton(cliOptions);
})
.AddSingleton(cliOptions);

var endpoints = ElasticsearchEndpointFactory.Create(builder.Configuration);
_ = services.AddSingleton(endpoints);

return builder.AddServiceDefaults();
return builder;
}

public static TServiceCollection AddElasticDocumentationLogging<TServiceCollection>(this TServiceCollection services, LogLevel logLevel)
Expand All @@ -61,4 +68,12 @@ public static TServiceCollection AddElasticDocumentationLogging<TServiceCollecti
});
return services;
}

public static TBuilder HealthCheckBuilderExtensions<TBuilder>(this TBuilder builder) where TBuilder : IHostApplicationBuilder
{
_ = builder.Services.AddHealthChecks()
.AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]);

return builder;
}
}
104 changes: 0 additions & 104 deletions src/Elastic.Documentation.ServiceDefaults/Extensions.cs
View file
Open in desktop

This file was deleted.

115 changes: 0 additions & 115 deletions src/Elastic.Documentation.ServiceDefaults/Telemetry/EuidEnrichmentExtensions.cs
View file
Open in desktop

This file was deleted.

Loading
Loading