Skip to content

Commit 8db2fb7

Browse files
dotnet-maestro[bot]JamesNKeerhardtwtgodbedkurepa
authored
[release/8.0-preview5] Update dependencies from dotnet/runtime dotnet/efcore (#48435)
* Update dependencies from https://github.com/dotnet/runtime build 20230525.9 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 8.0.0-preview.5.23273.1 -> To Version 8.0.0-preview.5.23275.9 * [main] Update dependencies from dotnet/runtime (#48407) * Update dependencies from https://github.com/dotnet/runtime build 20230524.1 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 8.0.0-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.1 * Use Microsoft.Extensions.Diaganostics * Add to shared framework * Add Diagnostics.Abstractions to shared fx. * Remove InternalsVisibleTo workaround. Add some dispose logic to TestMeterFactory. * Fix test build. Add new assemblies to shared fx * Fix new deps * Update dependencies from https://github.com/dotnet/runtime build 20230524.13 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 8.0.0-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.13 * Update new dependencies to new runtime build --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: James Newton-King <[email protected]> Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: wtgodbe <[email protected]> * Update dependencies from https://github.com/dotnet/efcore build 20230525.3 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.0-preview.5.23275.1 -> To Version 8.0.0-preview.5.23275.3 * Update dependencies from https://github.com/dotnet/runtime build 20230525.10 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 8.0.0-preview.5.23273.1 -> To Version 8.0.0-preview.5.23275.10 * Update dependencies from https://github.com/dotnet/efcore build 20230526.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.0-preview.5.23275.1 -> To Version 8.0.0-preview.5.23276.1 * Add Microosft.Extensions.Diagnostics as a dependency * Add MicrosoftExtensionsDiagnosticsVersion to Version.Props * Add Diagnostics.Abstractions dependency --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: James Newton-King <[email protected]> Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: wtgodbe <[email protected]> Co-authored-by: Djuradj Kurepa <[email protected]> Co-authored-by: dkurepa <[email protected]>
1 parent 7a3dc41 commit 8db2fb7

File tree

52 files changed

+389
-661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+389
-661
lines changed

‎eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ and are generated based on the last package release.
4040
<LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" />
4141
<LatestPackageReference Include="Microsoft.Extensions.DependencyModel" />
4242
<LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" />
43+
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Abstractions" />
44+
<LatestPackageReference Include="Microsoft.Extensions.Diagnostics" />
4345
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
4446
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Composite" />
4547
<LatestPackageReference Include="Microsoft.Extensions.FileProviders.Physical" />

‎eng/SharedFramework.External.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
2222
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
2323
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
24+
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="$(MicrosoftExtensionsDiagnosticsVersion)" />
25+
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics" Version="$(MicrosoftExtensionsDiagnosticsVersion)" />
2426
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsVersion)" />
2527
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftExtensionsFileProvidersCompositeVersion)" />
2628
<ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalVersion)" />

‎eng/Version.Details.xml

Lines changed: 148 additions & 140 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 70 deletions
Large diffs are not rendered by default.

‎src/Framework/test/TestData.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ static TestData()
119119
"Microsoft.Extensions.Configuration.Xml",
120120
"Microsoft.Extensions.DependencyInjection",
121121
"Microsoft.Extensions.DependencyInjection.Abstractions",
122+
"Microsoft.Extensions.Diagnostics",
123+
"Microsoft.Extensions.Diagnostics.Abstractions",
122124
"Microsoft.Extensions.Diagnostics.HealthChecks",
123125
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
124126
"Microsoft.Extensions.FileProviders.Abstractions",
@@ -268,6 +270,8 @@ static TestData()
268270
{ "Microsoft.Extensions.Configuration" },
269271
{ "Microsoft.Extensions.DependencyInjection.Abstractions" },
270272
{ "Microsoft.Extensions.DependencyInjection" },
273+
{ "Microsoft.Extensions.Diagnostics.Abstractions" },
274+
{ "Microsoft.Extensions.Diagnostics" },
271275
{ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" },
272276
{ "Microsoft.Extensions.Diagnostics.HealthChecks" },
273277
{ "Microsoft.Extensions.Features" },

‎src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Microsoft.Extensions.Configuration;
1515
using Microsoft.Extensions.DependencyInjection;
1616
using Microsoft.Extensions.DependencyInjection.Extensions;
17+
using Microsoft.Extensions.Diagnostics.Metrics;
1718
using Microsoft.Extensions.Hosting;
1819

1920
namespace Microsoft.AspNetCore.Hosting;

‎src/Hosting/Hosting/src/GenericHost/SlimWebHostBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Microsoft.Extensions.Configuration;
1212
using Microsoft.Extensions.DependencyInjection;
1313
using Microsoft.Extensions.DependencyInjection.Extensions;
14+
using Microsoft.Extensions.Diagnostics.Metrics;
1415
using Microsoft.Extensions.Hosting;
1516

1617
namespace Microsoft.AspNetCore.Hosting;

‎src/Hosting/Hosting/src/Internal/HostingMetrics.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Diagnostics;
66
using System.Diagnostics.Metrics;
77
using Microsoft.AspNetCore.Http;
8-
using Microsoft.Extensions.Metrics;
8+
using Microsoft.Extensions.Diagnostics.Metrics;
99

1010
namespace Microsoft.AspNetCore.Hosting;
1111

@@ -19,7 +19,7 @@ internal sealed class HostingMetrics : IDisposable
1919

2020
public HostingMetrics(IMeterFactory meterFactory)
2121
{
22-
_meter = meterFactory.CreateMeter(MeterName);
22+
_meter = meterFactory.Create(MeterName);
2323

2424
_currentRequestsCounter = _meter.CreateUpDownCounter<long>(
2525
"current-requests",

‎src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
2626
<Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
2727
<Reference Include="Microsoft.Extensions.Configuration" />
28+
<Reference Include="Microsoft.Extensions.Diagnostics" />
2829
<Reference Include="Microsoft.Extensions.DependencyInjection" />
2930
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
3031
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />

‎src/Hosting/Hosting/src/WebHostBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.Extensions.Configuration;
1313
using Microsoft.Extensions.DependencyInjection;
1414
using Microsoft.Extensions.DependencyInjection.Extensions;
15+
using Microsoft.Extensions.Diagnostics.Metrics;
1516
using Microsoft.Extensions.Hosting;
1617
using Microsoft.Extensions.Logging;
1718

‎src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Diagnostics;
5+
using System.Diagnostics.Metrics;
56
using System.Diagnostics.Tracing;
67
using System.Reflection;
78
using Microsoft.AspNetCore.Http;
89
using Microsoft.AspNetCore.Http.Features;
910
using Microsoft.AspNetCore.Internal;
11+
using Microsoft.AspNetCore.Testing;
12+
using Microsoft.Extensions.Diagnostics.Metrics;
1013
using Microsoft.Extensions.Logging;
11-
using Microsoft.Extensions.Metrics;
1214
using Moq;
1315

1416
namespace Microsoft.AspNetCore.Hosting.Tests;
@@ -44,17 +46,15 @@ public async Task EventCountersAndMetricsValues()
4446
});
4547

4648
var testMeterFactory1 = new TestMeterFactory();
47-
var testMeterRegister1 = new TestMeterRegistry(testMeterFactory1.Meters);
4849
var testMeterFactory2 = new TestMeterFactory();
49-
var testMeterRegister2 = new TestMeterRegistry(testMeterFactory2.Meters);
5050

5151
var hostingApplication1 = CreateApplication(out var features1, eventSource: hostingEventSource, meterFactory: testMeterFactory1);
5252
var hostingApplication2 = CreateApplication(out var features2, eventSource: hostingEventSource, meterFactory: testMeterFactory2);
5353

54-
using var currentRequestsRecorder1 = new InstrumentRecorder<long>(testMeterRegister1, HostingMetrics.MeterName, "current-requests");
55-
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterRegister2, HostingMetrics.MeterName, "current-requests");
56-
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterRegister1, HostingMetrics.MeterName, "request-duration");
57-
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterRegister2, HostingMetrics.MeterName, "request-duration");
54+
using var currentRequestsRecorder1 = new InstrumentRecorder<long>(testMeterFactory1, HostingMetrics.MeterName, "current-requests");
55+
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterFactory2, HostingMetrics.MeterName, "current-requests");
56+
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterFactory1, HostingMetrics.MeterName, "request-duration");
57+
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterFactory2, HostingMetrics.MeterName, "request-duration");
5858

5959
// Act/Assert 1
6060
var context1 = hostingApplication1.CreateContext(features1);

‎src/Hosting/Hosting/test/HostingApplicationTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Collections;
5-
using System.Collections.ObjectModel;
65
using System.Diagnostics;
7-
using System.Diagnostics.Metrics;
8-
using Microsoft.AspNetCore.Hosting.Fakes;
96
using Microsoft.AspNetCore.Hosting.Server.Abstractions;
107
using Microsoft.AspNetCore.Http;
118
using Microsoft.AspNetCore.Http.Features;
129
using Microsoft.AspNetCore.Testing;
1310
using Microsoft.Extensions.DependencyInjection;
11+
using Microsoft.Extensions.Diagnostics.Metrics;
1412
using Microsoft.Extensions.Logging.Abstractions;
15-
using Microsoft.Extensions.Metrics;
1613
using Moq;
1714
using static Microsoft.AspNetCore.Hosting.HostingApplication;
1815

‎src/Hosting/Hosting/test/HostingMetricsTests.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
using Microsoft.AspNetCore.Internal;
1010
using Microsoft.AspNetCore.Testing;
1111
using Microsoft.Extensions.DependencyInjection;
12+
using Microsoft.Extensions.Diagnostics.Metrics;
1213
using Microsoft.Extensions.Logging.Abstractions;
13-
using Microsoft.Extensions.Metrics;
1414

1515
namespace Microsoft.AspNetCore.Hosting.Tests;
1616

@@ -21,13 +21,12 @@ public void MultipleRequests()
2121
{
2222
// Arrange
2323
var meterFactory = new TestMeterFactory();
24-
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
2524
var hostingApplication = CreateApplication(meterFactory: meterFactory);
2625
var httpContext = new DefaultHttpContext();
2726
var meter = meterFactory.Meters.Single();
2827

29-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "request-duration");
30-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "current-requests");
28+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
29+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
3130

3231
// Act/Assert
3332
Assert.Equal(HostingMetrics.MeterName, meter.Name);
@@ -111,7 +110,6 @@ public async Task StartListeningDuringRequest_NotMeasured()
111110
// Arrange
112111
var syncPoint = new SyncPoint();
113112
var meterFactory = new TestMeterFactory();
114-
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
115113
var hostingApplication = CreateApplication(meterFactory: meterFactory, requestDelegate: async ctx =>
116114
{
117115
await syncPoint.WaitToContinue();
@@ -130,8 +128,8 @@ public async Task StartListeningDuringRequest_NotMeasured()
130128

131129
await syncPoint.WaitForSyncPoint().DefaultTimeout();
132130

133-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "request-duration");
134-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "current-requests");
131+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
132+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
135133
context1.HttpContext.Response.StatusCode = StatusCodes.Status200OK;
136134

137135
syncPoint.Continue();
@@ -148,13 +146,12 @@ public void IHttpMetricsTagsFeatureNotUsedFromFeatureCollection()
148146
{
149147
// Arrange
150148
var meterFactory = new TestMeterFactory();
151-
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
152149
var hostingApplication = CreateApplication(meterFactory: meterFactory);
153150
var httpContext = new DefaultHttpContext();
154151
var meter = meterFactory.Meters.Single();
155152

156-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "request-duration");
157-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "current-requests");
153+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
154+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
158155

159156
// Act/Assert
160157
Assert.Equal(HostingMetrics.MeterName, meter.Name);

‎src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Compile Include="$(SharedSourceRoot)EventSource.Testing\TestEventListener.cs" />
99
<Compile Include="$(SharedSourceRoot)EventSource.Testing\TestCounterListener.cs" />
1010
<Compile Include="$(SharedSourceRoot)SyncPoint\SyncPoint.cs" />
11+
<Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
1112
<Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
1213
<Content Include="Microsoft.AspNetCore.Hosting.StaticWebAssets.xml" CopyToOutputDirectory="PreserveNewest" />
1314
</ItemGroup>

‎src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,6 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
5454
</Compile>
5555
</ItemGroup>
5656

57-
<!-- Temporary hack to make prototype Metrics DI integration types available -->
58-
<!-- TODO: Remove when Metrics DI intergration package is available https://github.com/dotnet/aspnetcore/issues/47618 -->
59-
<ItemGroup>
60-
<Compile Include="$(SharedSourceRoot)Metrics\**\*.cs" LinkBase="Metrics" />
61-
</ItemGroup>
62-
<ItemGroup>
63-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Hosting" />
64-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Hosting.Tests" />
65-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
66-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Server.Kestrel.Core.Tests" />
67-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Server.Kestrel.Tests" />
68-
<InternalsVisibleTo Include="InMemory.FunctionalTests" />
69-
<InternalsVisibleTo Include="Sockets.BindTests" />
70-
<InternalsVisibleTo Include="Sockets.FunctionalTests" />
71-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks" />
72-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Connections" />
73-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Connections.Tests" />
74-
<InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR" />
75-
<InternalsVisibleTo Include="Microsoft.AspNetCore.Diagnostics.Tests" />
76-
<InternalsVisibleTo Include="Microsoft.AspNetCore.RateLimiting" />
77-
<InternalsVisibleTo Include="Microsoft.AspNetCore.RateLimiting.Tests" />
78-
</ItemGroup>
79-
8057
<ItemGroup>
8158
<InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Abstractions.Tests" />
8259
</ItemGroup>

‎src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Diagnostics;
5+
using System.Diagnostics.Metrics;
56
using System.Net;
67
using System.Net.Http;
78
using System.Net.Http.Headers;
@@ -14,8 +15,8 @@
1415
using Microsoft.AspNetCore.TestHost;
1516
using Microsoft.AspNetCore.Testing;
1617
using Microsoft.Extensions.DependencyInjection;
18+
using Microsoft.Extensions.Diagnostics.Metrics;
1719
using Microsoft.Extensions.Hosting;
18-
using Microsoft.Extensions.Metrics;
1920

2021
namespace Microsoft.AspNetCore.Diagnostics;
2122

@@ -540,9 +541,9 @@ public async Task UnhandledError_ExceptionNameTagAdded()
540541
var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
541542

542543
var meterFactory = new TestMeterFactory();
543-
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
544-
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "request-duration");
545-
instrumentRecorder.Register(m =>
544+
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
545+
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
546+
measurementReporter.Register(m =>
546547
{
547548
tcs.SetResult();
548549
});

‎src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Diagnostics;
5+
using System.Diagnostics.Metrics;
56
using System.Net;
67
using Microsoft.AspNetCore.Builder;
78
using Microsoft.AspNetCore.Hosting;
89
using Microsoft.AspNetCore.Http;
910
using Microsoft.AspNetCore.TestHost;
1011
using Microsoft.AspNetCore.Testing;
1112
using Microsoft.Extensions.DependencyInjection;
13+
using Microsoft.Extensions.Diagnostics.Metrics;
1214
using Microsoft.Extensions.Hosting;
1315
using Microsoft.Extensions.Logging;
1416
using Microsoft.Extensions.Logging.Testing;
15-
using Microsoft.Extensions.Metrics;
1617

1718
namespace Microsoft.AspNetCore.Diagnostics;
1819

@@ -917,9 +918,9 @@ public async Task UnhandledError_ExceptionNameTagAdded()
917918
var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
918919

919920
var meterFactory = new TestMeterFactory();
920-
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
921-
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "request-duration");
922-
instrumentRecorder.Register(m =>
921+
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
922+
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
923+
measurementReporter.Register(m =>
923924
{
924925
tcs.SetResult();
925926
});

‎src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<ItemGroup>
1313
<ProjectReference Include="..\testassets\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.csproj" />
14+
15+
<Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
1416
</ItemGroup>
1517

1618
<ItemGroup>

‎src/Middleware/RateLimiting/src/Microsoft.AspNetCore.RateLimiting.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1515
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
1616
<Reference Include="Microsoft.Extensions.Options" />
17+
<Reference Include="Microsoft.Extensions.Diagnostics" />
1718
<Reference Include="System.Threading.RateLimiting" />
1819

1920
<Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />

‎src/Middleware/RateLimiting/src/RateLimiterServiceCollectionExtensions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using Microsoft.AspNetCore.RateLimiting;
55
using Microsoft.Extensions.DependencyInjection;
6+
using Microsoft.Extensions.Diagnostics.Metrics;
67

78
namespace Microsoft.AspNetCore.Builder;
89

‎src/Middleware/RateLimiting/src/RateLimitingMetrics.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Diagnostics;
55
using System.Diagnostics.Metrics;
66
using System.Runtime.CompilerServices;
7-
using Microsoft.Extensions.Metrics;
7+
using Microsoft.Extensions.Diagnostics.Metrics;
88

99
namespace Microsoft.AspNetCore.RateLimiting;
1010

@@ -21,7 +21,7 @@ internal sealed class RateLimitingMetrics : IDisposable
2121

2222
public RateLimitingMetrics(IMeterFactory meterFactory)
2323
{
24-
_meter = meterFactory.CreateMeter(MeterName);
24+
_meter = meterFactory.Create(MeterName);
2525

2626
_currentLeasedRequestsCounter = _meter.CreateUpDownCounter<long>(
2727
"current-leased-requests",

‎src/Middleware/RateLimiting/test/Microsoft.AspNetCore.RateLimiting.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Reference Include="Microsoft.AspNetCore.RateLimiting" />
1010
<Reference Include="Microsoft.AspNetCore.Routing" />
1111

12-
<Compile Include="$(SharedSourceRoot)SyncPoint\SyncPoint.cs" Link="Internal\SyncPoint.cs" />
12+
<Compile Include="$(SharedSourceRoot)Metrics\TestMeterFactory.cs" LinkBase="shared" />
13+
<Compile Include="$(SharedSourceRoot)SyncPoint\SyncPoint.cs" LinkBase="shared" />
1314
</ItemGroup>
1415
</Project>

0 commit comments

Comments
 (0)