Start shuffling namespaces per API feedback (#4405)

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

bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs

@@ -3,14 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Resilience.FaultInjection;
-using Microsoft.Extensions.Telemetry.Metrics;
 
 namespace Microsoft.Extensions.Http.Resilience.FaultInjection.PerformanceTests;
 

bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs

@@ -9,9 +9,9 @@
 using Microsoft.Extensions.Compliance.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Telemetry.Metrics;
 
 #pragma warning disable EA0006 // Replace uses of 'Enum.GetName' and 'Enum.ToString' with the '[EnumStrings]' code generator for improved performance
 

bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ExtendedLoggerBench.cs

@@ -8,7 +8,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Telemetry.Enrichment;
-using Microsoft.Extensions.Telemetry.Logging;
 
 namespace Microsoft.Extensions.Telemetry.Bench;
 

bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ModernCodeGen.cs

@@ -11,7 +11,7 @@ internal static class ModernCodeGen
     /// </summary>
     public static void RefTypes(global::Microsoft.Extensions.Logging.ILogger logger, string connectionId, string type, string streamId, string length, string flags, string other)
     {
-        var state = global::Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper.ThreadLocalState;
+        var state = global::Microsoft.Extensions.Logging.LoggerMessageHelper.ThreadLocalState;
 
         _ = state.ReserveTagSpace(7);
         state.TagArray[6] = new("connectionId", connectionId);
@@ -46,7 +46,7 @@ public static void RefTypes(global::Microsoft.Extensions.Logging.ILogger logger,
     /// </summary>
     public static void ValueTypes(global::Microsoft.Extensions.Logging.ILogger logger, long start, long end, int options, global::System.Guid guid)
     {
-        var state = global::Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper.ThreadLocalState;
+        var state = global::Microsoft.Extensions.Logging.LoggerMessageHelper.ThreadLocalState;
 
         _ = state.ReserveTagSpace(5);
         state.TagArray[4] = new("start", start);

src/Generators/Microsoft.Gen.Logging/Emission/Emitter.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Gen.Logging.Emission;
 
 internal sealed partial class Emitter : EmitterBase
 {
-    private const string LoggerMessageHelperType = "global::Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper";
+    private const string LoggerMessageHelperType = "global::Microsoft.Extensions.Logging.LoggerMessageHelper";
 
     private readonly StringBuilderPool _sbPool = new();
     private readonly Dictionary<string, string> _classificationMap = new();

src/Generators/Microsoft.Gen.Logging/Parsing/SymbolLoader.cs

@@ -10,10 +10,10 @@ namespace Microsoft.Gen.Logging.Parsing;
 internal static class SymbolLoader
 {
     internal const string LoggerMessageAttribute = "Microsoft.Extensions.Logging.LoggerMessageAttribute";
-    internal const string LogPropertiesAttribute = "Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute";
-    internal const string TagProviderAttribute = "Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute";
-    internal const string LogPropertyIgnoreAttribute = "Microsoft.Extensions.Telemetry.Logging.LogPropertyIgnoreAttribute";
-    internal const string ITagCollectorType = "Microsoft.Extensions.Telemetry.Logging.ITagCollector";
+    internal const string LogPropertiesAttribute = "Microsoft.Extensions.Logging.LogPropertiesAttribute";
+    internal const string TagProviderAttribute = "Microsoft.Extensions.Logging.TagProviderAttribute";
+    internal const string LogPropertyIgnoreAttribute = "Microsoft.Extensions.Logging.LogPropertyIgnoreAttribute";
+    internal const string ITagCollectorType = "Microsoft.Extensions.Logging.ITagCollector";
     internal const string ILoggerType = "Microsoft.Extensions.Logging.ILogger";
     internal const string LogLevelType = "Microsoft.Extensions.Logging.LogLevel";
     internal const string ExceptionType = "System.Exception";

src/Generators/Microsoft.Gen.Metrics/SymbolLoader.cs

@@ -7,12 +7,12 @@ namespace Microsoft.Gen.Metrics;
 
 internal static class SymbolLoader
 {
-    internal const string CounterTAttribute = "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute`1";
-    internal const string HistogramTAttribute = "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute`1";
-    internal const string GaugeAttribute = "Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute";
-    internal const string CounterAttribute = "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute";
-    internal const string HistogramAttribute = "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute";
-    internal const string TagNameAttribute = "Microsoft.Extensions.Telemetry.Metrics.TagNameAttribute";
+    internal const string CounterTAttribute = "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute`1";
+    internal const string HistogramTAttribute = "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute`1";
+    internal const string GaugeAttribute = "Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute";
+    internal const string CounterAttribute = "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute";
+    internal const string HistogramAttribute = "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute";
+    internal const string TagNameAttribute = "Microsoft.Extensions.Diagnostics.Metrics.TagNameAttribute";
     internal const string MeterClass = "System.Diagnostics.Metrics.Meter";
 
     internal static SymbolHolder? LoadSymbols(Compilation compilation)

src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingExtensions.cs

@@ -7,8 +7,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.ObjectPool;
-using Microsoft.Extensions.Telemetry.Metrics;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.AspNetCore.HeaderParsing;

src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingFeature.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;
-using Microsoft.Extensions.Telemetry.Metrics;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.AspNetCore.HeaderParsing;

src/Libraries/Microsoft.AspNetCore.HeaderParsing/Metric.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.Metrics;
-using Microsoft.Extensions.Telemetry.Metrics;
+using Microsoft.Extensions.Diagnostics.Metrics;
 
 namespace Microsoft.AspNetCore.HeaderParsing;
 

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

@@ -1,12 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Primitives;
-using Microsoft.Extensions.Telemetry.Latency;
 
 namespace Microsoft.AspNetCore.Telemetry;
 

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

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 
 namespace Microsoft.AspNetCore.Telemetry;
 

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

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 
 namespace Microsoft.AspNetCore.Telemetry;
 

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

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 
 namespace Microsoft.AspNetCore.Telemetry;
 

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

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 
 namespace Microsoft.AspNetCore.Telemetry;
 

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

@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.AspNetCore.Telemetry;

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

@@ -10,10 +10,10 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.AmbientMetadata;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Http.Telemetry;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Latency;
 using Microsoft.Shared.Pools;
 
 namespace Microsoft.AspNetCore.Telemetry.Internal;

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

@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.AspNetCore.Telemetry;

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

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Concurrent;
-using Microsoft.Extensions.Telemetry.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
 

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

@@ -22,7 +22,6 @@
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Telemetry.Internal;
-using Microsoft.Extensions.Telemetry.Logging;
 using Microsoft.Shared.Diagnostics;
 using Microsoft.Shared.Pools;
 

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

@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Telemetry.Internal;
-using Microsoft.Extensions.Telemetry.Logging;
 
 namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
 

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

@@ -6,7 +6,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Telemetry.Logging;
 
 namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
 

src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs

@@ -5,7 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Telemetry.Metrics;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 

src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Metric.cs

@@ -3,8 +3,8 @@
 
 using System.Diagnostics.Metrics;
 using System.Globalization;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.EnumStrings;
-using Microsoft.Extensions.Telemetry.Metrics;
 
 [assembly: EnumStrings(typeof(Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus))]
 

src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisher.cs

@@ -3,9 +3,9 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Metrics;
 using Microsoft.Shared.Diagnostics;
 using Microsoft.Shared.Pools;
 

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Linux/LinuxUtilizationProvider.cs

@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Metrics;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;
 

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Windows/WindowsCounters.cs

@@ -2,9 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Metrics;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;
 

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringExtensions.cs

@@ -6,9 +6,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Metrics;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;

src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs

@@ -11,7 +11,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting.Testing.Internal;
-using Microsoft.Extensions.Telemetry.Testing.Logging;
+using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 

src/Libraries/Microsoft.Extensions.Hosting.Testing/Internal/FakeHostBuilder.cs

@@ -9,7 +9,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Telemetry.Testing.Logging;
+using Microsoft.Extensions.Logging.Testing;
 
 namespace Microsoft.Extensions.Hosting.Testing.Internal;
 

src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.json

@@ -106,7 +106,7 @@
           "Stage": "Experimental"
         },
         {
-          "Member": "static Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector Microsoft.Extensions.Hosting.Testing.HostingFakesExtensions.GetFakeLogCollector(this Microsoft.Extensions.Hosting.IHost host);",
+          "Member": "static Microsoft.Extensions.Logging.Testing.FakeLogCollector Microsoft.Extensions.Hosting.Testing.HostingFakesExtensions.GetFakeLogCollector(this Microsoft.Extensions.Hosting.IHost host);",
           "Stage": "Experimental"
         },
         {

src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/HttpClientChaosPolicyFactory.cs

@@ -6,10 +6,10 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Diagnostics.Metrics;
 using Microsoft.Extensions.EnumStrings;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Resilience.FaultInjection;
-using Microsoft.Extensions.Telemetry.Metrics;
 using Polly;
 using Polly.Contrib.Simmy;
 using Polly.Contrib.Simmy.Outcomes;

src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/Metric.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.Http.Resilience.FaultInjection.Internal;
 
 internal static partial class Metric
 {
-    [Microsoft.Extensions.Telemetry.Metrics.Counter(
+    [Microsoft.Extensions.Diagnostics.Metrics.Counter(
         FaultInjectionEventMeterTagNames.FaultInjectionGroupName,
         FaultInjectionEventMeterTagNames.FaultType,
         FaultInjectionEventMeterTagNames.InjectedValue,

src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/HttpClientLatencyTelemetryExtensions.cs

@@ -6,9 +6,9 @@
 using System.Net.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Http.Telemetry.Latency.Internal;
 using Microsoft.Extensions.Http.Telemetry.Logging;
-using Microsoft.Extensions.Telemetry.Latency;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.Http.Telemetry.Latency;

src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyContext.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Threading;
-using Microsoft.Extensions.Telemetry.Latency;
+using Microsoft.Extensions.Diagnostics.Latency;
 
 namespace Microsoft.Extensions.Http.Telemetry.Latency.Internal;
 

src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyLogEnricher.cs

@@ -6,10 +6,10 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Http.Telemetry.Logging;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Telemetry.Enrichment;
-using Microsoft.Extensions.Telemetry.Latency;
 using Microsoft.Shared.Pools;
 
 namespace Microsoft.Extensions.Http.Telemetry.Latency.Internal;

src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpLatencyTelemetryHandler.cs

@@ -5,8 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AmbientMetadata;
+using Microsoft.Extensions.Diagnostics.Latency;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Telemetry.Latency;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.Http.Telemetry.Latency.Internal;