diff --git a/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs b/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs index b2345167a38..34734a3c286 100644 --- a/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs +++ b/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; diff --git a/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs b/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs index fc6d9787c2e..a3b1c54f404 100644 --- a/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs +++ b/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 diff --git a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ExtendedLoggerBench.cs b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ExtendedLoggerBench.cs index 5b2eaca1f33..d00fb831a8e 100644 --- a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ExtendedLoggerBench.cs +++ b/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; diff --git a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ModernCodeGen.cs b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ModernCodeGen.cs index 6739e589c9e..ee131405b0e 100644 --- a/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ModernCodeGen.cs +++ b/bench/Libraries/Microsoft.Extensions.Telemetry.PerformanceTests/ModernCodeGen.cs @@ -11,7 +11,7 @@ internal static class ModernCodeGen /// 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, /// 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); diff --git a/src/Generators/Microsoft.Gen.Logging/Emission/Emitter.cs b/src/Generators/Microsoft.Gen.Logging/Emission/Emitter.cs index 972ec14ff41..b342266e9c9 100644 --- a/src/Generators/Microsoft.Gen.Logging/Emission/Emitter.cs +++ b/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 _classificationMap = new(); diff --git a/src/Generators/Microsoft.Gen.Logging/Parsing/SymbolLoader.cs b/src/Generators/Microsoft.Gen.Logging/Parsing/SymbolLoader.cs index bd5c245f331..5243d7a8194 100644 --- a/src/Generators/Microsoft.Gen.Logging/Parsing/SymbolLoader.cs +++ b/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"; diff --git a/src/Generators/Microsoft.Gen.Metrics/SymbolLoader.cs b/src/Generators/Microsoft.Gen.Metrics/SymbolLoader.cs index 775cfc6c973..4c8bbfc31d8 100644 --- a/src/Generators/Microsoft.Gen.Metrics/SymbolLoader.cs +++ b/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) diff --git a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingExtensions.cs b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingExtensions.cs index a3f4df7e87f..908eec0a7e3 100644 --- a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingFeature.cs b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingFeature.cs index 1ef5a88fbcf..07f5975a60c 100644 --- a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingFeature.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Metric.cs b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Metric.cs index 88c7c3d5aac..944fa08970f 100644 --- a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Metric.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/AddServerTimingHeaderMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/AddServerTimingHeaderMiddleware.cs index 43b38664f76..59b6a7fe6e9 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/AddServerTimingHeaderMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineEntryMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineEntryMiddleware.cs index ce8c26b3a50..4d3ae1be142 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineEntryMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineExitMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineExitMiddleware.cs index 2e6c839e751..9127f7ebee6 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CapturePipelineExitMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CaptureResponseTimeMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CaptureResponseTimeMiddleware.cs index 5876a515623..1133d3b08b3 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/CaptureResponseTimeMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/LatencyContextControlExtensions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/LatencyContextControlExtensions.cs index 2d095470ee6..0cd70c3c29c 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/LatencyContextControlExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/RequestCheckpointExtensions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/RequestCheckpointExtensions.cs index 2aa566268c8..e7ca36fc772 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Checkpoint/RequestCheckpointExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryMiddleware.cs index 3d8c23d0ac3..c35d1ae0f9f 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryExtensions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryExtensions.cs index 3f9b0696aea..b307e7aa6dd 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/RequestLatencyTelemetryExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLogPropertiesProvider.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLogPropertiesProvider.cs index 32d5df1c707..ac115ab3954 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLogPropertiesProvider.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLoggingMiddleware.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLoggingMiddleware.cs index 5da9db227e1..45f98f6d49e 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/HttpLoggingMiddleware.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/IncomingRequestLogRecord.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/IncomingRequestLogRecord.cs index a0149fda057..b8fbca50b14 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/IncomingRequestLogRecord.cs +++ b/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; diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/Log.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/Log.cs index e9b306fdf8d..69f8d789f9b 100644 --- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/Log.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs index 88c41cb60f5..e7ee0ba3077 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Metric.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Metric.cs index b73b2e7506b..e366c714bbe 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/Metric.cs +++ b/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))] diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisher.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisher.cs index d059ac7fe97..b6398816482 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisher.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Linux/LinuxUtilizationProvider.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Linux/LinuxUtilizationProvider.cs index 7142f62b145..db584177dee 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Linux/LinuxUtilizationProvider.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Windows/WindowsCounters.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Windows/WindowsCounters.cs index 8e40846d822..565c414fbf9 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/Windows/WindowsCounters.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringExtensions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringExtensions.cs index f733f8324e2..b7d2bdf65aa 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs b/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs index cf5e7d48555..f0008e5c7d7 100644 --- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Internal/FakeHostBuilder.cs b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Internal/FakeHostBuilder.cs index f8242ab71fa..998658d89e6 100644 --- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Internal/FakeHostBuilder.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.json b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.json index 5441aae5173..bb17d0cf5af 100644 --- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.json +++ b/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" }, { diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/HttpClientChaosPolicyFactory.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/HttpClientChaosPolicyFactory.cs index a89df49457b..40c231424b6 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/HttpClientChaosPolicyFactory.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/Metric.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/Metric.cs index 46e27e34fa1..7bca8319e71 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/Internal/Metric.cs +++ b/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, diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/HttpClientLatencyTelemetryExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/HttpClientLatencyTelemetryExtensions.cs index 4b92a7eeb3c..0a050f211b6 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/HttpClientLatencyTelemetryExtensions.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyContext.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyContext.cs index 0d6fb7218ac..a222f8b8f58 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyContext.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyLogEnricher.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyLogEnricher.cs index 751905a9de1..cdabd664f2f 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpClientLatencyLogEnricher.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpLatencyTelemetryHandler.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpLatencyTelemetryHandler.cs index 18df4b8657b..dfdd16f8507 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpLatencyTelemetryHandler.cs +++ b/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; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpRequestLatencyListener.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpRequestLatencyListener.cs index 8f38fe3c1d4..e11518a7b3b 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpRequestLatencyListener.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Latency/Internal/HttpRequestLatencyListener.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading; -using Microsoft.Extensions.Telemetry.Latency; +using Microsoft.Extensions.Diagnostics.Latency; namespace Microsoft.Extensions.Http.Telemetry.Latency.Internal; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/HttpClientLogger.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/HttpClientLogger.cs index a64fc22f1b1..02428fa7217 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/HttpClientLogger.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/HttpClientLogger.cs @@ -14,7 +14,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Logging; using Microsoft.Shared.Pools; namespace Microsoft.Extensions.Http.Telemetry.Logging; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/Log.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/Log.cs index a7024d39bab..7e13f727ffc 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/Log.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/Log.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Net.Http; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace Microsoft.Extensions.Http.Telemetry.Logging.Internal; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LogRecord.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LogRecord.cs index 7bee2bec71a..5a3a62c5eab 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LogRecord.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LogRecord.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Net.Http; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Telemetry.Logging; namespace Microsoft.Extensions.Http.Telemetry.Logging.Internal; diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggerMessageStateExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggerMessageStateExtensions.cs index 0b138908d48..9725162ee3b 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggerMessageStateExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggerMessageStateExtensions.cs @@ -3,7 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; -using Microsoft.Extensions.Telemetry.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.Extensions.Http.Telemetry.Logging.Internal; diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs index e5c28afec08..d280bd6231d 100644 --- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Diagnostics; using Polly; diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/ChaosPolicyFactory.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/ChaosPolicyFactory.cs index c2d6236769d..fcc58f95fce 100644 --- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/ChaosPolicyFactory.cs +++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/ChaosPolicyFactory.cs @@ -5,8 +5,8 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Metrics; using Polly; using Polly.Contrib.Simmy; using Polly.Contrib.Simmy.Latency; diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/Metric.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/Metric.cs index 8467b316152..7aec46e8a98 100644 --- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/Metric.cs +++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Internals/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.Extensions.Resilience.FaultInjection; diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Checkpoint.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Checkpoint.cs index ebc8cbb2bb0..fdfd50f2205 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Checkpoint.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Checkpoint.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents an event and the time it occurred relative to a well-known starting point. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContext.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContext.cs index a847a256cf3..a03ed68db17 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContext.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContext.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Abstraction that provides the context for latency measurement and diagnostics. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContextProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContextProvider.cs index 5def2bf49aa..9f025b50d76 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContextProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyContextProvider.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.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// A factory of latency contexts. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyDataExporter.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyDataExporter.cs index eb746c45f94..7272addd442 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyDataExporter.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/ILatencyDataExporter.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Abstraction that is used to export latency data. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/LatencyData.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/LatencyData.cs index 68a253cedc8..0978342f839 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/LatencyData.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/LatencyData.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Encapsulates the state accumulated while measuring the latency of an operaiton. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Measure.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Measure.cs index 2ab705d5aee..f671175f000 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Measure.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Measure.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents a measure. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContext.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContext.cs index ec8a8d986cd..73c6f5f0ba6 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContext.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContext.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// No-op implementation of a latency context. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContextExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContextExtensions.cs index 14881e84074..9c2903b59ab 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContextExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/NullLatencyContextExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Extensions to add a no-op latency context. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/CheckpointToken.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/CheckpointToken.cs index 09e8785c827..26f604c0d0a 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/CheckpointToken.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/CheckpointToken.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents a registered checkpoint. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/ILatencyContextTokenIssuer.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/ILatencyContextTokenIssuer.cs index bc0fe11a39f..98016c799b9 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/ILatencyContextTokenIssuer.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/ILatencyContextTokenIssuer.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Issues tokens for various object types. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptions.cs index c32db9efbae..2bcb9470460 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Registered names for . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptionsValidator.cs index fcb63e8f010..d4fcff8777f 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptionsValidator.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyContextRegistrationOptionsValidator.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Options; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; [OptionsValidator] internal sealed partial class LatencyContextRegistrationOptionsValidator : IValidateOptions diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyRegistryExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyRegistryExtensions.cs index 36926179b0c..0cba99d7c53 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyRegistryExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/LatencyRegistryExtensions.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Extensions to configure a latency context. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/MeasureToken.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/MeasureToken.cs index c88599fc980..e6f828c457e 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/MeasureToken.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/MeasureToken.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents a registered measure. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/TagToken.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/TagToken.cs index 0c24dc64459..ad4b6223dbf 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/TagToken.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Registration/TagToken.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents a registered tag. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Tag.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Tag.cs index 2477fb84656..9414e50354d 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Tag.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Latency/Tag.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Represents a name and value pair to provide metadata about an operation being measured. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/ITagCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/ITagCollector.cs index 2eb96a2881f..b1fa191b469 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/ITagCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/ITagCollector.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Compliance.Classification; using Microsoft.Shared.DiagnosticIds; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Interface given to custom tag providers, enabling them to emit tags. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs index c71a4666e0e..342a3d1c000 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs @@ -14,7 +14,7 @@ using Microsoft.Shared.Diagnostics; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Utility type to support generated logging methods. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertiesAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertiesAttribute.cs index e183b4def07..80ed7b9a058 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertiesAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertiesAttribute.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Marks a logging method parameter whose public tags need to be logged. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertyIgnoreAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertyIgnoreAttribute.cs index 252b7e09d6d..954fcdeddb3 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertyIgnoreAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogPropertyIgnoreAttribute.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Indicates that a tag should not be logged. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageHelper.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageHelper.cs index 1dc23df66b4..555d54fb01e 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageHelper.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageHelper.cs @@ -10,7 +10,7 @@ using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Utility type to support generated logging methods. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ClassifiedTag.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ClassifiedTag.cs index 7e9b58482a0..f3e134a76c9 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ClassifiedTag.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ClassifiedTag.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Compliance.Classification; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; public partial class LoggerMessageState { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.EnrichmentTagCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.EnrichmentTagCollector.cs index bfffbe675cf..904f7bd079b 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.EnrichmentTagCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.EnrichmentTagCollector.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Telemetry.Enrichment; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; public partial class LoggerMessageState : IEnrichmentTagCollector { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ReadOnlyList.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ReadOnlyList.cs index 1fbb08ddea9..49bb2d06630 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ReadOnlyList.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.ReadOnlyList.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; public sealed partial class LoggerMessageState : IReadOnlyList> { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.TagCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.TagCollector.cs index 4e6e678ea1b..c9b9dbe6296 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.TagCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.TagCollector.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Compliance.Classification; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; public partial class LoggerMessageState : ITagCollector { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.cs index 4bf49433d78..61c9fe8ed6a 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LoggerMessageState.cs @@ -10,7 +10,7 @@ using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Additional state to use with . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/TagProviderAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/TagProviderAttribute.cs index 664059bee8a..4734e3a4f42 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/TagProviderAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/TagProviderAttribute.cs @@ -8,7 +8,7 @@ using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Defines a method to invoke to generate logging tags for a referenced object. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttribute.cs index 7d6f4256147..1efb661946c 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; /// /// Provides information to guide the production of a strongly-typed 64 bit integer counter metric factory method and associated type. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttributeT.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttributeT.cs index 9598882ac3d..6537f7c56f4 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttributeT.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/CounterAttributeT.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; #pragma warning disable SA1649 // File name should match first type name diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/GaugeAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/GaugeAttribute.cs index d24ff8742e5..0b49a1274f9 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/GaugeAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/GaugeAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; /// /// Provides information to guide the production of a strongly-typed gauge metric factory method and associated type. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttribute.cs index 5abd8aba7cf..b7e4473a221 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; /// /// Provides information to guide the production of a strongly-typed histogram metric factory method and associated type. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttributeT.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttributeT.cs index b802c0fc56b..68a1b3cc04c 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttributeT.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/HistogramAttributeT.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; #pragma warning disable SA1649 // File name should match first type name diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MeterT.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MeterT.cs index a15b36bdf69..424d1f7a48f 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MeterT.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MeterT.cs @@ -5,7 +5,7 @@ using System.Diagnostics.Metrics; using Microsoft.Shared.DiagnosticIds; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; #pragma warning disable SA1649 // File name should match first type name diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MetricsExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MetricsExtensions.cs index f2bb74f2935..fb66bb63755 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MetricsExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/MetricsExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Shared.DiagnosticIds; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; /// /// Extensions to control metering integration. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/TagNameAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/TagNameAttribute.cs index 99013371a81..f7430c81778 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/TagNameAttribute.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metrics/TagNameAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics; /// /// Provides tag information for strongly-typed metrics. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.json b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.json index 05149c5cded..27ade6d55d0 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.json +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Microsoft.Extensions.Telemetry.Abstractions.json @@ -2,157 +2,157 @@ "Name": "Microsoft.Extensions.Telemetry.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", "Types": [ { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Checkpoint : System.IEquatable", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Checkpoint : System.IEquatable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Checkpoint.Checkpoint(string name, long elapsed, long frequency);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Checkpoint(string name, long elapsed, long frequency);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Checkpoint.Checkpoint();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Checkpoint();", "Stage": "Stable" }, { - "Member": "override bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.Equals(object? obj);", + "Member": "override bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Equals(object? obj);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.Equals(Microsoft.Extensions.Telemetry.Latency.Checkpoint other);", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Equals(Microsoft.Extensions.Diagnostics.Latency.Checkpoint other);", "Stage": "Stable" }, { - "Member": "override int Microsoft.Extensions.Telemetry.Latency.Checkpoint.GetHashCode();", + "Member": "override int Microsoft.Extensions.Diagnostics.Latency.Checkpoint.GetHashCode();", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.operator ==(Microsoft.Extensions.Telemetry.Latency.Checkpoint left, Microsoft.Extensions.Telemetry.Latency.Checkpoint right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.operator ==(Microsoft.Extensions.Diagnostics.Latency.Checkpoint left, Microsoft.Extensions.Diagnostics.Latency.Checkpoint right);", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.operator !=(Microsoft.Extensions.Telemetry.Latency.Checkpoint left, Microsoft.Extensions.Telemetry.Latency.Checkpoint right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.operator !=(Microsoft.Extensions.Diagnostics.Latency.Checkpoint left, Microsoft.Extensions.Diagnostics.Latency.Checkpoint right);", "Stage": "Stable" } ], "Properties": [ { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Checkpoint.Elapsed { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Elapsed { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Checkpoint.Frequency { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Frequency { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Checkpoint.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Name { get; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.CheckpointToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.CheckpointToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken.CheckpointToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.CheckpointToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken.CheckpointToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.CheckpointToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.CheckpointToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.CheckpointToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.Position { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LoggerMessageState : Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentTagCollector, System.Collections.Generic.IReadOnlyList>, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable, System.Collections.Generic.IReadOnlyCollection>, Microsoft.Extensions.Telemetry.Logging.ITagCollector", + "Type": "sealed class Microsoft.Extensions.Logging.LoggerMessageState : Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentTagCollector, System.Collections.Generic.IReadOnlyList>, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable, System.Collections.Generic.IReadOnlyCollection>, Microsoft.Extensions.Logging.ITagCollector", "Stage": "Experimental", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageState.ClassifiedTag.ClassifiedTag(string name, object? value, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageState.ClassifiedTag.ClassifiedTag(string name, object? value, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", "Stage": "Experimental" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageState.ClassifiedTag.ClassifiedTag();", + "Member": "Microsoft.Extensions.Logging.LoggerMessageState.ClassifiedTag.ClassifiedTag();", "Stage": "Experimental" } ], "Properties": [ { - "Member": "Microsoft.Extensions.Compliance.Classification.DataClassification Microsoft.Extensions.Telemetry.Logging.LoggerMessageState.ClassifiedTag.Classification { get; }", + "Member": "Microsoft.Extensions.Compliance.Classification.DataClassification Microsoft.Extensions.Logging.LoggerMessageState.ClassifiedTag.Classification { get; }", "Stage": "Experimental" }, { - "Member": "string Microsoft.Extensions.Telemetry.Logging.LoggerMessageState.ClassifiedTag.Name { get; }", + "Member": "string Microsoft.Extensions.Logging.LoggerMessageState.ClassifiedTag.Name { get; }", "Stage": "Experimental" }, { - "Member": "object? Microsoft.Extensions.Telemetry.Logging.LoggerMessageState.ClassifiedTag.Value { get; }", + "Member": "object? Microsoft.Extensions.Logging.LoggerMessageState.ClassifiedTag.Value { get; }", "Stage": "Experimental" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.CounterAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.CounterAttribute(params string[] tagNames);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.CounterAttribute(params string[] tagNames);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.CounterAttribute(System.Type type);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.CounterAttribute(System.Type type);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.Name { get; set; }", + "Member": "string? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.Name { get; set; }", "Stage": "Stable" }, { - "Member": "string[]? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.TagNames { get; }", + "Member": "string[]? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.TagNames { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.Type { get; }", + "Member": "System.Type? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.Type { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.CounterAttribute : System.Attribute where T : struct", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute : System.Attribute where T : struct", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.CounterAttribute(params string[] tagNames);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.CounterAttribute(params string[] tagNames);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.CounterAttribute(System.Type type);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.CounterAttribute(System.Type type);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.Name { get; set; }", + "Member": "string? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.Name { get; set; }", "Stage": "Stable" }, { - "Member": "string[]? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.TagNames { get; }", + "Member": "string[]? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.TagNames { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Metrics.CounterAttribute.Type { get; }", + "Member": "System.Type? Microsoft.Extensions.Diagnostics.Metrics.CounterAttribute.Type { get; }", "Stage": "Stable" } ] @@ -180,85 +180,85 @@ ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute.GaugeAttribute(params string[] tagNames);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute.GaugeAttribute(params string[] tagNames);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute.GaugeAttribute(System.Type type);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute.GaugeAttribute(System.Type type);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute.Name { get; set; }", + "Member": "string? Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute.Name { get; set; }", "Stage": "Stable" }, { - "Member": "string[]? Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute.TagNames { get; }", + "Member": "string[]? Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute.TagNames { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Metrics.GaugeAttribute.Type { get; }", + "Member": "System.Type? Microsoft.Extensions.Diagnostics.Metrics.GaugeAttribute.Type { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.HistogramAttribute(params string[] tagNames);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.HistogramAttribute(params string[] tagNames);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.HistogramAttribute(System.Type type);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.HistogramAttribute(System.Type type);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.Name { get; set; }", + "Member": "string? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.Name { get; set; }", "Stage": "Stable" }, { - "Member": "string[]? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.TagNames { get; }", + "Member": "string[]? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.TagNames { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.Type { get; }", + "Member": "System.Type? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.Type { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute : System.Attribute where T : struct", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute : System.Attribute where T : struct", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.HistogramAttribute(params string[] tagNames);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.HistogramAttribute(params string[] tagNames);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.HistogramAttribute(System.Type type);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.HistogramAttribute(System.Type type);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.Name { get; set; }", + "Member": "string? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.Name { get; set; }", "Stage": "Stable" }, { - "Member": "string[]? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.TagNames { get; }", + "Member": "string[]? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.TagNames { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Metrics.HistogramAttribute.Type { get; }", + "Member": "System.Type? Microsoft.Extensions.Diagnostics.Metrics.HistogramAttribute.Type { get; }", "Stage": "Stable" } ] @@ -319,71 +319,71 @@ ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContext : System.IDisposable", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContext : System.IDisposable", "Stage": "Stable", "Methods": [ { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.AddCheckpoint(Microsoft.Extensions.Telemetry.Latency.CheckpointToken token);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.AddCheckpoint(Microsoft.Extensions.Diagnostics.Latency.CheckpointToken token);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.AddMeasure(Microsoft.Extensions.Telemetry.Latency.MeasureToken token, long value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.AddMeasure(Microsoft.Extensions.Diagnostics.Latency.MeasureToken token, long value);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.Freeze();", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.Freeze();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.RecordMeasure(Microsoft.Extensions.Telemetry.Latency.MeasureToken token, long value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.RecordMeasure(Microsoft.Extensions.Diagnostics.Latency.MeasureToken token, long value);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.SetTag(Microsoft.Extensions.Telemetry.Latency.TagToken token, string value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.SetTag(Microsoft.Extensions.Diagnostics.Latency.TagToken token, string value);", "Stage": "Stable" } ], "Properties": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData Microsoft.Extensions.Telemetry.Latency.ILatencyContext.LatencyData { get; }", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.LatencyData { get; }", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContextProvider", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContextProvider", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.ILatencyContext Microsoft.Extensions.Telemetry.Latency.ILatencyContextProvider.CreateContext();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.ILatencyContext Microsoft.Extensions.Diagnostics.Latency.ILatencyContextProvider.CreateContext();", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetCheckpointToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetCheckpointToken(string name);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetMeasureToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetMeasureToken(string name);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetTagToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetTagToken(string name);", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyDataExporter", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyDataExporter", "Stage": "Stable", "Methods": [ { - "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Telemetry.Latency.ILatencyDataExporter.ExportAsync(Microsoft.Extensions.Telemetry.Latency.LatencyData data, System.Threading.CancellationToken cancellationToken);", + "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Diagnostics.Latency.ILatencyDataExporter.ExportAsync(Microsoft.Extensions.Diagnostics.Latency.LatencyData data, System.Threading.CancellationToken cancellationToken);", "Stage": "Stable" } ] @@ -425,15 +425,15 @@ ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Logging.ITagCollector", + "Type": "interface Microsoft.Extensions.Logging.ITagCollector", "Stage": "Stable", "Methods": [ { - "Member": "void Microsoft.Extensions.Telemetry.Logging.ITagCollector.Add(string tagName, object? tagValue);", + "Member": "void Microsoft.Extensions.Logging.ITagCollector.Add(string tagName, object? tagValue);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Logging.ITagCollector.Add(string tagName, object? tagValue, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", + "Member": "void Microsoft.Extensions.Logging.ITagCollector.Add(string tagName, object? tagValue, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", "Stage": "Experimental" } ] @@ -453,275 +453,275 @@ ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions", + "Type": "class Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.LatencyContextRegistrationOptions();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.LatencyContextRegistrationOptions();", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.CheckpointNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.CheckpointNames { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.MeasureNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.MeasureNames { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.TagNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.TagNames { get; set; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.LatencyData", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.LatencyData", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData.LatencyData(System.ArraySegment tags, System.ArraySegment checkpoints, System.ArraySegment measures, long durationTimestamp, long durationTimestampFrequency);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData.LatencyData(System.ArraySegment tags, System.ArraySegment checkpoints, System.ArraySegment measures, long durationTimestamp, long durationTimestampFrequency);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData.LatencyData();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData.LatencyData();", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Checkpoints { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Checkpoints { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.LatencyData.DurationTimestamp { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.LatencyData.DurationTimestamp { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.LatencyData.DurationTimestampFrequency { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.LatencyData.DurationTimestampFrequency { get; }", "Stage": "Stable" }, { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Measures { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Measures { get; }", "Stage": "Stable" }, { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Tags { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Tags { get; }", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterCheckpointNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterCheckpointNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterMeasureNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterMeasureNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterTagNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterTagNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper", + "Type": "static class Microsoft.Extensions.Logging.LoggerMessageHelper", "Stage": "Experimental", "Methods": [ { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper.Stringify(System.Collections.IEnumerable? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LoggerMessageHelper.Stringify(System.Collections.IEnumerable? enumerable);", "Stage": "Experimental" }, { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LoggerMessageHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", "Stage": "Experimental" } ], "Properties": [ { - "Member": "static Microsoft.Extensions.Telemetry.Logging.LoggerMessageState Microsoft.Extensions.Telemetry.Logging.LoggerMessageHelper.ThreadLocalState { get; }", + "Member": "static Microsoft.Extensions.Logging.LoggerMessageState Microsoft.Extensions.Logging.LoggerMessageHelper.ThreadLocalState { get; }", "Stage": "Experimental" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogMethodHelper : System.Collections.Generic.List>, Microsoft.Extensions.Telemetry.Logging.ITagCollector, Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentTagCollector, Microsoft.Extensions.ObjectPool.IResettable", + "Type": "sealed class Microsoft.Extensions.Logging.LogMethodHelper : System.Collections.Generic.List>, Microsoft.Extensions.Logging.ITagCollector, Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentTagCollector, Microsoft.Extensions.ObjectPool.IResettable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.LogMethodHelper();", + "Member": "Microsoft.Extensions.Logging.LogMethodHelper.LogMethodHelper();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Add(string tagName, object? tagValue);", + "Member": "void Microsoft.Extensions.Logging.LogMethodHelper.Add(string tagName, object? tagValue);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Add(string tagName, object? tagValue, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", + "Member": "void Microsoft.Extensions.Logging.LogMethodHelper.Add(string tagName, object? tagValue, Microsoft.Extensions.Compliance.Classification.DataClassification classification);", "Stage": "Experimental" }, { - "Member": "static Microsoft.Extensions.Telemetry.Logging.LogMethodHelper Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.GetHelper();", + "Member": "static Microsoft.Extensions.Logging.LogMethodHelper Microsoft.Extensions.Logging.LogMethodHelper.GetHelper();", "Stage": "Stable" }, { - "Member": "static void Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.ReturnHelper(Microsoft.Extensions.Telemetry.Logging.LogMethodHelper helper);", + "Member": "static void Microsoft.Extensions.Logging.LogMethodHelper.ReturnHelper(Microsoft.Extensions.Logging.LogMethodHelper helper);", "Stage": "Stable" }, { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Stringify(System.Collections.IEnumerable? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LogMethodHelper.Stringify(System.Collections.IEnumerable? enumerable);", "Stage": "Stable" }, { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LogMethodHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.TryReset();", + "Member": "bool Microsoft.Extensions.Logging.LogMethodHelper.TryReset();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.ParameterName { get; set; }", + "Member": "string Microsoft.Extensions.Logging.LogMethodHelper.ParameterName { get; set; }", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Logging.LogDefineOptions Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.SkipEnabledCheckOptions { get; }", + "Member": "static Microsoft.Extensions.Logging.LogDefineOptions Microsoft.Extensions.Logging.LogMethodHelper.SkipEnabledCheckOptions { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.LogPropertiesAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.LogPropertiesAttribute();", + "Member": "Microsoft.Extensions.Logging.LogPropertiesAttribute.LogPropertiesAttribute();", "Stage": "Stable" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.OmitReferenceName { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LogPropertiesAttribute.OmitReferenceName { get; set; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.SkipNullProperties { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LogPropertiesAttribute.SkipNullProperties { get; set; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogPropertyIgnoreAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.LogPropertyIgnoreAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogPropertyIgnoreAttribute.LogPropertyIgnoreAttribute();", + "Member": "Microsoft.Extensions.Logging.LogPropertyIgnoreAttribute.LogPropertyIgnoreAttribute();", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Measure : System.IEquatable", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Measure : System.IEquatable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Measure.Measure(string name, long value);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Measure.Measure(string name, long value);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Measure.Measure();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Measure.Measure();", "Stage": "Stable" }, { - "Member": "override bool Microsoft.Extensions.Telemetry.Latency.Measure.Equals(object? obj);", + "Member": "override bool Microsoft.Extensions.Diagnostics.Latency.Measure.Equals(object? obj);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Latency.Measure.Equals(Microsoft.Extensions.Telemetry.Latency.Measure other);", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.Measure.Equals(Microsoft.Extensions.Diagnostics.Latency.Measure other);", "Stage": "Stable" }, { - "Member": "override int Microsoft.Extensions.Telemetry.Latency.Measure.GetHashCode();", + "Member": "override int Microsoft.Extensions.Diagnostics.Latency.Measure.GetHashCode();", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Measure.operator ==(Microsoft.Extensions.Telemetry.Latency.Measure left, Microsoft.Extensions.Telemetry.Latency.Measure right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Measure.operator ==(Microsoft.Extensions.Diagnostics.Latency.Measure left, Microsoft.Extensions.Diagnostics.Latency.Measure right);", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Measure.operator !=(Microsoft.Extensions.Telemetry.Latency.Measure left, Microsoft.Extensions.Telemetry.Latency.Measure right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Measure.operator !=(Microsoft.Extensions.Diagnostics.Latency.Measure left, Microsoft.Extensions.Diagnostics.Latency.Measure right);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Measure.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Measure.Name { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Measure.Value { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Measure.Value { get; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.MeasureToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.MeasureToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken.MeasureToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken.MeasureToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken.MeasureToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken.MeasureToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.MeasureToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.MeasureToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.MeasureToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.MeasureToken.Position { get; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Metrics.Meter : System.Diagnostics.Metrics.Meter", + "Type": "class Microsoft.Extensions.Diagnostics.Metrics.Meter : System.Diagnostics.Metrics.Meter", "Stage": "Experimental", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.Meter.Meter();", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Meter.Meter();", "Stage": "Experimental" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Metrics.MetricsExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Metrics.MetricsExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Metrics.MetricsExtensions.RegisterMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Metrics.MetricsExtensions.RegisterMetrics(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Experimental" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.NullLatencyContextExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.NullLatencyContextExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.NullLatencyContextExtensions.AddNullLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.NullLatencyContextExtensions.AddNullLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Stable" } ] @@ -759,89 +759,89 @@ ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Tag", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Tag", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Tag.Tag(string name, string value);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Tag.Tag(string name, string value);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Tag.Tag();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Tag.Tag();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Tag.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Tag.Name { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Tag.Value { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Tag.Value { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Metrics.TagNameAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.TagNameAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Metrics.TagNameAttribute.TagNameAttribute(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.TagNameAttribute.TagNameAttribute(string name);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Metrics.TagNameAttribute.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Metrics.TagNameAttribute.Name { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.TagProviderAttribute : System.Attribute", "Stage": "Experimental", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute.TagProviderAttribute(System.Type providerType, string providerMethod);", + "Member": "Microsoft.Extensions.Logging.TagProviderAttribute.TagProviderAttribute(System.Type providerType, string providerMethod);", "Stage": "Experimental" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute.OmitReferenceName { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.TagProviderAttribute.OmitReferenceName { get; set; }", "Stage": "Experimental" }, { - "Member": "string Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute.ProviderMethod { get; }", + "Member": "string Microsoft.Extensions.Logging.TagProviderAttribute.ProviderMethod { get; }", "Stage": "Experimental" }, { - "Member": "System.Type Microsoft.Extensions.Telemetry.Logging.TagProviderAttribute.ProviderType { get; }", + "Member": "System.Type Microsoft.Extensions.Logging.TagProviderAttribute.ProviderType { get; }", "Stage": "Experimental" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.TagToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.TagToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken.TagToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken.TagToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken.TagToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken.TagToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.TagToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.TagToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.TagToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.TagToken.Position { get; }", "Stage": "Stable" } ] diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollector.cs index 68cad7ed9bd..e891fb9acd9 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollector.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Options; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; /// /// Collects log records sent to the fake logger. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorDebugView.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorDebugView.cs index a16da2c1755..04e680b8ee9 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorDebugView.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorDebugView.cs @@ -6,7 +6,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; [ExcludeFromCodeCoverage/* (Justification = "Only used in debugger") */] internal sealed class FakeLogCollectorDebugView diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorOptions.cs index ed433474f98..be5476e685a 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogCollectorOptions.cs @@ -7,7 +7,7 @@ #pragma warning disable CA2227 // Collection properties should be read only -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; /// /// Options for the fake logger. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogRecord.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogRecord.cs index 8f4c814a3d3..187c37416de 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogRecord.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogRecord.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; /// /// A single log record tracked by . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogger.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogger.cs index 9a3a124d778..56973c9e78d 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogger.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLogger.cs @@ -6,11 +6,9 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; /// /// A logger which captures everything logged to it and enables inspection. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerExtensions.cs index a41238460a7..fbdd4ef0ccf 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; /// /// Extensions for configuring fake logging, used in unit tests. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerProvider.cs index f2a3d803aa3..b21a8d28385 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerProvider.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; // bug in .NET 7 preview analyzer #pragma warning disable CA1063 diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerT.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerT.cs index 1a1be65d4ab..1d7c5336a97 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerT.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Logging/FakeLoggerT.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Testing.Logging; +namespace Microsoft.Extensions.Logging.Testing; #pragma warning disable SA1649 // File name should match first type name diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/CollectedMeasurement.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/CollectedMeasurement.cs index 02eacac38d4..b20bb08469e 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/CollectedMeasurement.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/CollectedMeasurement.cs @@ -7,7 +7,7 @@ using System.Globalization; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics.Testing; /// /// Represents a single measurement performed by an instrument. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MeasurementExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MeasurementExtensions.cs index 45b525d2ef4..5198851e550 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MeasurementExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MeasurementExtensions.cs @@ -5,7 +5,7 @@ using System.Diagnostics.Metrics; using System.Linq; -namespace Microsoft.Extensions.Telemetry.Testing.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics.Testing; /// /// Extensions to simplify working with lists of measurements. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MetricCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MetricCollector.cs index 090ff63fa70..5dea2d6efac 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MetricCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metrics/MetricCollector.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Testing.Metrics; +namespace Microsoft.Extensions.Diagnostics.Metrics.Testing; /// /// Collects the measurements published from an or . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.json b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.json index cc9dfbd48fc..e2c71305a84 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.json +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Microsoft.Extensions.Telemetry.Testing.json @@ -2,375 +2,375 @@ "Name": "Microsoft.Extensions.Telemetry.Testing, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", "Types": [ { - "Type": "sealed class Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement where T : struct", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement where T : struct", "Stage": "Stable", "Methods": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.ContainsTags(params System.Collections.Generic.KeyValuePair[] tags);", + "Member": "bool Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.ContainsTags(params System.Collections.Generic.KeyValuePair[] tags);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.ContainsTags(params string[] tags);", + "Member": "bool Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.ContainsTags(params string[] tags);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.MatchesTags(params System.Collections.Generic.KeyValuePair[] tags);", + "Member": "bool Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.MatchesTags(params System.Collections.Generic.KeyValuePair[] tags);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.MatchesTags(params string[] tags);", + "Member": "bool Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.MatchesTags(params string[] tags);", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.Collections.Generic.IReadOnlyDictionary Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.Tags { get; }", + "Member": "System.Collections.Generic.IReadOnlyDictionary Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.Tags { get; }", "Stage": "Stable" }, { - "Member": "System.DateTimeOffset Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.Timestamp { get; }", + "Member": "System.DateTimeOffset Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.Timestamp { get; }", "Stage": "Stable" }, { - "Member": "T Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement.Value { get; }", + "Member": "T Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement.Value { get; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector", + "Type": "class Microsoft.Extensions.Logging.Testing.FakeLogCollector", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.FakeLogCollector(Microsoft.Extensions.Options.IOptions options);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogCollector.FakeLogCollector(Microsoft.Extensions.Options.IOptions options);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.FakeLogCollector();", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogCollector.FakeLogCollector();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.Clear();", + "Member": "void Microsoft.Extensions.Logging.Testing.FakeLogCollector.Clear();", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.Create(Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions options);", + "Member": "static Microsoft.Extensions.Logging.Testing.FakeLogCollector Microsoft.Extensions.Logging.Testing.FakeLogCollector.Create(Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions options);", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.GetSnapshot(bool clear = false);", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Logging.Testing.FakeLogCollector.GetSnapshot(bool clear = false);", "Stage": "Stable" } ], "Properties": [ { - "Member": "int Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.Count { get; }", + "Member": "int Microsoft.Extensions.Logging.Testing.FakeLogCollector.Count { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector.LatestRecord { get; }", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogRecord Microsoft.Extensions.Logging.Testing.FakeLogCollector.LatestRecord { get; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions", + "Type": "class Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.FakeLogCollectorOptions();", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.FakeLogCollectorOptions();", "Stage": "Stable" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.CollectRecordsForDisabledLogLevels { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.CollectRecordsForDisabledLogLevels { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.ISet Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.FilteredCategories { get; set; }", + "Member": "System.Collections.Generic.ISet Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.FilteredCategories { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.ISet Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.FilteredLevels { get; set; }", + "Member": "System.Collections.Generic.ISet Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.FilteredLevels { get; set; }", "Stage": "Stable" }, { - "Member": "System.Func Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.OutputFormatter { get; set; }", + "Member": "System.Func Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.OutputFormatter { get; set; }", "Stage": "Stable" }, { - "Member": "System.Action? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.OutputSink { get; set; }", + "Member": "System.Action? Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.OutputSink { get; set; }", "Stage": "Stable" }, { - "Member": "System.TimeProvider Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollectorOptions.TimeProvider { get; set; }", + "Member": "System.TimeProvider Microsoft.Extensions.Logging.Testing.FakeLogCollectorOptions.TimeProvider { get; set; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger : Microsoft.Extensions.Logging.ILogger", + "Type": "class Microsoft.Extensions.Logging.Testing.FakeLogger : Microsoft.Extensions.Logging.ILogger", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.FakeLogger(Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector? collector = null, string? category = null);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogger.FakeLogger(Microsoft.Extensions.Logging.Testing.FakeLogCollector? collector = null, string? category = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.FakeLogger(System.Action outputSink, string? category = null);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogger.FakeLogger(System.Action outputSink, string? category = null);", "Stage": "Stable" }, { - "Member": "System.IDisposable? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.BeginScope(TState state);", + "Member": "System.IDisposable? Microsoft.Extensions.Logging.Testing.FakeLogger.BeginScope(TState state);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.ControlLevel(Microsoft.Extensions.Logging.LogLevel logLevel, bool enabled);", + "Member": "void Microsoft.Extensions.Logging.Testing.FakeLogger.ControlLevel(Microsoft.Extensions.Logging.LogLevel logLevel, bool enabled);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel);", + "Member": "bool Microsoft.Extensions.Logging.Testing.FakeLogger.IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func formatter);", + "Member": "void Microsoft.Extensions.Logging.Testing.FakeLogger.Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func formatter);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.Category { get; }", + "Member": "string? Microsoft.Extensions.Logging.Testing.FakeLogger.Category { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.Collector { get; }", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogCollector Microsoft.Extensions.Logging.Testing.FakeLogger.Collector { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.LatestRecord { get; }", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogRecord Microsoft.Extensions.Logging.Testing.FakeLogger.LatestRecord { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger : Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger, Microsoft.Extensions.Logging.ILogger, Microsoft.Extensions.Logging.ILogger", + "Type": "sealed class Microsoft.Extensions.Logging.Testing.FakeLogger : Microsoft.Extensions.Logging.Testing.FakeLogger, Microsoft.Extensions.Logging.ILogger, Microsoft.Extensions.Logging.ILogger", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.FakeLogger(Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector? collector = null);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogger.FakeLogger(Microsoft.Extensions.Logging.Testing.FakeLogCollector? collector = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger.FakeLogger(System.Action outputSink);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogger.FakeLogger(System.Action outputSink);", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions", + "Type": "static class Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Configuration.IConfigurationSection section);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Configuration.IConfigurationSection section);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action configure);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action configure);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.AddFakeLogging(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerExtensions.GetFakeLogCollector(this System.IServiceProvider services);", + "Member": "static Microsoft.Extensions.Logging.Testing.FakeLogCollector Microsoft.Extensions.Logging.Testing.FakeLoggerExtensions.GetFakeLogCollector(this System.IServiceProvider services);", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable, Microsoft.Extensions.Logging.ISupportExternalScope", + "Type": "class Microsoft.Extensions.Logging.Testing.FakeLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, System.IDisposable, Microsoft.Extensions.Logging.ISupportExternalScope", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.FakeLoggerProvider(Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector? collector = null);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.FakeLoggerProvider(Microsoft.Extensions.Logging.Testing.FakeLogCollector? collector = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogger Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.CreateLogger(string? categoryName);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogger Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.CreateLogger(string? categoryName);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.Dispose();", + "Member": "void Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.Dispose();", "Stage": "Stable" }, { - "Member": "virtual void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.Dispose(bool disposing);", + "Member": "virtual void Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.Dispose(bool disposing);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.~FakeLoggerProvider();", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.~FakeLoggerProvider();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider scopeProvider);", + "Member": "void Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider scopeProvider);", "Stage": "Stable" } ], "Properties": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogCollector Microsoft.Extensions.Telemetry.Testing.Logging.FakeLoggerProvider.Collector { get; }", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogCollector Microsoft.Extensions.Logging.Testing.FakeLoggerProvider.Collector { get; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord", + "Type": "class Microsoft.Extensions.Logging.Testing.FakeLogRecord", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.FakeLogRecord(Microsoft.Extensions.Logging.LogLevel level, Microsoft.Extensions.Logging.EventId id, object? state, System.Exception? exception, string message, System.Collections.Generic.IReadOnlyList scopes, string? category, bool enabled, System.DateTimeOffset timestamp);", + "Member": "Microsoft.Extensions.Logging.Testing.FakeLogRecord.FakeLogRecord(Microsoft.Extensions.Logging.LogLevel level, Microsoft.Extensions.Logging.EventId id, object? state, System.Exception? exception, string message, System.Collections.Generic.IReadOnlyList scopes, string? category, bool enabled, System.DateTimeOffset timestamp);", "Stage": "Stable" }, { - "Member": "override string Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.ToString();", + "Member": "override string Microsoft.Extensions.Logging.Testing.FakeLogRecord.ToString();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Category { get; }", + "Member": "string? Microsoft.Extensions.Logging.Testing.FakeLogRecord.Category { get; }", "Stage": "Stable" }, { - "Member": "System.Exception? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Exception { get; }", + "Member": "System.Exception? Microsoft.Extensions.Logging.Testing.FakeLogRecord.Exception { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Logging.EventId Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Id { get; }", + "Member": "Microsoft.Extensions.Logging.EventId Microsoft.Extensions.Logging.Testing.FakeLogRecord.Id { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Logging.LogLevel Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Level { get; }", + "Member": "Microsoft.Extensions.Logging.LogLevel Microsoft.Extensions.Logging.Testing.FakeLogRecord.Level { get; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.LevelEnabled { get; }", + "Member": "bool Microsoft.Extensions.Logging.Testing.FakeLogRecord.LevelEnabled { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Message { get; }", + "Member": "string Microsoft.Extensions.Logging.Testing.FakeLogRecord.Message { get; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Scopes { get; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Logging.Testing.FakeLogRecord.Scopes { get; }", "Stage": "Stable" }, { - "Member": "object? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.State { get; }", + "Member": "object? Microsoft.Extensions.Logging.Testing.FakeLogRecord.State { get; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList>? Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.StructuredState { get; }", + "Member": "System.Collections.Generic.IReadOnlyList>? Microsoft.Extensions.Logging.Testing.FakeLogRecord.StructuredState { get; }", "Stage": "Stable" }, { - "Member": "System.DateTimeOffset Microsoft.Extensions.Telemetry.Testing.Logging.FakeLogRecord.Timestamp { get; }", + "Member": "System.DateTimeOffset Microsoft.Extensions.Logging.Testing.FakeLogRecord.Timestamp { get; }", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions.ContainsTags(this System.Collections.Generic.IEnumerable> measurements, params System.Collections.Generic.KeyValuePair[] tags);", + "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions.ContainsTags(this System.Collections.Generic.IEnumerable> measurements, params System.Collections.Generic.KeyValuePair[] tags);", "Stage": "Stable" }, { - "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions.ContainsTags(this System.Collections.Generic.IEnumerable> measurements, params string[] tags);", + "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions.ContainsTags(this System.Collections.Generic.IEnumerable> measurements, params string[] tags);", "Stage": "Stable" }, { - "Member": "static T Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions.EvaluateAsCounter(this System.Collections.Generic.IEnumerable> measurements);", + "Member": "static T Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions.EvaluateAsCounter(this System.Collections.Generic.IEnumerable> measurements);", "Stage": "Stable" }, { - "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions.MatchesTags(this System.Collections.Generic.IEnumerable> measurements, params System.Collections.Generic.KeyValuePair[] tags);", + "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions.MatchesTags(this System.Collections.Generic.IEnumerable> measurements, params System.Collections.Generic.KeyValuePair[] tags);", "Stage": "Stable" }, { - "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Telemetry.Testing.Metrics.MeasurementExtensions.MatchesTags(this System.Collections.Generic.IEnumerable> measurements, params string[] tags);", + "Member": "static System.Collections.Generic.IEnumerable> Microsoft.Extensions.Diagnostics.Metrics.Testing.MeasurementExtensions.MatchesTags(this System.Collections.Generic.IEnumerable> measurements, params string[] tags);", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector : System.IDisposable where T : struct", + "Type": "sealed class Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector : System.IDisposable where T : struct", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.MetricCollector(System.Diagnostics.Metrics.Instrument instrument, System.TimeProvider? timeProvider = null);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.MetricCollector(System.Diagnostics.Metrics.Instrument instrument, System.TimeProvider? timeProvider = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.MetricCollector(System.Diagnostics.Metrics.ObservableInstrument instrument, System.TimeProvider? timeProvider = null);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.MetricCollector(System.Diagnostics.Metrics.ObservableInstrument instrument, System.TimeProvider? timeProvider = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.MetricCollector(object? meterScope, string meterName, string instrumentName, System.TimeProvider? timeProvider = null);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.MetricCollector(object? meterScope, string meterName, string instrumentName, System.TimeProvider? timeProvider = null);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.MetricCollector(System.Diagnostics.Metrics.Meter meter, string instrumentName, System.TimeProvider? timeProvider = null);", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.MetricCollector(System.Diagnostics.Metrics.Meter meter, string instrumentName, System.TimeProvider? timeProvider = null);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.Clear();", + "Member": "void Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.Clear();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.Dispose();", + "Member": "void Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.Dispose();", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList> Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.GetMeasurementSnapshot(bool clear = false);", + "Member": "System.Collections.Generic.IReadOnlyList> Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.GetMeasurementSnapshot(bool clear = false);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.RecordObservableInstruments();", + "Member": "void Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.RecordObservableInstruments();", "Stage": "Stable" }, { - "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.WaitForMeasurementsAsync(int minCount, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));", + "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.WaitForMeasurementsAsync(int minCount, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));", "Stage": "Stable" }, { - "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.WaitForMeasurementsAsync(int minCount, System.TimeSpan timeout);", + "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.WaitForMeasurementsAsync(int minCount, System.TimeSpan timeout);", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.Diagnostics.Metrics.Instrument? Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.Instrument { get; }", + "Member": "System.Diagnostics.Metrics.Instrument? Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.Instrument { get; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Testing.Metrics.CollectedMeasurement? Microsoft.Extensions.Telemetry.Testing.Metrics.MetricCollector.LastMeasurement { get; }", + "Member": "Microsoft.Extensions.Diagnostics.Metrics.Testing.CollectedMeasurement? Microsoft.Extensions.Diagnostics.Metrics.Testing.MetricCollector.LastMeasurement { get; }", "Stage": "Stable" } ] diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/CheckpointTracker.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/CheckpointTracker.cs index 350cd9e330e..ba2c1646760 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/CheckpointTracker.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/CheckpointTracker.cs @@ -4,9 +4,8 @@ using System; using System.Threading; using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Telemetry.Latency; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Class that tracks checkpoints. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyConsoleExporter.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyConsoleExporter.cs index f7205bc67f6..0766b074ae4 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyConsoleExporter.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyConsoleExporter.cs @@ -11,7 +11,7 @@ using Microsoft.Shared.Memoization; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; internal sealed class LatencyConsoleExporter : ILatencyDataExporter { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContext.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContext.cs index 23684a2decd..0777d03c571 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContext.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContext.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Telemetry.Latency; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Implementation of . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextPool.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextPool.cs index f0315563fd9..a062d11b072 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextPool.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextPool.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.ObjectPool; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Object pools for instruments used for latency measurement. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextProvider.cs index 33887e518b5..fda3a70a52b 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextProvider.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Telemetry.Latency; +using Microsoft.Extensions.Diagnostics.Latency; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Implementation of . diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextRegistrySet.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextRegistrySet.cs index 2cdf914e704..766d549c1ea 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextRegistrySet.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextRegistrySet.cs @@ -4,10 +4,9 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Class that holds registry of names used with APIs. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextTokenIssuer.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextTokenIssuer.cs index db9e267c0b0..7926b8fa06e 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextTokenIssuer.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyContextTokenIssuer.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Telemetry.Latency; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; internal sealed class LatencyContextTokenIssuer : ILatencyContextTokenIssuer { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyInstrumentProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyInstrumentProvider.cs index 16649216dc9..ccc4d010f41 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyInstrumentProvider.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/LatencyInstrumentProvider.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.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; internal sealed class LatencyInstrumentProvider { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/MeasureTracker.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/MeasureTracker.cs index e769a9a69c2..b36f2cc1c2f 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/MeasureTracker.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/MeasureTracker.cs @@ -4,9 +4,8 @@ using System; using System.Threading; using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Telemetry.Latency; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; internal sealed class MeasureTracker : IResettable { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/Registry.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/Registry.cs index e9eecaf4f5c..2475c6673c5 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/Registry.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/Registry.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Provides registry functionality. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/ResetOnGetObjectPool.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/ResetOnGetObjectPool.cs index f2f0e7d8aba..1fc62cd2c14 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/ResetOnGetObjectPool.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/ResetOnGetObjectPool.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.ObjectPool; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; internal sealed class ResetOnGetObjectPool : ObjectPool where T : class, IResettable diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/TagCollection.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/TagCollection.cs index 02956f19edc..ac74e24710f 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/TagCollection.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/Internal/TagCollection.cs @@ -3,9 +3,8 @@ using System; using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Telemetry.Latency; -namespace Microsoft.Extensions.Telemetry.Latency.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Internal; /// /// Class used to add tags. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleExtensions.cs index c78e685e03b..6a64e152772 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleExtensions.cs @@ -6,10 +6,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Extensions to add console latency data exporter. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleOptions.cs index 060d1036e73..bea7939d087 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyConsoleOptions.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.Extensions.Telemetry; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Options for console latency data exporter. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextExtensions.cs index 33c49628bfb..08ee60f6963 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextExtensions.cs @@ -6,11 +6,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Extensions to add latency context. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextOptions.cs index 60fff2468f6..4d2adbdf6e3 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Latency/LatencyContextOptions.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.Extensions.Telemetry.Latency; +namespace Microsoft.Extensions.Diagnostics.Latency; /// /// Options for LatencyContext. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.EnrichmentTagCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.EnrichmentTagCollector.cs index 17e3e54fc84..ff5dacb490d 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.EnrichmentTagCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.EnrichmentTagCollector.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.Extensions.Telemetry.Enrichment; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed partial class ExtendedLogger { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.LegacyTagJoiner.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.LegacyTagJoiner.cs index 35165f3f308..747e6e3f09d 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.LegacyTagJoiner.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.LegacyTagJoiner.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed partial class ExtendedLogger { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ModernTagJoiner.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ModernTagJoiner.cs index 3d9cec941cf..5c54715e802 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ModernTagJoiner.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ModernTagJoiner.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed partial class ExtendedLogger { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.Scope.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.Scope.cs index 115ef13e200..b555d86f0a8 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.Scope.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.Scope.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed partial class ExtendedLogger { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ThreadLocals.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ThreadLocals.cs index 1ec7be200e3..87500e83deb 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ThreadLocals.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.ThreadLocals.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; #pragma warning disable S2696 diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.cs index ba446cb3b32..792b07cccd5 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLogger.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; #pragma warning disable CA1031 diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLoggerFactory.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLoggerFactory.cs index c2628c75903..623bcc804f7 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLoggerFactory.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/ExtendedLoggerFactory.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.Telemetry.Enrichment; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed class ExtendedLoggerFactory : ILoggerFactory { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerInformation.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerInformation.cs index 2114bd753c5..1a4a8db0b9f 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerInformation.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/Import/LoggerInformation.cs @@ -11,7 +11,7 @@ using System; using System.Diagnostics; -using Microsoft.Extensions.Telemetry.Logging; +using Microsoft.Extensions.Logging; namespace Microsoft.Extensions.Logging { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/JustInTimeRedactor.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/JustInTimeRedactor.cs index 8f67073564d..fd7adb1ef09 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/JustInTimeRedactor.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/JustInTimeRedactor.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.ObjectPool; using Microsoft.Shared.Pools; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Performs delayed redaction in order to avoid allocating intermediate strings and redact from span to span. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerConfig.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerConfig.cs index a87b1eb3194..306b1328609 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerConfig.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerConfig.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Compliance.Redaction; using Microsoft.Extensions.Telemetry.Enrichment; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal sealed class LoggerConfig { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptions.cs index 524a0233dee..9031e9db15e 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptions.cs @@ -5,7 +5,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Shared.DiagnosticIds; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Options for logging enrichment features. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptionsValidator.cs index 78b31ac4319..8465b6ac891 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptionsValidator.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerEnrichmentOptionsValidator.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Options; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; [OptionsValidator] internal sealed partial class LoggerEnrichmentOptionsValidator : IValidateOptions diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerRedactionOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerRedactionOptions.cs index 2428f8c5be8..e3307dc11b4 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerRedactionOptions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerRedactionOptions.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.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; internal class LoggerRedactionOptions { diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEnrichmentExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEnrichmentExtensions.cs index 525253f3450..9bc13921134 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEnrichmentExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEnrichmentExtensions.cs @@ -10,7 +10,7 @@ using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Extensions for configuring logging enrichment features. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEventSource.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEventSource.cs index d6dd432e2fc..84506b63988 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEventSource.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingEventSource.cs @@ -4,7 +4,7 @@ using System; using System.Diagnostics.Tracing; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; [EventSource(Name = "Logging-Instrumentation")] internal sealed class LoggingEventSource : EventSource diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingRedactionExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingRedactionExtensions.cs index 76f33f8e29f..3c8c1145d2b 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingRedactionExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingRedactionExtensions.cs @@ -8,7 +8,7 @@ using Microsoft.Shared.DiagnosticIds; using Microsoft.Shared.Diagnostics; -namespace Microsoft.Extensions.Telemetry.Logging; +namespace Microsoft.Extensions.Logging; /// /// Extensions for configuring logging redaction features. diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json index fc528740ac7..d8f7e9d3e72 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json +++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.json @@ -2,129 +2,129 @@ "Name": "Microsoft.Extensions.Telemetry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", "Types": [ { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.LatencyConsoleExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleExtensions.AddConsoleLatencyDataExporter(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.LatencyConsoleOptions", + "Type": "class Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleOptions", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.LatencyConsoleOptions.LatencyConsoleOptions();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleOptions.LatencyConsoleOptions();", "Stage": "Stable" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.LatencyConsoleOptions.OutputCheckpoints { get; set; }", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleOptions.OutputCheckpoints { get; set; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.LatencyConsoleOptions.OutputMeasures { get; set; }", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleOptions.OutputMeasures { get; set; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.LatencyConsoleOptions.OutputTags { get; set; }", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.LatencyConsoleOptions.OutputTags { get; set; }", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.LatencyContextExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.LatencyContextExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyContextExtensions.AddLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.Configuration.IConfigurationSection section);", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Latency.LatencyContextOptions", + "Type": "class Microsoft.Extensions.Diagnostics.Latency.LatencyContextOptions", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyContextOptions.LatencyContextOptions();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyContextOptions.LatencyContextOptions();", "Stage": "Stable" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Latency.LatencyContextOptions.ThrowOnUnregisteredNames { get; set; }", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.LatencyContextOptions.ThrowOnUnregisteredNames { get; set; }", "Stage": "Stable" } ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Logging.LoggerEnrichmentOptions", + "Type": "class Microsoft.Extensions.Logging.LoggerEnrichmentOptions", "Stage": "Experimental", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerEnrichmentOptions.LoggerEnrichmentOptions();", + "Member": "Microsoft.Extensions.Logging.LoggerEnrichmentOptions.LoggerEnrichmentOptions();", "Stage": "Experimental" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LoggerEnrichmentOptions.CaptureStackTraces { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LoggerEnrichmentOptions.CaptureStackTraces { get; set; }", "Stage": "Experimental" }, { - "Member": "int Microsoft.Extensions.Telemetry.Logging.LoggerEnrichmentOptions.MaxStackTraceLength { get; set; }", + "Member": "int Microsoft.Extensions.Logging.LoggerEnrichmentOptions.MaxStackTraceLength { get; set; }", "Stage": "Experimental" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LoggerEnrichmentOptions.UseFileInfoForStackTraces { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LoggerEnrichmentOptions.UseFileInfoForStackTraces { get; set; }", "Stage": "Experimental" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Logging.LoggingEnrichmentExtensions", + "Type": "static class Microsoft.Extensions.Logging.LoggingEnrichmentExtensions", "Stage": "Experimental", "Methods": [ { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", "Stage": "Experimental" }, { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action configure);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action configure);", "Stage": "Experimental" }, { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Configuration.IConfigurationSection section);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.LoggingEnrichmentExtensions.EnableEnrichment(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Configuration.IConfigurationSection section);", "Stage": "Experimental" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Logging.LoggingRedactionExtensions", + "Type": "static class Microsoft.Extensions.Logging.LoggingRedactionExtensions", "Stage": "Experimental", "Methods": [ { - "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Telemetry.Logging.LoggingRedactionExtensions.EnableRedaction(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", + "Member": "static Microsoft.Extensions.Logging.ILoggingBuilder Microsoft.Extensions.Logging.LoggingRedactionExtensions.EnableRedaction(this Microsoft.Extensions.Logging.ILoggingBuilder builder);", "Stage": "Experimental" } ] diff --git a/test/Analyzers/Microsoft.Analyzers.Local.Tests/ApiLifecycle/ApiLifecycleAnalyzerTest.cs b/test/Analyzers/Microsoft.Analyzers.Local.Tests/ApiLifecycle/ApiLifecycleAnalyzerTest.cs index e738a4601d3..87afb05f182 100644 --- a/test/Analyzers/Microsoft.Analyzers.Local.Tests/ApiLifecycle/ApiLifecycleAnalyzerTest.cs +++ b/test/Analyzers/Microsoft.Analyzers.Local.Tests/ApiLifecycle/ApiLifecycleAnalyzerTest.cs @@ -14,8 +14,8 @@ using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.LocalAnalyzers.Resource.Test; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Logging; using Xunit; namespace Microsoft.Extensions.LocalAnalyzers.ApiLifecycle.Test; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/DataClassificationTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/DataClassificationTests.cs index 9e19128f47c..4dde90b83b2 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/DataClassificationTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/DataClassificationTests.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. -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/LogMethodTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/LogMethodTests.cs index 7da14374f6c..19e9d8e450b 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/LogMethodTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/LogMethodTests.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Threading; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesRedactionTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesRedactionTests.cs index 531c4719ce8..a8171954bfe 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesRedactionTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesRedactionTests.cs @@ -5,7 +5,7 @@ using System.Globalization; using FluentAssertions; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs index 224247034e4..41904fae313 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/LogPropertiesTests.cs @@ -9,8 +9,7 @@ using System.Numerics; using FluentAssertions; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Shared.Text; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/LoggerMessageAttributeTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/LoggerMessageAttributeTests.cs index 90008612ca3..fd1c71d398a 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/LoggerMessageAttributeTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/LoggerMessageAttributeTests.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/TagProviderTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/TagProviderTests.cs index 87c7fb40433..2ecbbfaf193 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/TagProviderTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/TagProviderTests.cs @@ -5,7 +5,7 @@ using System.Globalization; using FluentAssertions; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Shared.Text; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/Utils.cs b/test/Generators/Microsoft.Gen.Logging/Generated/Utils.cs index c9f9ae13868..c992d80362b 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/Utils.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/Utils.cs @@ -7,8 +7,7 @@ using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using TestClasses; namespace Microsoft.Gen.Logging.Test; diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/AtSymbolsTestExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/AtSymbolsTestExtensions.cs index 9af023379a7..fe3e1e19edb 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/AtSymbolsTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/AtSymbolsTestExtensions.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; #pragma warning disable IDE1006 // Naming Styles diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/DataClassificationTestExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/DataClassificationTestExtensions.cs index 679fa11348c..1d59c9faea9 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/DataClassificationTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/DataClassificationTestExtensions.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/FormattableTestExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/FormattableTestExtensions.cs index ea4af914912..5d04091cdd3 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/FormattableTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/FormattableTestExtensions.cs @@ -3,7 +3,6 @@ using System; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs index 92ee2f60578..eb8aa661cdd 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesExtensions.cs @@ -5,7 +5,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesNullHandlingExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesNullHandlingExtensions.cs index 70c248cd9e1..1d1393ec7e5 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesNullHandlingExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesNullHandlingExtensions.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesOmitParameterNameExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesOmitParameterNameExtensions.cs index e04445978e8..cf21ec33272 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesOmitParameterNameExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesOmitParameterNameExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRecordExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRecordExtensions.cs index f6a0d56ff9e..a34b0653710 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRecordExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRecordExtensions.cs @@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRedactionExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRedactionExtensions.cs index be2fab46149..3429e463e4d 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRedactionExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesRedactionExtensions.cs @@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSimpleExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSimpleExtensions.cs index 6b6f3303d0f..d7baa291b7b 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSimpleExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSimpleExtensions.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSpecialTypesExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSpecialTypesExtensions.cs index 7b4b444b06c..f8b16489ce6 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSpecialTypesExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/LogPropertiesSpecialTypesExtensions.cs @@ -5,7 +5,6 @@ using System.Net; using System.Numerics; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/NonStaticTestClass.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/NonStaticTestClass.cs index 0263d8f4c22..00190a50428 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/NonStaticTestClass.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/NonStaticTestClass.cs @@ -4,7 +4,6 @@ using System.Runtime.InteropServices; using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderExtensions.cs index c826702eb2c..cc0867f3c73 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; using Microsoft.Shared.Text; namespace TestClasses diff --git a/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderWithObjectExtensions.cs b/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderWithObjectExtensions.cs index 91684e25874..14de35b78e4 100644 --- a/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderWithObjectExtensions.cs +++ b/test/Generators/Microsoft.Gen.Logging/TestClasses/TagProviderWithObjectExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Logging; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Logging/Unit/AttributeParserTests.cs b/test/Generators/Microsoft.Gen.Logging/Unit/AttributeParserTests.cs index 037db4aceaa..e58765ab0e9 100644 --- a/test/Generators/Microsoft.Gen.Logging/Unit/AttributeParserTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Unit/AttributeParserTests.cs @@ -178,7 +178,7 @@ namespace Test {{ using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.Compliance.Redaction; using Microsoft.Extensions.Logging; - using Microsoft.Extensions.Telemetry.Logging; + using Microsoft.Extensions.Logging; {code} }} "; diff --git a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.cs b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.cs index 549eb5e2127..f72923f56d1 100644 --- a/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Unit/ParserTests.cs @@ -387,7 +387,7 @@ namespace Microsoft.Extensions.Logging public enum LogLevel {} public interface ILogger {} } - namespace Microsoft.Extensions.Telemetry.Logging + namespace Microsoft.Extensions.Logging { public class LoggerMessageAttribute : System.Attribute {} } @@ -409,7 +409,7 @@ namespace Microsoft.Extensions.Logging public enum LogLevel {} public interface ILogger {} } - namespace Microsoft.Extensions.Telemetry.Logging + namespace Microsoft.Extensions.Logging { public class LoggerMessageAttribute : System.Attribute {} public class LogPropertiesAttribute : System.Attribute {} @@ -440,7 +440,7 @@ partial class C public async Task MissingILoggerType() { await RunGenerator(@" - namespace Microsoft.Extensions.Telemetry.Logging + namespace Microsoft.Extensions.Logging { public sealed class LoggerMessageAttribute : System.Attribute {} } @@ -454,7 +454,7 @@ partial class C public async Task MissingLogLevelType() { await RunGenerator(@" - namespace Microsoft.Extensions.Telemetry.Logging + namespace Microsoft.Extensions.Logging { public sealed class LoggerMessageAttribute : System.Attribute {} } @@ -773,7 +773,7 @@ private static async Task RunGenerator( text = $@" {nspaceStart} using Microsoft.Extensions.Logging; - using Microsoft.Extensions.Telemetry.Logging; + using Microsoft.Extensions.Logging; {code} {nspaceEnd}"; } diff --git a/test/Generators/Microsoft.Gen.Metrics/Generated/MetricTests.cs b/test/Generators/Microsoft.Gen.Metrics/Generated/MetricTests.cs index 2af7f003812..2b296e9a423 100644 --- a/test/Generators/Microsoft.Gen.Metrics/Generated/MetricTests.cs +++ b/test/Generators/Microsoft.Gen.Metrics/Generated/MetricTests.cs @@ -8,7 +8,7 @@ using System.Diagnostics.Metrics; using System.Globalization; using System.Linq; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using TestClasses; using Xunit; diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/AttributedWithoutNamespace.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/AttributedWithoutNamespace.cs index ff37f74d09a..2260808ba89 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/AttributedWithoutNamespace.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/AttributedWithoutNamespace.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; [SuppressMessage("Usage", "CA1801:Review unused parameters", Justification = "For testing emitter for classes without namespace")] diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterDimensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterDimensions.cs index 950b6bca8b1..1685b7f669d 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterDimensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterDimensions.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. -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterTestExtensions.cs index dbb95cde573..1c3ccedf9c5 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/CounterTestExtensions.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 TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/FileScopedNamespaceExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/FileScopedNamespaceExtensions.cs index 7e7c04b4cc2..78b61b21fba 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/FileScopedNamespaceExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/FileScopedNamespaceExtensions.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 TestClasses; diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/HistogramTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/HistogramTestExtensions.cs index 0913d32bedc..d132c941bb6 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/HistogramTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/HistogramTestExtensions.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MeterTExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MeterTExtensions.cs index f86c026dce6..b9ca4d31156 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MeterTExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MeterTExtensions.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. -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordClassTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordClassTestExtensions.cs index 5ba7cb9359a..7f90522939e 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordClassTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordClassTestExtensions.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 TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordStructTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordStructTestExtensions.cs index 9a5a44ef651..f9002a40e21 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordStructTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricRecordStructTestExtensions.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 TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricStructTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricStructTestExtensions.cs index e6a2c50c5ee..0db6bbcfac9 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricStructTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/MetricStructTestExtensions.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 TestClasses { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedClassMetrics.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedClassMetrics.cs index 02187b5c2cb..7c97e2b90d8 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedClassMetrics.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedClassMetrics.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace NestedClass.Metrics { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordClassMetrics.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordClassMetrics.cs index c6b4b1343f8..e4240a3d783 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordClassMetrics.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordClassMetrics.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace NestedRecordClass.Metrics { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordStructMetrics.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordStructMetrics.cs index 12e3de65dae..745675fb4fd 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordStructMetrics.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedRecordStructMetrics.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace NestedRecordStruct.Metrics { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedStructMetrics.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedStructMetrics.cs index c3630d33091..1e20b6b1067 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedStructMetrics.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/NestedStructMetrics.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace NestedStruct.Metrics { diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/OverlappingNamesTestExtensions.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/OverlappingNamesTestExtensions.cs index ca27495d0e4..7d806617719 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/OverlappingNamesTestExtensions.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/OverlappingNamesTestExtensions.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; // Generator emits the code without compilation errors only when // a class named 'TestClassesNspace' is a 'part' of the namespace 'TestClassesNspace.Metrics'. diff --git a/test/Generators/Microsoft.Gen.Metrics/TestClasses/Public.cs b/test/Generators/Microsoft.Gen.Metrics/TestClasses/Public.cs index bbbc931a5cc..ab3d68f0086 100644 --- a/test/Generators/Microsoft.Gen.Metrics/TestClasses/Public.cs +++ b/test/Generators/Microsoft.Gen.Metrics/TestClasses/Public.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace PublicMetrics { diff --git a/test/Generators/Microsoft.Gen.Metrics/Unit/EmitterTests.cs b/test/Generators/Microsoft.Gen.Metrics/Unit/EmitterTests.cs index 6c60080defd..c98d83a5ad7 100644 --- a/test/Generators/Microsoft.Gen.Metrics/Unit/EmitterTests.cs +++ b/test/Generators/Microsoft.Gen.Metrics/Unit/EmitterTests.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Gen.Metrics.Model; using Microsoft.Gen.Shared; using Xunit; @@ -79,7 +79,7 @@ public void EmitMeter_GivenMetricTypeIsUnknown_ThrowsNotSupportedException(int i new MetricParameter { Name = "meter", - Type = "global::Microsoft.Extensions.Telemetry.Metrics.IMeter", + Type = "global::Microsoft.Extensions.Diagnostics.Metrics.IMeter", IsMeter = true } } diff --git a/test/Generators/Microsoft.Gen.Metrics/Unit/ParserTests.cs b/test/Generators/Microsoft.Gen.Metrics/Unit/ParserTests.cs index 1296348c080..865315511f6 100644 --- a/test/Generators/Microsoft.Gen.Metrics/Unit/ParserTests.cs +++ b/test/Generators/Microsoft.Gen.Metrics/Unit/ParserTests.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Gen.Shared; using Xunit; @@ -481,14 +481,14 @@ static partial NewMetric1 CreateNewMetric1(Meter meter) public async Task MissingMeterType() { var d = await RunGenerator(@" - namespace Microsoft.Extensions.Telemetry.Metrics + namespace Microsoft.Extensions.Diagnostics.Metrics { public sealed class CounterAttribute : System.Attribute {} public sealed class HistogramAttribute : System.Attribute {} } partial class C { - [Microsoft.Extensions.Telemetry.Metrics.Counter] + [Microsoft.Extensions.Diagnostics.Metrics.Counter] static partial MetricName1 CreateMetricName(Meter meter); }", wrap: false, @@ -507,13 +507,13 @@ namespace System.Diagnostics.Metrics { public class Meter {} } - namespace Microsoft.Extensions.Telemetry.Metrics + namespace Microsoft.Extensions.Diagnostics.Metrics { public class HistogramAttribute : System.Attribute {} } partial class C { - [Microsoft.Extensions.Telemetry.Metrics.Histogram] + [Microsoft.Extensions.Diagnostics.Metrics.Histogram] static partial MetricName1 CreateMetricName(Meter meter); }", wrap: false, @@ -531,13 +531,13 @@ namespace System.Diagnostics.Metrics { public class Meter {} } - namespace Microsoft.Extensions.Telemetry.Metrics + namespace Microsoft.Extensions.Diagnostics.Metrics { public class CounterAttribute : System.Attribute {} } partial class C { - [Microsoft.Extensions.Telemetry.Metrics.Counter] + [Microsoft.Extensions.Diagnostics.Metrics.Counter] static partial MetricName1 CreateMetricName(Meter meter); }", wrap: false, @@ -763,7 +763,7 @@ private static async Task> RunGenerator( text = $@" {nspaceStart} - using Microsoft.Extensions.Telemetry.Metrics; + using Microsoft.Extensions.Diagnostics.Metrics; using System.Diagnostics.Metrics; {code} {nspaceEnd} diff --git a/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json b/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json index 48c69cc003a..f8cf4ba3edb 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json +++ b/test/Generators/Microsoft.Gen.MetricsReports/GoldenReports/Microsoft.Extensions.Telemetry.Abstractions.json @@ -2,73 +2,73 @@ "Name": "Microsoft.Extensions.Telemetry.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35", "Types": [ { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Checkpoint : System.IEquatable", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Checkpoint : System.IEquatable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Checkpoint.Checkpoint(string name, long elapsed, long frequency);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Checkpoint(string name, long elapsed, long frequency);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Checkpoint.Checkpoint();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Checkpoint();", "Stage": "Stable" }, { - "Member": "override bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.Equals(object? obj);", + "Member": "override bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Equals(object? obj);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.Equals(Microsoft.Extensions.Telemetry.Latency.Checkpoint other);", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Equals(Microsoft.Extensions.Diagnostics.Latency.Checkpoint other);", "Stage": "Stable" }, { - "Member": "override int Microsoft.Extensions.Telemetry.Latency.Checkpoint.GetHashCode();", + "Member": "override int Microsoft.Extensions.Diagnostics.Latency.Checkpoint.GetHashCode();", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.operator ==(Microsoft.Extensions.Telemetry.Latency.Checkpoint left, Microsoft.Extensions.Telemetry.Latency.Checkpoint right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.operator ==(Microsoft.Extensions.Diagnostics.Latency.Checkpoint left, Microsoft.Extensions.Diagnostics.Latency.Checkpoint right);", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Checkpoint.operator !=(Microsoft.Extensions.Telemetry.Latency.Checkpoint left, Microsoft.Extensions.Telemetry.Latency.Checkpoint right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Checkpoint.operator !=(Microsoft.Extensions.Diagnostics.Latency.Checkpoint left, Microsoft.Extensions.Diagnostics.Latency.Checkpoint right);", "Stage": "Stable" } ], "Properties": [ { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Checkpoint.Elapsed { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Elapsed { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Checkpoint.Frequency { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Frequency { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Checkpoint.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Checkpoint.Name { get; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.CheckpointToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.CheckpointToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken.CheckpointToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.CheckpointToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken.CheckpointToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.CheckpointToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.CheckpointToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.CheckpointToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.CheckpointToken.Position { get; }", "Stage": "Stable" } ] @@ -319,71 +319,71 @@ ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContext : System.IDisposable", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContext : System.IDisposable", "Stage": "Stable", "Methods": [ { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.AddCheckpoint(Microsoft.Extensions.Telemetry.Latency.CheckpointToken token);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.AddCheckpoint(Microsoft.Extensions.Diagnostics.Latency.CheckpointToken token);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.AddMeasure(Microsoft.Extensions.Telemetry.Latency.MeasureToken token, long value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.AddMeasure(Microsoft.Extensions.Diagnostics.Latency.MeasureToken token, long value);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.Freeze();", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.Freeze();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.RecordMeasure(Microsoft.Extensions.Telemetry.Latency.MeasureToken token, long value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.RecordMeasure(Microsoft.Extensions.Diagnostics.Latency.MeasureToken token, long value);", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Latency.ILatencyContext.SetTag(Microsoft.Extensions.Telemetry.Latency.TagToken token, string value);", + "Member": "void Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.SetTag(Microsoft.Extensions.Diagnostics.Latency.TagToken token, string value);", "Stage": "Stable" } ], "Properties": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData Microsoft.Extensions.Telemetry.Latency.ILatencyContext.LatencyData { get; }", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData Microsoft.Extensions.Diagnostics.Latency.ILatencyContext.LatencyData { get; }", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContextProvider", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContextProvider", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.ILatencyContext Microsoft.Extensions.Telemetry.Latency.ILatencyContextProvider.CreateContext();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.ILatencyContext Microsoft.Extensions.Diagnostics.Latency.ILatencyContextProvider.CreateContext();", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.CheckpointToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetCheckpointToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.CheckpointToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetCheckpointToken(string name);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetMeasureToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetMeasureToken(string name);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken Microsoft.Extensions.Telemetry.Latency.ILatencyContextTokenIssuer.GetTagToken(string name);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken Microsoft.Extensions.Diagnostics.Latency.ILatencyContextTokenIssuer.GetTagToken(string name);", "Stage": "Stable" } ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Latency.ILatencyDataExporter", + "Type": "interface Microsoft.Extensions.Diagnostics.Latency.ILatencyDataExporter", "Stage": "Stable", "Methods": [ { - "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Telemetry.Latency.ILatencyDataExporter.ExportAsync(Microsoft.Extensions.Telemetry.Latency.LatencyData data, System.Threading.CancellationToken cancellationToken);", + "Member": "System.Threading.Tasks.Task Microsoft.Extensions.Diagnostics.Latency.ILatencyDataExporter.ExportAsync(Microsoft.Extensions.Diagnostics.Latency.LatencyData data, System.Threading.CancellationToken cancellationToken);", "Stage": "Stable" } ] @@ -399,11 +399,11 @@ ] }, { - "Type": "interface Microsoft.Extensions.Telemetry.Logging.ITagCollector", + "Type": "interface Microsoft.Extensions.Logging.ITagCollector", "Stage": "Stable", "Methods": [ { - "Member": "void Microsoft.Extensions.Telemetry.Logging.ITagCollector.Add(string propertyName, object? propertyValue);", + "Member": "void Microsoft.Extensions.Logging.ITagCollector.Add(string propertyName, object? propertyValue);", "Stage": "Stable" } ] @@ -449,293 +449,293 @@ ] }, { - "Type": "class Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions", + "Type": "class Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.LatencyContextRegistrationOptions();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.LatencyContextRegistrationOptions();", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.CheckpointNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.CheckpointNames { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.MeasureNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.MeasureNames { get; set; }", "Stage": "Stable" }, { - "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Telemetry.Latency.LatencyContextRegistrationOptions.TagNames { get; set; }", + "Member": "System.Collections.Generic.IReadOnlyList Microsoft.Extensions.Diagnostics.Latency.LatencyContextRegistrationOptions.TagNames { get; set; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.LatencyData", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.LatencyData", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData.LatencyData(System.ArraySegment tags, System.ArraySegment checkpoints, System.ArraySegment measures, long durationTimestamp, long durationTimestampFrequency);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData.LatencyData(System.ArraySegment tags, System.ArraySegment checkpoints, System.ArraySegment measures, long durationTimestamp, long durationTimestampFrequency);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.LatencyData.LatencyData();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.LatencyData.LatencyData();", "Stage": "Stable" } ], "Properties": [ { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Checkpoints { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Checkpoints { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.LatencyData.DurationTimestamp { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.LatencyData.DurationTimestamp { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.LatencyData.DurationTimestampFrequency { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.LatencyData.DurationTimestampFrequency { get; }", "Stage": "Stable" }, { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Measures { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Measures { get; }", "Stage": "Stable" }, { - "Member": "System.ReadOnlySpan Microsoft.Extensions.Telemetry.Latency.LatencyData.Tags { get; }", + "Member": "System.ReadOnlySpan Microsoft.Extensions.Diagnostics.Latency.LatencyData.Tags { get; }", "Stage": "Stable" } ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterCheckpointNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterCheckpointNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterMeasureNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterMeasureNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.LatencyRegistryExtensions.RegisterTagNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.LatencyRegistryExtensions.RegisterTagNames(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, params string[] names);", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.LoggerMessageAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, Microsoft.Extensions.Logging.LogLevel level, string message);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, Microsoft.Extensions.Logging.LogLevel level, string message);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, Microsoft.Extensions.Logging.LogLevel level);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, Microsoft.Extensions.Logging.LogLevel level);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(Microsoft.Extensions.Logging.LogLevel level, string message);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(Microsoft.Extensions.Logging.LogLevel level, string message);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(Microsoft.Extensions.Logging.LogLevel level);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(Microsoft.Extensions.Logging.LogLevel level);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(string message);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(string message);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, string message);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId, string message);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId);", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute(int eventId);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.LoggerMessageAttribute();", + "Member": "Microsoft.Extensions.Logging.LoggerMessageAttribute.LoggerMessageAttribute();", "Stage": "Experimental" } ], "Properties": [ { - "Member": "int Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.EventId { get; }", + "Member": "int Microsoft.Extensions.Logging.LoggerMessageAttribute.EventId { get; }", "Stage": "Stable" }, { - "Member": "string? Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.EventName { get; set; }", + "Member": "string? Microsoft.Extensions.Logging.LoggerMessageAttribute.EventName { get; set; }", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Logging.LogLevel? Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.Level { get; }", + "Member": "Microsoft.Extensions.Logging.LogLevel? Microsoft.Extensions.Logging.LoggerMessageAttribute.Level { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.Message { get; }", + "Member": "string Microsoft.Extensions.Logging.LoggerMessageAttribute.Message { get; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LoggerMessageAttribute.SkipEnabledCheck { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LoggerMessageAttribute.SkipEnabledCheck { get; set; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogMethodHelper : System.Collections.Generic.List>, Microsoft.Extensions.Telemetry.Logging.ITagCollector, Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentPropertyBag, Microsoft.Extensions.ObjectPool.IResettable", + "Type": "sealed class Microsoft.Extensions.Logging.LogMethodHelper : System.Collections.Generic.List>, Microsoft.Extensions.Logging.ITagCollector, Microsoft.Extensions.Telemetry.Enrichment.IEnrichmentPropertyBag, Microsoft.Extensions.ObjectPool.IResettable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.LogMethodHelper();", + "Member": "Microsoft.Extensions.Logging.LogMethodHelper.LogMethodHelper();", "Stage": "Stable" }, { - "Member": "void Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Add(string propertyName, object? propertyValue);", + "Member": "void Microsoft.Extensions.Logging.LogMethodHelper.Add(string propertyName, object? propertyValue);", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Telemetry.Logging.LogMethodHelper Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.GetHelper();", + "Member": "static Microsoft.Extensions.Logging.LogMethodHelper Microsoft.Extensions.Logging.LogMethodHelper.GetHelper();", "Stage": "Stable" }, { - "Member": "static void Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.ReturnHelper(Microsoft.Extensions.Telemetry.Logging.LogMethodHelper helper);", + "Member": "static void Microsoft.Extensions.Logging.LogMethodHelper.ReturnHelper(Microsoft.Extensions.Logging.LogMethodHelper helper);", "Stage": "Stable" }, { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Stringify(System.Collections.IEnumerable? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LogMethodHelper.Stringify(System.Collections.IEnumerable? enumerable);", "Stage": "Stable" }, { - "Member": "static string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", + "Member": "static string Microsoft.Extensions.Logging.LogMethodHelper.Stringify(System.Collections.Generic.IEnumerable>? enumerable);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.TryReset();", + "Member": "bool Microsoft.Extensions.Logging.LogMethodHelper.TryReset();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.ParameterName { get; set; }", + "Member": "string Microsoft.Extensions.Logging.LogMethodHelper.ParameterName { get; set; }", "Stage": "Stable" }, { - "Member": "static Microsoft.Extensions.Logging.LogDefineOptions Microsoft.Extensions.Telemetry.Logging.LogMethodHelper.SkipEnabledCheckOptions { get; }", + "Member": "static Microsoft.Extensions.Logging.LogDefineOptions Microsoft.Extensions.Logging.LogMethodHelper.SkipEnabledCheckOptions { get; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.LogPropertiesAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.LogPropertiesAttribute();", + "Member": "Microsoft.Extensions.Logging.LogPropertiesAttribute.LogPropertiesAttribute();", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.LogPropertiesAttribute(System.Type providerType, string providerMethod);", + "Member": "Microsoft.Extensions.Logging.LogPropertiesAttribute.LogPropertiesAttribute(System.Type providerType, string providerMethod);", "Stage": "Stable" } ], "Properties": [ { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.OmitParameterName { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LogPropertiesAttribute.OmitParameterName { get; set; }", "Stage": "Stable" }, { - "Member": "string? Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.ProviderMethod { get; }", + "Member": "string? Microsoft.Extensions.Logging.LogPropertiesAttribute.ProviderMethod { get; }", "Stage": "Stable" }, { - "Member": "System.Type? Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.ProviderType { get; }", + "Member": "System.Type? Microsoft.Extensions.Logging.LogPropertiesAttribute.ProviderType { get; }", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Logging.LogPropertiesAttribute.SkipNullProperties { get; set; }", + "Member": "bool Microsoft.Extensions.Logging.LogPropertiesAttribute.SkipNullProperties { get; set; }", "Stage": "Stable" } ] }, { - "Type": "sealed class Microsoft.Extensions.Telemetry.Logging.LogPropertyIgnoreAttribute : System.Attribute", + "Type": "sealed class Microsoft.Extensions.Logging.LogPropertyIgnoreAttribute : System.Attribute", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Logging.LogPropertyIgnoreAttribute.LogPropertyIgnoreAttribute();", + "Member": "Microsoft.Extensions.Logging.LogPropertyIgnoreAttribute.LogPropertyIgnoreAttribute();", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Measure : System.IEquatable", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Measure : System.IEquatable", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Measure.Measure(string name, long value);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Measure.Measure(string name, long value);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Measure.Measure();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Measure.Measure();", "Stage": "Stable" }, { - "Member": "override bool Microsoft.Extensions.Telemetry.Latency.Measure.Equals(object? obj);", + "Member": "override bool Microsoft.Extensions.Diagnostics.Latency.Measure.Equals(object? obj);", "Stage": "Stable" }, { - "Member": "bool Microsoft.Extensions.Telemetry.Latency.Measure.Equals(Microsoft.Extensions.Telemetry.Latency.Measure other);", + "Member": "bool Microsoft.Extensions.Diagnostics.Latency.Measure.Equals(Microsoft.Extensions.Diagnostics.Latency.Measure other);", "Stage": "Stable" }, { - "Member": "override int Microsoft.Extensions.Telemetry.Latency.Measure.GetHashCode();", + "Member": "override int Microsoft.Extensions.Diagnostics.Latency.Measure.GetHashCode();", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Measure.operator ==(Microsoft.Extensions.Telemetry.Latency.Measure left, Microsoft.Extensions.Telemetry.Latency.Measure right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Measure.operator ==(Microsoft.Extensions.Diagnostics.Latency.Measure left, Microsoft.Extensions.Diagnostics.Latency.Measure right);", "Stage": "Stable" }, { - "Member": "static bool Microsoft.Extensions.Telemetry.Latency.Measure.operator !=(Microsoft.Extensions.Telemetry.Latency.Measure left, Microsoft.Extensions.Telemetry.Latency.Measure right);", + "Member": "static bool Microsoft.Extensions.Diagnostics.Latency.Measure.operator !=(Microsoft.Extensions.Diagnostics.Latency.Measure left, Microsoft.Extensions.Diagnostics.Latency.Measure right);", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Measure.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Measure.Name { get; }", "Stage": "Stable" }, { - "Member": "long Microsoft.Extensions.Telemetry.Latency.Measure.Value { get; }", + "Member": "long Microsoft.Extensions.Diagnostics.Latency.Measure.Value { get; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.MeasureToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.MeasureToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken.MeasureToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken.MeasureToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.MeasureToken.MeasureToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.MeasureToken.MeasureToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.MeasureToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.MeasureToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.MeasureToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.MeasureToken.Position { get; }", "Stage": "Stable" } ] @@ -761,11 +761,11 @@ ] }, { - "Type": "static class Microsoft.Extensions.Telemetry.Latency.NullLatencyContextExtensions", + "Type": "static class Microsoft.Extensions.Diagnostics.Latency.NullLatencyContextExtensions", "Stage": "Stable", "Methods": [ { - "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Telemetry.Latency.NullLatencyContextExtensions.AddNullLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", + "Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.Diagnostics.Latency.NullLatencyContextExtensions.AddNullLatencyContext(this Microsoft.Extensions.DependencyInjection.IServiceCollection services);", "Stage": "Stable" } ] @@ -803,49 +803,49 @@ ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.Tag", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.Tag", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.Tag.Tag(string name, string value);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Tag.Tag(string name, string value);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.Tag.Tag();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.Tag.Tag();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Tag.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Tag.Name { get; }", "Stage": "Stable" }, { - "Member": "string Microsoft.Extensions.Telemetry.Latency.Tag.Value { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.Tag.Value { get; }", "Stage": "Stable" } ] }, { - "Type": "readonly struct Microsoft.Extensions.Telemetry.Latency.TagToken", + "Type": "readonly struct Microsoft.Extensions.Diagnostics.Latency.TagToken", "Stage": "Stable", "Methods": [ { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken.TagToken(string name, int position);", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken.TagToken(string name, int position);", "Stage": "Stable" }, { - "Member": "Microsoft.Extensions.Telemetry.Latency.TagToken.TagToken();", + "Member": "Microsoft.Extensions.Diagnostics.Latency.TagToken.TagToken();", "Stage": "Stable" } ], "Properties": [ { - "Member": "string Microsoft.Extensions.Telemetry.Latency.TagToken.Name { get; }", + "Member": "string Microsoft.Extensions.Diagnostics.Latency.TagToken.Name { get; }", "Stage": "Stable" }, { - "Member": "int Microsoft.Extensions.Telemetry.Latency.TagToken.Position { get; }", + "Member": "int Microsoft.Extensions.Diagnostics.Latency.TagToken.Position { get; }", "Stage": "Stable" } ] diff --git a/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterAttributedWithXmlDescriptions.cs b/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterAttributedWithXmlDescriptions.cs index 4feb3c4b1a3..0ab35cdcea1 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterAttributedWithXmlDescriptions.cs +++ b/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterAttributedWithXmlDescriptions.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterDimensionsAttributedWithXmlDescriptions.cs b/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterDimensionsAttributedWithXmlDescriptions.cs index 228369a9a46..a0661917467 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterDimensionsAttributedWithXmlDescriptions.cs +++ b/test/Generators/Microsoft.Gen.MetricsReports/TestClasses/MeterDimensionsAttributedWithXmlDescriptions.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Metrics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; namespace TestClasses { diff --git a/test/Generators/Microsoft.Gen.MetricsReports/Unit/GeneratorTests.cs b/test/Generators/Microsoft.Gen.MetricsReports/Unit/GeneratorTests.cs index a1236be5e80..9a291bbedf1 100644 --- a/test/Generators/Microsoft.Gen.MetricsReports/Unit/GeneratorTests.cs +++ b/test/Generators/Microsoft.Gen.MetricsReports/Unit/GeneratorTests.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Gen.Shared; using Xunit; using Xunit.Abstractions; diff --git a/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingExtensionsTests.cs b/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingExtensionsTests.cs index 832f7377484..5dfa68128f1 100644 --- a/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingExtensionsTests.cs +++ b/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingExtensionsTests.cs @@ -7,8 +7,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingFeatureTests.cs b/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingFeatureTests.cs index 752309201a0..ac0e6dddf39 100644 --- a/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingFeatureTests.cs +++ b/test/Libraries/Microsoft.AspNetCore.HeaderParsing.Tests/HeaderParsingFeatureTests.cs @@ -7,11 +7,11 @@ using Microsoft.AspNetCore.HeaderParsing.Parsers; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Logging; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Microsoft.Net.Http.Headers; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/AcceptanceTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/AcceptanceTest.cs index 2b3f9886389..e3e43a9c204 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/AcceptanceTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/AcceptanceTest.cs @@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting.Testing; -using Microsoft.Extensions.Telemetry.Latency; using Xunit; namespace Microsoft.AspNetCore.Telemetry.Latency.Test; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AcceptanceTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AcceptanceTest.cs index 753b5b99b66..1feef2fa03f 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AcceptanceTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AcceptanceTest.cs @@ -10,10 +10,10 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting.Testing; using Microsoft.Extensions.Primitives; -using Microsoft.Extensions.Telemetry.Latency; using Xunit; namespace Microsoft.AspNetCore.Telemetry.Test; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AddServerTimingHeaderMiddlewareTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AddServerTimingHeaderMiddlewareTest.cs index e8ba38fc6b9..b99cb22f6c9 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AddServerTimingHeaderMiddlewareTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/AddServerTimingHeaderMiddlewareTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Telemetry; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Telemetry.Latency; +using Microsoft.Extensions.Diagnostics.Latency; using Xunit; namespace Microsoft.AspNetCore.Telemetry.Test; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/LatencyContextControlExtensionsTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/LatencyContextControlExtensionsTest.cs index 3562a4e382a..1723d758400 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/LatencyContextControlExtensionsTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Checkpoint/LatencyContextControlExtensionsTest.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNetCore.Telemetry; -using Microsoft.Extensions.Telemetry.Latency; +using Microsoft.Extensions.Diagnostics.Latency; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Internal/RequestLatencyTelemetryMiddlewareTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Internal/RequestLatencyTelemetryMiddlewareTest.cs index 9715edc051f..aa39f9f16f4 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Internal/RequestLatencyTelemetryMiddlewareTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/Internal/RequestLatencyTelemetryMiddlewareTest.cs @@ -9,9 +9,9 @@ using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Telemetry.Internal; using Microsoft.Extensions.AmbientMetadata; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Http.Telemetry; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/RequestLatencyTelemetryExtensionsTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/RequestLatencyTelemetryExtensionsTest.cs index 03ae1aa3fd5..3cae702fe23 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/RequestLatencyTelemetryExtensionsTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Latency/RequestLatencyTelemetryExtensionsTest.cs @@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Telemetry.Internal; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; using Xunit; namespace Microsoft.AspNetCore.Telemetry.Test; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.Mvc.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.Mvc.cs index d3880c45a96..6c2cc5bbc76 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.Mvc.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.Mvc.cs @@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http.Telemetry; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Shared.Text; using Xunit; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.cs index 0acd268c9cc..78519cd93ce 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/AcceptanceTest.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.Hosting.Testing; using Microsoft.Extensions.Http.Telemetry; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Microsoft.Net.Http.Headers; using Microsoft.Shared.Text; diff --git a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/IncomingRequestStructTest.cs b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/IncomingRequestStructTest.cs index 8f17afa4365..9a36d4f82be 100644 --- a/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/IncomingRequestStructTest.cs +++ b/test/Libraries/Microsoft.AspNetCore.Telemetry.Middleware.Tests/Logging/IncomingRequestStructTest.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; -using Microsoft.Extensions.Telemetry.Logging; +using Microsoft.Extensions.Logging; using Xunit; namespace Microsoft.AspNetCore.Telemetry.Http.Logging.Test; diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common.Tests/TelemetryHealthChecksPublisherTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common.Tests/TelemetryHealthChecksPublisherTest.cs index eba9f9afb13..53470701bd3 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common.Tests/TelemetryHealthChecksPublisherTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common.Tests/TelemetryHealthChecksPublisherTest.cs @@ -6,10 +6,10 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; +using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Logging; -using Microsoft.Extensions.Telemetry.Testing.Metrics; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.Extensions.Diagnostics.HealthChecks.Common.Tests; diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Kubernetes/TcpEndpointHealthCheckServiceTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Kubernetes/TcpEndpointHealthCheckServiceTest.cs index aaabba01da3..0500b2970d8 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Kubernetes/TcpEndpointHealthCheckServiceTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Kubernetes/TcpEndpointHealthCheckServiceTest.cs @@ -6,7 +6,7 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Core/ResourceMonitoringServiceTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Core/ResourceMonitoringServiceTest.cs index af8635c176f..a7c6443cf59 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Core/ResourceMonitoringServiceTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Core/ResourceMonitoringServiceTest.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Publishers; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxCountersTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxCountersTest.cs index e01c7962652..61b06e1c4fe 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxCountersTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxCountersTest.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Diagnostics.Metrics; using System.IO; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal; -using Microsoft.Extensions.Telemetry.Metrics; using Microsoft.TestUtilities; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsCountersTest.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsCountersTest.cs index 450c4eed1be..2b33496de09 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsCountersTest.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Windows/WindowsCountersTest.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal; -using Microsoft.Extensions.Telemetry.Metrics; using Xunit; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Test; diff --git a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostBuilderTest.cs b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostBuilderTest.cs index c6dfe564543..1ca6d5a3f06 100644 --- a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostBuilderTest.cs +++ b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostBuilderTest.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Hosting.Testing.Internal; using Microsoft.Extensions.Hosting.Testing.Test.TestResources; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostTest.cs b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostTest.cs index c9ff3ca98e9..bbfc3e2ab0b 100644 --- a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostTest.cs +++ b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/FakeHostTest.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/HostTerminatorServiceTest.cs b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/HostTerminatorServiceTest.cs index 93a9de03f18..f6e5c2c441b 100644 --- a/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/HostTerminatorServiceTest.cs +++ b/test/Libraries/Microsoft.Extensions.Hosting.Testing.Tests/HostTerminatorServiceTest.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Hosting.Testing.Internal; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientBuilderExtensionsTest.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientBuilderExtensionsTest.cs index f15a1722201..0450eef3ca7 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientBuilderExtensionsTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientBuilderExtensionsTest.cs @@ -9,8 +9,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Resilience.FaultInjection; -using Microsoft.Extensions.Telemetry.Metrics; using Polly; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientFaultInjectionExtensionsTest.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientFaultInjectionExtensionsTest.cs index 667d5631e0e..5f6f1437fe6 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientFaultInjectionExtensionsTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/HttpClientFaultInjectionExtensionsTest.cs @@ -9,9 +9,9 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Options; using Microsoft.Extensions.Resilience.FaultInjection; -using Microsoft.Extensions.Telemetry.Metrics; using Xunit; namespace Microsoft.Extensions.Http.Resilience.FaultInjection.Test; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/FaultInjectionTelemetryHandlerTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/FaultInjectionTelemetryHandlerTests.cs index e14c3a9974e..d96dbf6bf5b 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/FaultInjectionTelemetryHandlerTests.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/FaultInjectionTelemetryHandlerTests.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using FluentAssertions; +using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Resilience.FaultInjection; -using Microsoft.Extensions.Telemetry.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Logging; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/HttpClientChaosPolicyFactoryTest.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/HttpClientChaosPolicyFactoryTest.cs index 85300b2607f..832802e85a4 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/HttpClientChaosPolicyFactoryTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/FaultInjection/Internal/HttpClientChaosPolicyFactoryTest.cs @@ -5,9 +5,9 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Http.Resilience.FaultInjection.Internal; using Microsoft.Extensions.Resilience.FaultInjection; -using Microsoft.Extensions.Telemetry.Metrics; using Polly; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs index e9564f7cb1f..c2dee90fbc2 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Hedging/HedgingTests.cs @@ -12,10 +12,10 @@ using FluentAssertions; using Microsoft.Extensions.Compliance.Redaction; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Http.Resilience.Internal; using Microsoft.Extensions.Http.Resilience.Routing.Internal; using Microsoft.Extensions.Http.Resilience.Test.Helpers; -using Microsoft.Extensions.Telemetry.Metrics; using Moq; using Polly; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs index 9ba34d5e946..ba38d085c1b 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs @@ -12,14 +12,13 @@ using Microsoft.Extensions.Compliance.Redaction; using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Http.Resilience; +using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Http.Resilience.Internal; using Microsoft.Extensions.Http.Resilience.Test.Helpers; using Microsoft.Extensions.Http.Telemetry; using Microsoft.Extensions.Options; using Microsoft.Extensions.Resilience; -using Microsoft.Extensions.Telemetry.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; using Polly; using Polly.Registry; diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs index 256505fbc35..64a20270018 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs @@ -9,13 +9,12 @@ using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Http.Resilience.Internal; using Microsoft.Extensions.Http.Resilience.Test.Helpers; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Metrics; using Polly; using Polly.Registry; -using Polly.Retry; using Polly.Testing; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/HttpClientLatencyTelemetryExtensionsTest.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/HttpClientLatencyTelemetryExtensionsTest.cs index 5ef58682f10..e6ca42b18d1 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/HttpClientLatencyTelemetryExtensionsTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/HttpClientLatencyTelemetryExtensionsTest.cs @@ -8,9 +8,9 @@ using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Http.Telemetry.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpClientLatencyLogEnricherTest.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpClientLatencyLogEnricherTest.cs index b7d50742982..ee29847d5ea 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpClientLatencyLogEnricherTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpClientLatencyLogEnricherTest.cs @@ -3,9 +3,9 @@ using System; using System.Net.Http; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Http.Telemetry.Latency.Internal; using Microsoft.Extensions.Telemetry.Enrichment; -using Microsoft.Extensions.Telemetry.Latency; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpMockProvider.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpMockProvider.cs index a7f203bb510..a5470ff6e9d 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpMockProvider.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpMockProvider.cs @@ -3,8 +3,8 @@ using System.Diagnostics.Tracing; using System.Threading; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Http.Telemetry.Latency.Internal; -using Microsoft.Extensions.Telemetry.Latency; using Moq; namespace Microsoft.Extensions.Http.Telemetry.Latency.Test.Internal; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpRequestLatencyListenerTest.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpRequestLatencyListenerTest.cs index 70d1c46068f..4da4b1ffa7d 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpRequestLatencyListenerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Latency/Internal/HttpRequestLatencyListenerTest.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Linq; +using Microsoft.Extensions.Diagnostics.Latency; using Microsoft.Extensions.Http.Telemetry.Latency.Internal; -using Microsoft.Extensions.Telemetry.Latency; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/AcceptanceTests.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/AcceptanceTests.cs index b9c2ef09224..dfb6c25c07a 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/AcceptanceTests.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/AcceptanceTests.cs @@ -13,8 +13,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http.Telemetry.Logging.Test.Internal; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Xunit; namespace Microsoft.Extensions.Http.Telemetry.Logging.Test; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpClientLoggerTest.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpClientLoggerTest.cs index c8f5d6d4341..1e70ee2e8e1 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpClientLoggerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpClientLoggerTest.cs @@ -19,9 +19,9 @@ using Microsoft.Extensions.Http.Telemetry.Test.Logging.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Telemetry.Enrichment; using Microsoft.Extensions.Telemetry.Internal; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Microsoft.Extensions.Time.Testing; using Microsoft.Shared.Collections; using Moq; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpRequestReaderTest.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpRequestReaderTest.cs index c3bf5bf0c83..603b1f05d4b 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpRequestReaderTest.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/HttpRequestReaderTest.cs @@ -15,9 +15,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Http.Telemetry.Logging.Internal; using Microsoft.Extensions.Http.Telemetry.Logging.Test.Internal; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Telemetry; using Microsoft.Extensions.Telemetry.Internal; -using Microsoft.Extensions.Telemetry.Logging; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/LogRecordExtensions.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/LogRecordExtensions.cs index 6f2768067e5..d1155e5ddce 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/LogRecordExtensions.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/LogRecordExtensions.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Http.Telemetry.Logging.Internal; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.Extensions.Http.Telemetry.Logging.Test.Internal; diff --git a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/TestEnricher.cs b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/TestEnricher.cs index 0491ce06dde..d386a0eaea4 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/TestEnricher.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Telemetry.Tests/Logging/Internal/TestEnricher.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Net.Http; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Telemetry.Enrichment; -using Microsoft.Extensions.Telemetry.Logging; namespace Microsoft.Extensions.Http.Telemetry.Logging.Test.Internal; diff --git a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/FaultInjectionExtensionsTest.cs b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/FaultInjectionExtensionsTest.cs index ee87313fc57..60e3d84f1fc 100644 --- a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/FaultInjectionExtensionsTest.cs +++ b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/FaultInjectionExtensionsTest.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Metrics; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Metrics; using Polly; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/ChaosPolicyFactoryTest.cs b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/ChaosPolicyFactoryTest.cs index 9d9d0900502..cb534259828 100644 --- a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/ChaosPolicyFactoryTest.cs +++ b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/ChaosPolicyFactoryTest.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Telemetry.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics; using Polly; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/FaultInjectionTelemetryHandlerTests.cs b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/FaultInjectionTelemetryHandlerTests.cs index 071cd193ea9..ac00d750e63 100644 --- a/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/FaultInjectionTelemetryHandlerTests.cs +++ b/test/Libraries/Microsoft.Extensions.Resilience.Tests/FaultInjection/Internals/FaultInjectionTelemetryHandlerTests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.Extensions.Diagnostics.Metrics; +using Microsoft.Extensions.Diagnostics.Metrics.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Metrics; -using Microsoft.Extensions.Telemetry.Testing.Metrics; using Moq; using Xunit; diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/CheckpointTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/CheckpointTest.cs index 28e4fdfa10d..35c7a75b92c 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/CheckpointTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/CheckpointTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class CheckpointTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyDataTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyDataTest.cs index 1ef27ffb35c..fc751e70fcd 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyDataTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyDataTest.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class LatencyDataTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyRegistryExtensionsTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyRegistryExtensionsTest.cs index 101b1cec663..3f44658b0eb 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyRegistryExtensionsTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/LatencyRegistryExtensionsTest.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class LatencyRegistryExtensionsTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/MeasureTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/MeasureTest.cs index af80b422d8a..834bbf95eb3 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/MeasureTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/MeasureTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class MeasureTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/NoopLatencyContextTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/NoopLatencyContextTest.cs index b27b5e6d539..6071e99a5c8 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/NoopLatencyContextTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/NoopLatencyContextTest.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class NoopLatencyContextTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/TagTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/TagTest.cs index abd6a19ed2c..c08e61f41c2 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/TagTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Latency/TagTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class TagTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogMethodHelperTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogMethodHelperTests.cs index 1b4cd1f503e..0f05b5fe8d7 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogMethodHelperTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogMethodHelperTests.cs @@ -1,15 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Collections; using System.Collections.Generic; using Microsoft.Extensions.Compliance.Classification; using Microsoft.Extensions.Telemetry.Enrichment; -using Microsoft.Extensions.Telemetry.Logging; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public static class LogMethodHelperTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogPropertiesAttributeTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogPropertiesAttributeTests.cs index e2bd33e0406..b3efaaffa31 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogPropertiesAttributeTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LogPropertiesAttributeTests.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public class LogPropertiesAttributeTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageHelperTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageHelperTests.cs index 4cb77f2c841..a4826f03a53 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageHelperTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageHelperTests.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public static class LoggerMessageHelperTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageStateTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageStateTests.cs index b3b60abd4fb..3c7e537e77f 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageStateTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/LoggerMessageStateTests.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Telemetry.Enrichment; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public static class LoggerMessageStateTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/TagProviderAttributeTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/TagProviderAttributeTests.cs index 07d7925c896..dc94fab9dec 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/TagProviderAttributeTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Logging/TagProviderAttributeTests.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public class TagProviderAttributeTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Metrics/MetricAttributeTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Metrics/MetricAttributeTests.cs index 5a894860646..4d60eaa06a1 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Metrics/MetricAttributeTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Abstractions.Tests/Metrics/MetricAttributeTests.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Metrics.Test; +namespace Microsoft.Extensions.Diagnostics.Metrics.Test; public class MetricAttributeTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorOptionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorOptionsTests.cs index 4a49aa14f26..34491a08c08 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorOptionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorOptionsTests.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; public class FakeLogCollectorOptionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorTests.cs index 3ac3098c749..4bfdecd6e2f 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLogCollectorTests.cs @@ -3,14 +3,11 @@ using System; using System.Globalization; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Microsoft.Extensions.Time.Testing; using Xunit; using Xunit.Abstractions; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; public class FakeLogCollectorTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerExtensionsTests.cs index 3d98fea2cda..560eda63905 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerExtensionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerExtensionsTests.cs @@ -6,10 +6,10 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; public class FakeLoggerExtensionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerProviderTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerProviderTests.cs index 4313ac751ff..8a7beeefb39 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerProviderTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerProviderTests.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; public class FakeLoggerProviderTests { @@ -29,7 +29,7 @@ public void Basic() Assert.Equal(logger.Collector, loggerProvider.Collector); logger.LogDebug("M3"); Assert.Equal(3, logger.Collector.Count); - Assert.Equal("Microsoft.Extensions.Telemetry.Testing.Logging.Test.FakeLoggerProviderTests", logger.LatestRecord.Category); + Assert.Equal("Microsoft.Extensions.Logging.Testing.Test.FakeLoggerProviderTests", logger.LatestRecord.Category); } [Fact] diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerTests.cs index c3fbfd39afa..6340b9a0e6a 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/FakeLoggerTests.cs @@ -7,11 +7,11 @@ using System.Linq; using System.Threading; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; public class FakeLoggerTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/TestLog.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/TestLog.cs index daf38da934f..2db9b294392 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/TestLog.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Logging/TestLog.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Testing.Logging.Test; +namespace Microsoft.Extensions.Logging.Testing.Test; internal static partial class TestLog { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MeasurementExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MeasurementExtensionsTests.cs index b44cceda6f7..e9c0882919c 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MeasurementExtensionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MeasurementExtensionsTests.cs @@ -7,7 +7,7 @@ using System.Linq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Metrics.Test; +namespace Microsoft.Extensions.Diagnostics.Metrics.Testing.Test; public static class MeasurementExtensionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MetricCollectorTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MetricCollectorTests.cs index d99fbd6b2bf..a21977a9a62 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MetricCollectorTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Testing.Tests/Metrics/MetricCollectorTests.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Time.Testing; using Xunit; -namespace Microsoft.Extensions.Telemetry.Testing.Metrics.Test; +namespace Microsoft.Extensions.Diagnostics.Metrics.Testing.Test; public static class MetricCollectorTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/CheckpointTrackerTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/CheckpointTrackerTest.cs index 5abb89b74e3..8793f3b1f65 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/CheckpointTrackerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/CheckpointTrackerTest.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Linq; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class CheckpointTrackerTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyConsoleExporterTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyConsoleExporterTests.cs index 703a7303a63..a75f601966e 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyConsoleExporterTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyConsoleExporterTests.cs @@ -5,11 +5,11 @@ using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; [Collection("StdoutUsage")] public class LatencyConsoleExporterTests diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextExtensions.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextExtensions.cs index d50b526d9da..d12426acbc5 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextExtensions.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextExtensions.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency.Internal; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; internal static class LatencyContextExtensions { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextPoolTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextPoolTest.cs index aee8bf679ca..266f4d011e7 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextPoolTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextPoolTest.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class LatencyContextPoolTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextProviderTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextProviderTest.cs index 9a639cdb274..924e439e0df 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextProviderTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextProviderTest.cs @@ -2,13 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class LatencyContextProviderTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextRegistrySetTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextRegistrySetTest.cs index aadddbb43b2..2fa5bdd6f0c 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextRegistrySetTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextRegistrySetTest.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class LatencyContextRegistrySetTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTest.cs index 365977069c6..f0e1da46baf 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTest.cs @@ -3,15 +3,14 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Microsoft.Shared.Pools; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class LatencyContextTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTokenIssuerTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTokenIssuerTest.cs index 05eb5695bcd..206c2ffb52f 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTokenIssuerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/LatencyContextTokenIssuerTest.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class LatencyContextTokenIssuerTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MeasureTrackerTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MeasureTrackerTest.cs index 6eb05a7b752..042bbe9d152 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MeasureTrackerTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MeasureTrackerTest.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Linq; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class MeasureTrackerTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MockLatencyContextRegistrationOptions.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MockLatencyContextRegistrationOptions.cs index 8d0927470c5..6d4ed5908f8 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MockLatencyContextRegistrationOptions.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/MockLatencyContextRegistrationOptions.cs @@ -2,10 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; using Moq; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; internal static class MockLatencyContextRegistrationOptions { public static IOptions GetLatencyContextRegistrationOptions( diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/RegistryTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/RegistryTest.cs index dbb9b702486..5a3d36115cd 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/RegistryTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/RegistryTest.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class RegistryTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/TagCollectionTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/TagCollectionTest.cs index e6713f752ce..9bbd6f4e546 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/TagCollectionTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/Internal/TagCollectionTest.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; +using Microsoft.Extensions.Diagnostics.Latency; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test.Internal; +namespace Microsoft.Extensions.Diagnostics.Latency.Test.Internal; public class TagCollectionTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleExtensionsTests.cs index 8b4852971f4..43635c6f768 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleExtensionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleExtensionsTests.cs @@ -5,12 +5,11 @@ using System.Collections.Generic; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class LatencyConsoleExtensionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleOptionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleOptionsTests.cs index 11f3d644955..ea1078d0ffa 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleOptionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyConsoleOptionsTests.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class LatencyConsoleOptionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyContextExtensionTest.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyContextExtensionTest.cs index 95c25671a40..59195ede310 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyContextExtensionTest.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Latency/LatencyContextExtensionTest.cs @@ -6,12 +6,11 @@ using System.Globalization; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.Latency.Internal; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Telemetry.Latency; -using Microsoft.Extensions.Telemetry.Latency.Internal; using Xunit; -namespace Microsoft.Extensions.Telemetry.Latency.Test; +namespace Microsoft.Extensions.Diagnostics.Latency.Test; public class LatencyContextExtensionTest { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerFactoryTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerFactoryTests.cs index 52b53286d89..9e32068c4da 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerFactoryTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerFactoryTests.cs @@ -8,11 +8,11 @@ using System.Text; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Telemetry.Testing.Logging; +using Microsoft.Extensions.Logging.Testing; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; public static class ExtendedLoggerFactoryTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerTests.cs index e6ed25354a1..024e2ce9740 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/ExtendedLoggerTests.cs @@ -6,14 +6,13 @@ using System.Linq; using Microsoft.Extensions.Compliance.Testing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; using Microsoft.Extensions.Telemetry.Enrichment; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Moq; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test.Log; +namespace Microsoft.Extensions.Logging.Test.Log; public static class ExtendedLoggerTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/LoggerEnrichmentOptionsTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/LoggerEnrichmentOptionsTests.cs index c18956d6c04..7f856c03653 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/LoggerEnrichmentOptionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/LoggerEnrichmentOptionsTests.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test.Log; +namespace Microsoft.Extensions.Logging.Test.Log; public static class LoggerEnrichmentOptionsTests { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/SerialExtendedLoggerTests.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/SerialExtendedLoggerTests.cs index c4a84b68ce3..414d5b8fce7 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/SerialExtendedLoggerTests.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/SerialExtendedLoggerTests.cs @@ -4,13 +4,12 @@ using System; using System.Diagnostics.Tracing; using Microsoft.Extensions.Compliance.Testing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; using Microsoft.Extensions.Telemetry.Enrichment; -using Microsoft.Extensions.Telemetry.Testing.Logging; using Xunit; -namespace Microsoft.Extensions.Telemetry.Logging.Test.Log; +namespace Microsoft.Extensions.Logging.Test.Log; [CollectionDefinition("Serial Tests", DisableParallelization = true)] public static class SerialExtendedLoggerTests diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/TestConfiguration.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/TestConfiguration.cs index b4268152978..832c120873a 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/TestConfiguration.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/TestConfiguration.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.Json; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; internal class TestConfiguration : JsonConfigurationProvider { diff --git a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/Utils.cs b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/Utils.cs index be2aa207f8e..bf09f8cb91c 100644 --- a/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/Utils.cs +++ b/test/Libraries/Microsoft.Extensions.Telemetry.Tests/Logging/Utils.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.Extensions.Telemetry.Logging.Test; +namespace Microsoft.Extensions.Logging.Test; internal static class Utils {