Move more stuff out of *Telemetry* namespaces (#4447)

Co-authored-by: Martin Taillefer <mataille@microsoft.com>

bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/Constants.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics;
 
 internal static class Constants
 {

bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/Program.cs

@@ -6,7 +6,7 @@
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.InProcess.Emit;
 
-namespace Microsoft.AspNetCore.Telemetry.Bench;
+namespace Microsoft.AspNetCore.Diagnostics.Bench;
 
 internal static class Program
 {

bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/RedactionBenchmark.cs

@@ -10,7 +10,7 @@
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Shared.Pools;
 
-namespace Microsoft.AspNetCore.Telemetry.Bench;
+namespace Microsoft.AspNetCore.Diagnostics.Bench;
 
 [GcServer(true)]
 [MinColumn]

bench/Libraries/Microsoft.AspNetCore.Telemetry.PerformanceTests/RouteSegment.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics;
 
 internal readonly struct RouteSegment
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/AddServerTimingHeaderMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/AddServerTimingHeaderMiddleware.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// A middleware that populates Server-Timing header with response processing time.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineEntryMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/CapturePipelineEntryMiddleware.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.Latency;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Middleware that should be put at the beginning of the middleware pipeline to capture time.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineEntryStartupFilter.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/CapturePipelineEntryStartupFilter.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Adds <see cref="CapturePipelineEntryMiddleware"/> at the beginning of the middleware pipeline.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineExitMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/CapturePipelineExitMiddleware.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.Latency;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Middleware that should be put at the end of the pipeline to capture time.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CaptureResponseTimeMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/CaptureResponseTimeMiddleware.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.Latency;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// A middleware that captures response times.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/LatencyContextControlExtensions.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/LatencyContextControlExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Diagnostics.Latency;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 internal static class LatencyContextControlExtensions
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/RequestCheckpointConstants.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestCheckpointConstants.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Project constants.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/RequestCheckpointExtensions.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestCheckpointExtensions.cs

@@ -9,7 +9,7 @@
 using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Extensions used to register Request Checkpoint feature.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryExtensions.cs

@@ -4,14 +4,13 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Telemetry.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Extensions for registering the request latency telemetry middleware.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryMiddleware.cs

@@ -16,7 +16,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Shared.Pools;
 
-namespace Microsoft.AspNetCore.Telemetry.Internal;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Middleware that manages latency context for requests.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryOptions.cs

@@ -2,10 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore.Telemetry.Internal;
 using Microsoft.Shared.Data.Validation;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 /// <summary>
 /// Options to configure the request latency middleware.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryOptionsValidator.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryOptionsValidator.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Telemetry.Internal;
+namespace Microsoft.AspNetCore.Diagnostics.Latency;
 
 [OptionsValidator]
 internal sealed partial class RequestLatencyTelemetryOptionsValidator : IValidateOptions<RequestLatencyTelemetryOptions>

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HeaderReader.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HeaderReader.cs

@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Compliance.Classification;
 using Microsoft.Extensions.Compliance.Redaction;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal sealed class HeaderReader
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLogPropertiesProvider.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpLogPropertiesProvider.cs

@@ -2,9 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Concurrent;
+using Microsoft.AspNetCore.Diagnostics.Logging;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal static class HttpLogPropertiesProvider
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLoggingMiddleware.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpLoggingMiddleware.cs

@@ -10,11 +10,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Diagnostics.Logging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Telemetry.Internal;
 using Microsoft.Extensions.Compliance.Classification;
 using Microsoft.Extensions.Compliance.Redaction;
 using Microsoft.Extensions.Http.Telemetry;
@@ -26,7 +26,7 @@
 using Microsoft.Shared.Pools;
 
 // Keeping this namespace so that users are able to control logging:
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal sealed class HttpLoggingMiddleware : IMiddleware
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpLoggingServiceExtensions.cs

@@ -4,8 +4,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Telemetry.Http.Logging;
-using Microsoft.AspNetCore.Telemetry.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -14,7 +12,7 @@
 using Microsoft.IO;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Extension methods to register the HTTP logging feature within the service.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpLoggingTagNames.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Constants used for incoming HTTP request logging tags.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpRequestBodyReader.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpRequestBodyReader.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal static class HttpRequestBodyReader
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Internal/HttpUtilityExtensions.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/HttpUtilityExtensions.cs

@@ -9,7 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Shared.Diagnostics;
 
-namespace Microsoft.AspNetCore.Telemetry.Internal;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Telemetry utility extensions for incoming http requests.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/IHttpLogEnricher.cs

@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Diagnostics.Enrichment;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Interface for implementing log enrichers for incoming HTTP requests.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Internal/IIncomingHttpRouteUtility.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/IIncomingHttpRouteUtility.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Compliance.Classification;
 
-namespace Microsoft.AspNetCore.Telemetry.Internal;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Telemetry utilities for incoming http requests.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Internal/IncomingHttpRouteUtility.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/IncomingHttpRouteUtility.cs

@@ -13,7 +13,7 @@
 #endif
 using Microsoft.Extensions.Compliance.Classification;
 
-namespace Microsoft.AspNetCore.Telemetry.Internal;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal sealed class IncomingHttpRouteUtility : IIncomingHttpRouteUtility
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/IncomingPathLoggingMode.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Strategy to decide how request path is logged.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/IncomingRequestLogRecord.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/IncomingRequestLogRecord.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Telemetry.Internal;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal sealed class IncomingRequestLogRecord
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/Log.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Log.cs

@@ -5,9 +5,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Diagnostics.Logging;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 #pragma warning disable S109
 

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptions.cs

@@ -5,12 +5,13 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Diagnostics.Logging;
 using Microsoft.Extensions.Compliance.Classification;
 using Microsoft.Extensions.Http.Telemetry;
 using Microsoft.Shared.Data.Validation;
 using Microsoft.Shared.DiagnosticIds;
 
-namespace Microsoft.AspNetCore.Telemetry;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Top-level model for formatting incoming HTTP requests and their corresponding responses.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/LoggingOptionsValidator.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptionsValidator.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 [OptionsValidator]
 internal sealed partial class LoggingOptionsValidator : IValidateOptions<LoggingOptions>

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/MediaTypeSetExtensions.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/MediaTypeSetExtensions.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNetCore.Mvc.Formatters;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal static class MediaTypeSetExtensions
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/PipeReaderExtensions.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/PipeReaderExtensions.cs

@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal static class PipeReaderExtensions
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/ResponseInterceptingStream.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/ResponseInterceptingStream.cs

@@ -10,7 +10,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Shared.Pools;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 /// <summary>
 /// Intercepts data being written to stream and writes its copy to another data structure.

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/ResponseInterceptingStreamPool.cs → src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/ResponseInterceptingStreamPool.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Shared.Pools;
 
-namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
+namespace Microsoft.AspNetCore.Diagnostics.Logging;
 
 internal static class ResponseInterceptingStreamPool
 {

src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RootNamespace>Microsoft.AspNetCore.Telemetry</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Diagnostics</RootNamespace>
     <Description>ASP.NET Core middleware for collecting high-quality telemetry.</Description>
     <PackageTags>$(PackageTags);aspnetcore</PackageTags>
     <Workstream>Telemetry</Workstream>