Skip to content

Drop HttpChainDescriptor pipeline-introspection fields; bump JasperFx 2.8.0 + Marten 9.4.0 (#3008) #3011

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
jeremydmiller merged 1 commit into from
Jun 2, 2026
+20 −70
Merged

Drop HttpChainDescriptor pipeline-introspection fields; bump JasperFx 2.8.0 + Marten 9.4.0 (#3008) #3011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
<PackageVersion Include="Grpc.StatusProto" Version="2.76.0" />
<PackageVersion Include="Grpc.Tools" Version="2.76.0" />
<PackageVersion Include="HtmlTags" Version="9.0.0" />
<PackageVersion Include="JasperFx" Version="2.4.1" />
<PackageVersion Include="JasperFx.Events" Version="2.4.1" />
<PackageVersion Include="JasperFx.Events.SourceGenerator" Version="2.4.1" />
<PackageVersion Include="JasperFx" Version="2.8.0" />
<PackageVersion Include="JasperFx.Events" Version="2.8.0" />
<PackageVersion Include="JasperFx.Events.SourceGenerator" Version="2.8.0" />
<!-- RuntimeCompiler is on its own 5.x line (the Roslyn compiler package) — not the 2.1.x
family; it stays at 5.0.0. -->
<PackageVersion Include="JasperFx.RuntimeCompiler" Version="5.0.0" />
<PackageVersion Include="JasperFx.SourceGenerator" Version="2.4.1" />
<PackageVersion Include="Marten" Version="9.2.0" />
<PackageVersion Include="JasperFx.SourceGenerator" Version="2.8.0" />
<PackageVersion Include="Marten" Version="9.4.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
<PackageVersion Include="Polecat" Version="4.2.1" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.46.1" />
<PackageVersion Include="Marten.AspNetCore" Version="9.2.0" />
<PackageVersion Include="Marten.Newtonsoft" Version="9.2.0" />
<PackageVersion Include="Marten.AspNetCore" Version="9.4.0" />
<PackageVersion Include="Marten.Newtonsoft" Version="9.4.0" />
<PackageVersion Include="MemoryPack" Version="1.21.3" />
<PackageVersion Include="MessagePack" Version="3.1.3" />
<PackageVersion Include="Meziantou.Extensions.Logging.Xunit" Version="1.0.15" />
Expand Down Expand Up @@ -114,13 +114,13 @@
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.5" />
<PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.5" />
<PackageVersion Include="Weasel.Core" Version="9.0.1" />
<PackageVersion Include="Weasel.EntityFrameworkCore" Version="9.0.1" />
<PackageVersion Include="Weasel.MySql" Version="9.0.1" />
<PackageVersion Include="Weasel.Oracle" Version="9.0.1" />
<PackageVersion Include="Weasel.Postgresql" Version="9.0.1" />
<PackageVersion Include="Weasel.SqlServer" Version="9.0.1" />
<PackageVersion Include="Weasel.Sqlite" Version="9.0.1" />
<PackageVersion Include="Weasel.Core" Version="9.0.2" />
<PackageVersion Include="Weasel.EntityFrameworkCore" Version="9.0.2" />
<PackageVersion Include="Weasel.MySql" Version="9.0.2" />
<PackageVersion Include="Weasel.Oracle" Version="9.0.2" />
<PackageVersion Include="Weasel.Postgresql" Version="9.0.2" />
<PackageVersion Include="Weasel.SqlServer" Version="9.0.2" />
<PackageVersion Include="Weasel.Sqlite" Version="9.0.2" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
Expand Down
62 changes: 6 additions & 56 deletions src/Http/Wolverine.Http/Diagnostics/HttpGraphUsageSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Security.Cryptography;
using System.Text;
using JasperFx;
using JasperFx.CodeGeneration.Frames;
using JasperFx.Core;
using JasperFx.Core.Reflection;
using JasperFx.Descriptors;
Expand Down Expand Up @@ -101,7 +100,7 @@ public HttpGraphUsageSource(WolverineHttpOptions options, WolverineOptions wolve
foreach (var group in collapsed.OrderBy(g => g.Key.RawText))
{
var primary = group.First();
var descriptor = buildChainDescriptor(primary, group.ToArray(), apiDescriptions, services);
var descriptor = buildChainDescriptor(primary, group.ToArray(), apiDescriptions);
usage.Chains.Add(descriptor);
}

Expand Down Expand Up @@ -131,8 +130,7 @@ private static List<string> collectTenantStrategies(WolverineHttpOptions options
private HttpChainDescriptor buildChainDescriptor(
HttpChain chain,
HttpChain[] versionGroup,
IApiDescriptionGroupCollectionProvider? apiDescriptions,
IServiceProvider services)
IApiDescriptionGroupCollectionProvider? apiDescriptions)
{
var route = chain.RoutePattern!.RawText ?? string.Empty;
var methods = chain.HttpMethods.ToList();
Expand Down Expand Up @@ -184,11 +182,10 @@ private HttpChainDescriptor buildChainDescriptor(
.ToArray();
descriptor.CascadingMessageTypes = cascading.Select(TypeDescriptor.For).ToList();

// Service dependencies — surface what the chain resolves at runtime.
descriptor.ServiceDependencies = readServiceDependencies(chain, services);

descriptor.Middleware = describeFrames(chain.Middleware, "Middleware");
descriptor.Postprocessors = describeFrames(chain.Postprocessors, "Postprocessor");
// Pipeline-introspection fields (Middleware / Postprocessors / ServiceDependencies) are no
// longer populated (GH-3008 / jasperfx#411) — they were removed from HttpChainDescriptor. The
// CritterWatch Pipeline tab now points at the RequestHandlerSourceCode lazy fetch, which
// returns the actual compiled pipeline, so no operator-facing information is lost.

// API version info. When versionGroup has >1 entries, this is a
// collapsed multi-version chain; collect every version + sunset.
Expand All @@ -203,53 +200,6 @@ private HttpChainDescriptor buildChainDescriptor(
return descriptor;
}

private List<TypeDescriptor> readServiceDependencies(HttpChain chain, IServiceProvider services)
{
try
{
var container = services.GetService<IServiceContainer>();
if (container is null) return new List<TypeDescriptor>();

return chain
.ServiceDependencies(container, Type.EmptyTypes)
.Where(t => t != typeof(IServiceProvider))
.Distinct()
.Select(TypeDescriptor.For)
.ToList();
}
catch
{
return new List<TypeDescriptor>();
}
}

private static List<MiddlewareStepDescriptor> describeFrames(IEnumerable<Frame> frames, string kind)
{
var list = new List<MiddlewareStepDescriptor>();
foreach (var frame in frames)
{
var step = new MiddlewareStepDescriptor
{
Kind = kind,
Description = frame.ToString() ?? frame.GetType().FullNameInCode()
};

if (frame is MethodCall call)
{
step.TypeFullName = call.HandlerType.FullNameInCode();
step.MethodName = call.Method.Name;
}
else
{
step.TypeFullName = frame.GetType().FullNameInCode();
}

list.Add(step);
}

return list;
}

private static ApiVersionDescriptor? buildApiVersionDescriptor(HttpChain chain, HttpChain[] versionGroup)
{
if (chain.IsApiVersionNeutral)
Expand Down
Loading