Merge main into live

docs/core/enrichment/custom-enricher.md

@@ -0,0 +1,93 @@
+---
+title: Custom log enricher
+description: Learn how to use the custom log enricher in .NET.
+ms.date: 10/13/2025
+---
+
+# Custom log enricher
+
+You can easily create a custom enricher by creating a class that implements the <xref:Microsoft.Extensions.Diagnostics.Enrichment.ILogEnricher> interface.
+After the class is created, you register it with <xref:Microsoft.Extensions.DependencyInjection.EnrichmentServiceCollectionExtensions.AddLogEnricher(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Diagnostics.Enrichment.ILogEnricher)>.
+Once registered, the logging infrastructure automatically calls the `Enrich()` method exactly once on every registered enricher for each log message produced.
+
+## Install the package
+
+To get started, install the [📦 Microsoft.Extensions.Telemetry.Abstractions](https://www.nuget.org/packages/Microsoft.Extensions.Telemetry.Abstractions) NuGet package:
+
+### [.NET CLI](#tab/dotnet-cli)
+
+```dotnetcli
+dotnet add package Microsoft.Extensions.Telemetry.Abstractions
+```
+
+Or, if you're using .NET 10+ SDK:
+
+```dotnetcli
+dotnet package add Microsoft.Extensions.Telemetry.Abstractions 
+```
+
+### [PackageReference](#tab/package-reference)
+
+```xml
+<PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions"
+                  Version="*" /> <!-- Adjust version -->
+```
+
+---
+
+## Implementation
+
+Your custom enricher only needs to implement a single <xref:Microsoft.Extensions.Diagnostics.Enrichment.ILogEnricher.Enrich(Microsoft.Extensions.Diagnostics.Enrichment.IEnrichmentTagCollector)> method.
+During enrichment, this method is called and given an <xref:Microsoft.Extensions.Diagnostics.Enrichment.IEnrichmentTagCollector> instance. The enricher then calls one of the overloads of
+the <xref:Microsoft.Extensions.Diagnostics.Enrichment.IEnrichmentTagCollector.Add(System.String,System.Object)> method to record any properties it wants.
+
+> [!NOTE]
+> If your custom log enricher calls <xref:Microsoft.Extensions.Diagnostics.Enrichment.IEnrichmentTagCollector.Add(System.String,System.Object)>,
+> it is acceptable to send any type of argument to the `value` parameter as is, because it is parsed into the actual type and serialized internally
+> to be sent further down the logging pipeline.
+
+```csharp
+public class CustomEnricher : ILogEnricher
+{
+    public void Enrich(IEnrichmentTagCollector collector)
+    {
+        collector.Add("customKey", "customValue");
+    }
+}
+
+```
+
+And you register it as shown in the following code using <xref:Microsoft.Extensions.DependencyInjection.EnrichmentServiceCollectionExtensions.AddLogEnricher``1(Microsoft.Extensions.DependencyInjection.IServiceCollection)>:
+
+```csharp
+var builder = Host.CreateApplicationBuilder(args);
+builder.Logging.EnableEnrichment();
+builder.Services.AddLogEnricher<CustomEnricher>();
+```
+
+It's also possible to configure manual instantiation of custom enrichers:
+
+```csharp
+public class AnotherEnricher : ILogEnricher
+{
+    private readonly string _key;
+    private readonly object _value;
+    public CustomEnricher(string key, object value)
+    {
+        _key = key;
+        _value = value;
+    }
+    public void Enrich(IEnrichmentTagCollector collector)
+    {
+        collector.Add(_key, _value);
+    }
+}
+```
+
+And you register it as shown in the following code <xref:Microsoft.Extensions.DependencyInjection.EnrichmentServiceCollectionExtensions.AddLogEnricher(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Diagnostics.Enrichment.ILogEnricher)>:
+
+```csharp
+var builder = Host.CreateApplicationBuilder();
+builder.Logging.EnableEnrichment();
+builder.Services.AddLogEnricher(new AnotherEnricher("anotherKey", "anotherValue"));
+```

docs/core/enrichment/json-output-all-enabled.json

@@ -0,0 +1,12 @@
+{
+  "EventId": 0,
+  "LogLevel": "Information",
+  "Category": "Enrichment.Program",
+  "Message": "This is a sample log message",
+  "State": {
+    "Message": "This is a sample log message",
+    "process.pid": "12924",
+    "thread.id": "2",
+    "{OriginalFormat}": "This is a sample log message"
+  }
+}

docs/core/enrichment/json-output.json

@@ -0,0 +1,11 @@
+{
+  "EventId": 0,
+  "LogLevel": "Information",
+  "Category": "Enrichment.Program",
+  "Message": "This is a sample log message",
+  "State": {
+    "Message": "This is a sample log message",
+    "process.pid": "10696",
+    "{OriginalFormat}": "This is a sample log message"
+  }
+}

docs/core/enrichment/overview.md

@@ -0,0 +1,61 @@
+---
+title: Log enrichment overview
+description: Learn about log enrichment in .NET and how to enhance your logs with contextual information.
+ms.date: 10/13/2025
+---
+
+# Overview
+
+Log enrichment is a powerful feature that automatically attaches contextual information to your application's logs. Instead of manually adding metadata to each log, enrichment provides a systematic way to inject relevant context automatically across your entire application.
+
+## What is enrichment?
+
+Enrichment augments telemetry objects with additional information that provides valuable context about the environment, application state, and execution context when the telemetry was generated. This contextual data helps with debugging, monitoring, performance analysis, and understanding application behavior in production environments.
+
+## Why is enrichment important?
+
+Enrichment plays a critical role in enhancing observability and diagnostics by adding standardized contextual information—such as process details, environment tags, or user identifiers—to telemetry data. This additional metadata transforms raw logs into structured, meaningful insights, making it easier to trace issues, correlate events, and improve application reliability. By enabling enrichment and configuring specific enrichers, teams can streamline troubleshooting, optimize performance monitoring, and ensure compliance with operational standards. Ultimately, enrichment is not just a technical add-on; it’s a foundational practice for building resilient, transparent systems that support informed decision-making and faster incident resolution.
+
+## How enrichment works
+
+The enrichment framework operates through a collection of enrichers that are registered with the dependency injection container. When telemetry is generated, all registered enrichers automatically contribute their contextual information to the telemetry payload. You just register the specific set of enrichers you want into an <xref:Microsoft.Extensions.DependencyInjection.IServiceCollection> instance. The enrichers run automatically without requiring changes to your application code. You simply configure which enrichers you want to use during application startup.
+
+## Dimension names and tags
+
+Enrichers add information to telemetry using standardized dimension names (also called tags or keys).
+
+## Setting up enrichment
+
+To use log enrichment in your application, you need to:
+
+1. **Enable enrichment** for logging.
+2. **Register specific enrichers** you want to use.
+3. **Configure options** for each enricher (optional).
+
+### Basic setup example
+
+Here's a simple example showing how to set up log enrichment with process information:
+
+:::code language="csharp" source="snippets/enrichment/Program.cs" highlight="8,9":::
+
+This configuration:
+
+- Enables enrichment for logging via `EnableEnrichment()`.
+- Registers the process log enricher via `AddProcessLogEnricher()`.
+- Configures JSON console output to display the enriched data.
+
+### Output example
+
+With enrichment enabled, your log output will automatically include additional contextual information:
+
+:::code language="json" source="json-output.json" highlight="8":::
+
+## Available enrichers
+
+The .NET enrichment framework provides some built-in enrichers, like:
+
+- **[Process enricher](process-log-enricher.md)**: Process and thread information
+
+## Custom enrichers
+
+If the built-in enrichers don't meet your specific needs, you can create custom enrichers to add application-specific context. For more information, check [custom enrichment](custom-enricher.md).

docs/core/enrichment/process-log-enricher.md

@@ -0,0 +1,91 @@
+---
+title: Process log enricher
+description: Learn how to use the process log enricher in .NET.
+ms.date: 10/10/2025
+---
+
+# Process log enricher
+
+The process enricher augments telemetry logs with process-specific information.
+
+You can register the enrichers in an IoC container. Then, all registered enrichers are picked up automatically by the respective telemetry instances, such as logs or metrics, where they enrich the telemetry information.
+
+## Install the package
+
+To get started, install the [📦 Microsoft.Extensions.Telemetry](https://www.nuget.org/packages/Microsoft.Extensions.Telemetry) NuGet package:
+
+### [.NET CLI](#tab/dotnet-cli)
+
+```dotnetcli
+dotnet add package Microsoft.Extensions.Telemetry
+```
+
+Or, if you're using .NET 10+ SDK:
+
+```dotnetcli
+dotnet package add Microsoft.Extensions.Telemetry
+```
+
+### [PackageReference](#tab/package-reference)
+
+```xml
+<PackageReference Include="Microsoft.Extensions.Telemetry"
+                  Version="*" /> <!-- Adjust version -->
+```
+
+---
+
+## Usage
+
+To use the process log enricher, first you enable enrichment. Then you can add the <xref:Microsoft.Extensions.DependencyInjection.ProcessEnricherServiceCollectionExtensions.AddProcessLogEnricher*> with default properties, as shown in the following code:
+
+:::code language="csharp" source="snippets/enrichment/Program.cs" highlight="8,9":::
+
+Given this code sample, the output should be similar to the following JSON:
+
+:::code language="json" source="json-output.json" highlight="8":::
+
+## `ProcessLogEnricherOptions`
+
+The <xref:Microsoft.Extensions.Diagnostics.Enrichment.ProcessLogEnricherOptions> class provides fine-grained control over which process-related properties are included in your log enrichment. This options class allows you to selectively enable or disable specific enrichment features such as process ID and thread ID information. Although default properties are supplied by the process enricher, you can customize them by initializing an instance of <xref:Microsoft.Extensions.Diagnostics.Enrichment.ProcessLogEnricherOptions> and providing it when registering the enricher.
+
+You can enable or disable individual options of the enricher using <xref:Microsoft.Extensions.DependencyInjection.ProcessEnricherServiceCollectionExtensions.AddProcessLogEnricher(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{Microsoft.Extensions.Diagnostics.Enrichment.ProcessLogEnricherOptions})>:
+
+```csharp
+serviceCollection.AddProcessLogEnricher(options =>
+{
+    options.ThreadId = true;
+    options.ProcessId = true;
+});
+```
+
+You may also disable or enable individual options using _appsettings.json_ file configuration, for example:
+
+```json
+{
+    "ProcessLogEnricherOptions": {
+        "ThreadId": true,
+        "ProcessId": true
+    }
+}
+```
+
+and apply it accordingly using <xref:Microsoft.Extensions.DependencyInjection.ProcessEnricherServiceCollectionExtensions.AddProcessLogEnricher(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.Extensions.Configuration.IConfigurationSection)>:
+
+```csharp
+serviceCollection.AddProcessLogEnricher(
+    hostBuilder.Configuration.GetSection("ProcessLogEnricherOptions"));
+```
+
+The console output after enabling both options should look like this:
+
+:::code language="json" source="json-output-all-enabled.json" highlight="8,9":::
+
+## Default configuration
+
+The default configuration for process log enrichment is:
+
+| Property    | Default Value | Description                                             |
+|-------------|---------------|---------------------------------------------------------|
+| `ProcessId` | `true`        | If true, logs are enriched with the current process ID. |
+| `ThreadId`  | `false`       | If true, logs are enriched with the current thread ID   |

docs/core/enrichment/snippets/enrichment/Enrichment.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Telemetry" Version="9.9.0" />
+  </ItemGroup>
+
+</Project>

docs/core/enrichment/snippets/enrichment/Program.cs

@@ -0,0 +1,23 @@
+using System.Text.Json;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+var builder = Host.CreateApplicationBuilder(args);
+
+builder.Logging.EnableEnrichment();
+builder.Services.AddProcessLogEnricher();
+
+builder.Logging.AddJsonConsole(op =>
+{
+    op.JsonWriterOptions = new JsonWriterOptions
+    {
+        Indented = true
+    };
+});
+
+var host = builder.Build();
+var logger = host.Services.GetRequiredService<ILogger<Program>>();
+
+logger.LogInformation("This is a sample log message");
+await host.RunAsync();

docs/core/testing/microsoft-testing-platform-extensions-diagnostics.md

@@ -38,9 +38,6 @@ You can also enable the diagnostics logs using the environment variables:
 
 This extension allows you to create a crash dump file if the process crashes. This extension is shipped as part of [Microsoft.Testing.Extensions.CrashDump](https://nuget.org/packages/Microsoft.Testing.Extensions.CrashDump) NuGet package.
 
-> [!IMPORTANT]
-> The package is shipped with Microsoft .NET library closed-source free to use licensing model.
-
 To configure the crash dump file generation, use the following options:
 
 | Option | Description |
@@ -56,9 +53,6 @@ To configure the crash dump file generation, use the following options:
 
 This extension allows you to create a dump file after a given timeout. This extension is shipped as part of [Microsoft.Testing.Extensions.HangDump](https://nuget.org/packages/Microsoft.Testing.Extensions.HangDump) package.
 
-> [!IMPORTANT]
-> The package is shipped with Microsoft .NET library closed-source free to use licensing model.
-
 To configure the hang dump file generation, use the following options:
 
 | Option | Description |

docs/csharp/language-reference/compiler-messages/array-declaration-errors.md

@@ -37,6 +37,11 @@ f1_keywords:
  - "CS9208"
  - "CS9209"
  - "CS9210"
+ - "CS9212"
+ - "CS9213"
+ - "CS9214"
+ - "CS9215"
+ - "CS9222"
 helpviewer_keywords:
  - "CS0022"
  - "CS0178"
@@ -73,6 +78,11 @@ helpviewer_keywords:
  - "CS9208"
  - "CS9209"
  - "CS9210"
+ - "CS9212"
+ - "CS9213"
+ - "CS9214"
+ - "CS9215"
+ - "CS9222"
 ms.date: 11/02/2023
 ---
 # Resolve errors and warnings in array and collection declarations and initialization expressions
@@ -110,6 +120,11 @@ That's by design. The text closely matches the text of the compiler error / warn
 - [**CS9188**](#invalid-collection-builder): *Type has a CollectionBuilderAttribute but no element type.*
 - [**CS9203**](#invalid-collection-initializer): *A collection expression of this type cannot be used in this context because it may be exposed outside of the current scope.*
 - [**CS9210**](#invalid-collection-initializer): *This version of <xref:System.Collections.Immutable.ImmutableArray%601?displayProperty=nameWithType>cannot be used with collection expressions.*
+- [**CS9212**](#invalid-collection-initializer): *Spread operator '`..`' cannot operate on variables of type 'type' because 'type' does not contain a public instance or extension definition for 'member'.*
+- [**CS9213**](#invalid-collection-initializer): *Collection expression target 'type' has no element type.*
+- [**CS9214**](#invalid-collection-initializer): *Collection expression type must have an applicable constructor that can be called with no arguments.*
+- [**CS9215**](#invalid-collection-initializer): *Collection expression type 'type' must have an instance or extension method 'Add' that can be called with a single argument.*
+- [**CS9222**](#invalid-collection-initializer): *Collection initializer results in an infinite chain of instantiations of collection 'type'.*
 
 In addition, the following warnings are covered in this article:
 
@@ -141,6 +156,11 @@ The following errors indicate that the code generated by the compiler for a coll
 - **CS9176**: *There is no target type for the collection literal.*
 - **CS9203**: *A collection expression of this type cannot be used in this context because it may be exposed outside of the current scope.*
 - **CS9210**: *This version of <xref:System.Collections.Immutable.ImmutableArray%601?displayProperty=nameWithType>cannot be used with collection expressions.*
+- **CS9212**: *Spread operator '`..`' cannot operate on variables of type 'type' because 'type' does not contain a public instance or extension definition for 'member'.*
+- **CS9213**: *Collection expression target 'type' has no element type.*
+- **CS9214**: *Collection expression type must have an applicable constructor that can be called with no arguments.*
+- **CS9215**: *Collection expression type 'type' must have an instance or extension method 'Add' that can be called with a single argument.*
+- **CS9222**: *Collection initializer results in an infinite chain of instantiations of collection 'type'.*
 
 The compiler might also generate the following warning:
 
@@ -159,6 +179,11 @@ The errors all indicate that the code generated by the compiler for a collection
 - Collection expressions can initialize explicitly typed variables of a collection type. If the variable isn't a collection or array type, or is implicitly typed (using `var`), a collection initializer can't be used.
 - A `ref struct` type, like <xref:System.Span%601?displayProperty=nameWithType> can't be initialized with a collection expression that may violate ref safety.
 - A collection expression can't correctly initialize an <xref:System.Collections.Immutable.ImmutableArray%601?displayProperty=nameWithType> using the current version. Use a different version of the runtime, or change the initialization expression.
+- The spread operator (`..`) in **CS9212** requires the type to implement a suitable method (like `GetEnumerator`) to enumerate its elements. Ensure your type implements the required enumeration pattern or provides an extension method.
+- **CS9213** occurs when the compiler can't determine what element type to use for the collection expression. This typically happens with custom collection types. Make sure your collection type properly exposes its element type through its type definition or implements appropriate collection interfaces.
+- **CS9214** is generated when a collection expression tries to initialize a type that doesn't have a parameterless constructor. Collection expressions require a constructor that can be called with no arguments to create the instance before adding elements.
+- **CS9215** happens when the collection type doesn't provide an `Add` method that accepts a single parameter of the element type. The `Add` method must be accessible (typically public) and accept exactly one argument that matches the collection's element type.
+- **CS9222** indicates a circular dependency in collection initialization. This occurs when initializing a collection triggers the creation of another instance of the same collection type, which in turn requires initializing another instance, creating an infinite loop. Review your collection type's constructor and initialization logic to break the circular dependency.
 
 The warnings indicates that the collection expression, including any [spread elements](../operators/collection-expressions.md#spread-element) might allocate memory. Creating different storage and converting might be more efficient.