Skip to content

Commit cf00150

Browse files
committed
make the trimmer happy
1 parent a0b86e2 commit cf00150

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectionPool/HttpConnectionPool.Http3.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal sealed partial class HttpConnectionPool
8787
ThrowGetVersionException(request, 3, reasonException);
8888
}
8989

90-
WaitForHttp3ConnectionActivity waitForConnectionActivity = new WaitForHttp3ConnectionActivity(Settings._metrics, authority);
90+
WaitForHttp3ConnectionActivity waitForConnectionActivity = new WaitForHttp3ConnectionActivity(Settings, authority);
9191
if (!TryGetPooledHttp3Connection(request, out Http3Connection? connection, out http3ConnectionWaiter, out bool streamAvailable))
9292
{
9393
waitForConnectionActivity.Start();

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -945,14 +945,15 @@ async ValueTask SkipUnknownPayloadAsync(long payloadLength)
945945
/// </summary>
946946
internal struct WaitForHttp3ConnectionActivity
947947
{
948-
private readonly SocketsHttpHandlerMetrics? _metrics;
948+
// The HttpConnectionSettings -> SocketsHttpHandlerMetrics indirection is needed for the trimmer.
949+
private HttpConnectionSettings _settings;
949950
private readonly HttpAuthority _authority;
950951
private Activity? _activity;
951952
private long _startTimestamp;
952953

953-
public WaitForHttp3ConnectionActivity(SocketsHttpHandlerMetrics? metrics, HttpAuthority authority)
954+
public WaitForHttp3ConnectionActivity(HttpConnectionSettings settings, HttpAuthority authority)
954955
{
955-
_metrics = metrics;
956+
_settings = settings;
956957
_authority = authority;
957958
}
958959

@@ -961,7 +962,7 @@ public WaitForHttp3ConnectionActivity(SocketsHttpHandlerMetrics? metrics, HttpAu
961962
public void Start()
962963
{
963964
Debug.Assert(!Started);
964-
_startTimestamp = HttpTelemetry.Log.IsEnabled() || (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled && _metrics!.RequestsQueueDuration.Enabled) ? Stopwatch.GetTimestamp() : 0;
965+
_startTimestamp = HttpTelemetry.Log.IsEnabled() || (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled && _settings._metrics!.RequestsQueueDuration.Enabled) ? Stopwatch.GetTimestamp() : 0;
965966
_activity = ConnectionSetupDistributedTracing.StartWaitForConnectionActivity(_authority);
966967
Started = true;
967968
}
@@ -981,7 +982,7 @@ public void Stop(HttpRequestMessage request, HttpConnectionPool pool, Exception?
981982

982983
if (GlobalHttpSettings.MetricsHandler.IsGloballyEnabled)
983984
{
984-
_metrics!.RequestLeftQueue(request, pool, duration, versionMajor: 3);
985+
_settings._metrics!.RequestLeftQueue(request, pool, duration, versionMajor: 3);
985986
}
986987
if (HttpTelemetry.Log.IsEnabled())
987988
{

0 commit comments

Comments
 (0)