Skip to content

Commit

Permalink
Next batch of renames
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Taillefer committed Sep 22, 2023
1 parent 52cffaa commit 1edfcae
Show file tree
Hide file tree
Showing 267 changed files with 565 additions and 481 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>Microsoft.AspNetCore.Telemetry.Bench</RootNamespace>
<Description>Benchmarks for Microsoft.AspNetCore.Telemetry.</Description>
<RootNamespace>Microsoft.AspNetCore.Diagnostics.Bench</RootNamespace>
<Description>Benchmarks for Microsoft.AspNetCore.Diagnostics.Middleware.</Description>
</PropertyGroup>

<PropertyGroup>
<InjectSharedPools>true</InjectSharedPools>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Libraries\Microsoft.AspNetCore.Telemetry\Microsoft.AspNetCore.Telemetry.csproj" />
<ProjectReference Include="..\..\..\src\Libraries\Microsoft.AspNetCore.Diagnostics.Middleware\Microsoft.AspNetCore.Diagnostics.Middleware.csproj" />
<ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Compliance.Testing\Microsoft.Extensions.Compliance.Testing.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<Workstream>Fundamentals</Workstream>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<Stage>normal</Stage>
<MinCodeCoverage>100</MinCodeCoverage>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
using Microsoft.Shared.Diagnostics;
using Microsoft.Shared.Pools;

// Keeping this namespace so that users are able to control logging:
namespace Microsoft.AspNetCore.Diagnostics.Logging;

internal sealed class HttpLoggingMiddleware : IMiddleware
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,20 @@
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Extensions.Telemetry\Microsoft.Extensions.Telemetry.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
<ProjectReference Include="..\Microsoft.AspNetCore.Telemetry\Microsoft.AspNetCore.Telemetry.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
<PackageReference Include="Microsoft.Extensions.Primitives" />
<PackageReference Include="System.Collections.Immutable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
{
"Name": "Microsoft.AspNetCore.Diagnostics.Middleware, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",
"Types": [
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions",
"Stage": "Stable",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions.AddHttpLogEnricher<T>(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions> configure);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions.AddHttpLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.AspNetCore.Builder.IApplicationBuilder Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingServiceExtensions.UseHttpLoggingMiddleware(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder);",
"Stage": "Stable"
}
]
},
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames",
"Stage": "Stable",
"Fields": [
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.Duration",
"Stage": "Stable",
"Value": "duration"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.Host",
"Stage": "Stable",
"Value": "httpHost"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.Method",
"Stage": "Stable",
"Value": "httpMethod"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.Path",
"Stage": "Stable",
"Value": "httpPath"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.RequestBody",
"Stage": "Stable",
"Value": "httpRequestBody"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.RequestHeaderPrefix",
"Stage": "Stable",
"Value": "httpRequestHeader_"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.ResponseBody",
"Stage": "Stable",
"Value": "httpResponseBody"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.ResponseHeaderPrefix",
"Stage": "Stable",
"Value": "httpResponseHeader_"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.StatusCode",
"Stage": "Stable",
"Value": "httpStatusCode"
}
],
"Properties": [
{
"Member": "static System.Collections.Generic.IReadOnlyList<string> Microsoft.AspNetCore.Diagnostics.Logging.HttpLoggingTagNames.DimensionNames { get; }",
"Stage": "Stable"
}
]
},
{
"Type": "interface Microsoft.AspNetCore.Diagnostics.Logging.IHttpLogEnricher",
"Stage": "Stable",
"Methods": [
{
"Member": "void Microsoft.AspNetCore.Diagnostics.Logging.IHttpLogEnricher.Enrich(Microsoft.Extensions.Diagnostics.Enrichment.IEnrichmentTagCollector collector, Microsoft.AspNetCore.Http.HttpRequest request, Microsoft.AspNetCore.Http.HttpResponse response);",
"Stage": "Stable"
}
]
},
{
"Type": "enum Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode",
"Stage": "Stable",
"Methods": [
{
"Member": "Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode.IncomingPathLoggingMode();",
"Stage": "Stable"
}
],
"Fields": [
{
"Member": "const Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode.Formatted",
"Stage": "Stable",
"Value": "0"
},
{
"Member": "const Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode.Structured",
"Stage": "Stable",
"Value": "1"
}
]
},
{
"Type": "class Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions",
"Stage": "Stable",
"Methods": [
{
"Member": "Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.LoggingOptions();",
"Stage": "Stable"
}
],
"Properties": [
{
"Member": "int Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.BodySizeLimit { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.Collections.Generic.ISet<string> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.ExcludePathStartsWith { get; set; }",
"Stage": "Experimental"
},
{
"Member": "bool Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.LogBody { get; set; }",
"Stage": "Stable"
},
{
"Member": "bool Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.LogRequestStart { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.Collections.Generic.ISet<string> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RequestBodyContentTypes { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.TimeSpan Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RequestBodyReadTimeout { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.Collections.Generic.IDictionary<string, Microsoft.Extensions.Compliance.Classification.DataClassification> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RequestHeadersDataClasses { get; set; }",
"Stage": "Stable"
},
{
"Member": "Microsoft.AspNetCore.Diagnostics.Logging.IncomingPathLoggingMode Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RequestPathLoggingMode { get; set; }",
"Stage": "Stable"
},
{
"Member": "Microsoft.Extensions.Http.Diagnostics.HttpRouteParameterRedactionMode Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RequestPathParameterRedactionMode { get; set; }",
"Stage": "Experimental"
},
{
"Member": "System.Collections.Generic.ISet<string> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.ResponseBodyContentTypes { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.Collections.Generic.IDictionary<string, Microsoft.Extensions.Compliance.Classification.DataClassification> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.ResponseHeadersDataClasses { get; set; }",
"Stage": "Stable"
},
{
"Member": "System.Collections.Generic.IDictionary<string, Microsoft.Extensions.Compliance.Classification.DataClassification> Microsoft.AspNetCore.Diagnostics.Logging.LoggingOptions.RouteParameterDataClasses { get; set; }",
"Stage": "Stable"
}
]
},
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants",
"Stage": "Stable",
"Fields": [
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants.ElapsedResponseProcessed",
"Stage": "Stable",
"Value": "eltrspproc"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants.ElapsedTillEntryMiddleware",
"Stage": "Stable",
"Value": "eltenm"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants.ElapsedTillFinished",
"Stage": "Stable",
"Value": "eltltf"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants.ElapsedTillHeaders",
"Stage": "Stable",
"Value": "elthdr"
},
{
"Member": "const string Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointConstants.ElapsedTillPipelineExitMiddleware",
"Stage": "Stable",
"Value": "eltexm"
}
]
},
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointExtensions",
"Stage": "Stable",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointExtensions.AddRequestCheckpoint(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.AspNetCore.Builder.IApplicationBuilder Microsoft.AspNetCore.Diagnostics.Latency.RequestCheckpointExtensions.UseRequestCheckpoint(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder);",
"Stage": "Stable"
}
]
},
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Logging.RequestHeadersEnricherExtensions",
"Stage": "Stable",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.RequestHeadersEnricherExtensions.AddRequestHeadersLogEnricher(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.RequestHeadersEnricherExtensions.AddRequestHeadersLogEnricher(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.Diagnostics.RequestHeadersLogEnricherOptions> configure);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Logging.RequestHeadersEnricherExtensions.AddRequestHeadersLogEnricher(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);",
"Stage": "Stable"
}
]
},
{
"Type": "class Microsoft.AspNetCore.Diagnostics.RequestHeadersLogEnricherOptions",
"Stage": "Stable",
"Methods": [
{
"Member": "Microsoft.AspNetCore.Diagnostics.RequestHeadersLogEnricherOptions.RequestHeadersLogEnricherOptions();",
"Stage": "Stable"
}
],
"Properties": [
{
"Member": "System.Collections.Generic.IDictionary<string, Microsoft.Extensions.Compliance.Classification.DataClassification> Microsoft.AspNetCore.Diagnostics.RequestHeadersLogEnricherOptions.HeadersDataClasses { get; set; }",
"Stage": "Experimental"
}
]
},
{
"Type": "static class Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryExtensions",
"Stage": "Stable",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryExtensions.AddRequestLatencyTelemetry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryExtensions.AddRequestLatencyTelemetry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryOptions> configure);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryExtensions.AddRequestLatencyTelemetry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);",
"Stage": "Stable"
},
{
"Member": "static Microsoft.AspNetCore.Builder.IApplicationBuilder Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryExtensions.UseRequestLatencyTelemetry(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder);",
"Stage": "Stable"
}
]
},
{
"Type": "class Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryOptions",
"Stage": "Stable",
"Methods": [
{
"Member": "Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryOptions.RequestLatencyTelemetryOptions();",
"Stage": "Stable"
}
],
"Properties": [
{
"Member": "System.TimeSpan Microsoft.AspNetCore.Diagnostics.Latency.RequestLatencyTelemetryOptions.LatencyDataExportTimeout { get; set; }",
"Stage": "Stable"
}
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
<UseLoggingGenerator>true</UseLoggingGenerator>
<UseMetricsGenerator>true</UseMetricsGenerator>
<InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
Expand All @@ -24,20 +25,8 @@
<ProjectReference Include="..\Microsoft.Extensions.ObjectPool.DependencyInjection\Microsoft.Extensions.ObjectPool.DependencyInjection.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Primitives" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<PackageReference Include="Microsoft.AspNetCore.Http" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 1edfcae

Please sign in to comment.