Fixed merge conflict

Author: adutta-newrelic

src/content/docs/apm/agents/net-agent/configuration/net-agent-configuration.mdx

@@ -3554,6 +3554,7 @@ There are three main sub-features:
 2. Log forwarding: When enabled, the agent will capture log data and send it to New Relic.
    * Context data (via [`AddCustomAttribute`](/docs/apm/agents/net-agent/net-agent-api/itransaction/#addcustomattribute)): When enabled, the agent will capture and forward any custom log attributes.  The `include` and `exclude` elements are comma-separated lists of attribute names to include or exclude, following the [same rules](/docs/apm/agents/net-agent/attributes/enable-disable-attributes-net/#attruls) as other agent attribute configuration. They're both empty by default, which results in all log context data being captured and forwarded.
    * Log-level filtering:  When configured with one or more log levels in a comma-separated list, the agent will prevent messages at those levels from being captured and forwarded.
+   * Labels: When enabled, the agent adds custom labels to agent-forwarded logs. You can use the `exclude` attribute, which is a case-insensitive, comma-separated list of label names. By default, the agent adds custom labels when the `exclude` attribute is empty.
 3. Local log decoration: When enabled, your existing logs will be decorated with metadata which links logs with other New Relic data, such as errors.
 
 For more details, see [our docs on using .NET agent logs in context](/docs/logs/logs-context/net-configure-logs-context-all).
@@ -3563,6 +3564,7 @@ For more details, see [our docs on using .NET agent logs in context](/docs/logs/
   <metrics enabled="true" />
   <forwarding enabled="true" maxSamplesStored="10000" logLevelDenyList="">
     <contextData enabled="false" include="" exclude="" />
+    <labels enabled="false" exclude="" />
   </forwarding>
   <localDecorating enabled="false" />
 </applicationLogging>
@@ -3579,6 +3581,8 @@ NEW_RELIC_APPLICATION_LOGGING_FORWARDING_CONTEXT_DATA_INCLUDE="myCustomAttribute
 NEW_RELIC_APPLICATION_LOGGING_FORWARDING_CONTEXT_DATA_EXCLUDE="myCustomAttribute2, myOtherCustomAttributeMoreSpecificName"
 NEW_RELIC_APPLICATION_LOGGING_FORWARDING_MAX_SAMPLES_STORED=10000
 NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LOG_LEVEL_DENYLIST="debug, warn"
+NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_ENABLED=true
+NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_EXCLUDE="label1, label2"
 NEW_RELIC_APPLICATION_LOGGING_LOCAL_DECORATING_ENABLED=true
 ```
 
@@ -3661,6 +3665,17 @@ The `applicationLogging` element supports the following attributes and sub-eleme
     The include and exclude lists follow the [same precedence rules as other agent attributes configuration](/docs/apm/agents/net-agent/attributes/enable-disable-attributes-net/#attruls).
   </Collapser>
 
+<Collapser
+    id="labels"
+    title="labels (tags)"
+  >
+    Use this sub-element, which is a child of the `forwarding` element, to configure adding your [labels (tags)](/docs/apm/agents/net-agent/configuration/net-agent-configuration/#labels-tags) to agent-forwarded logs, in agent versions 10.34.0 and higher.
+
+    Set the `enabled` attribute to `true` to enable adding your labels to agent-forwarded logs. You can also use the environment variable `NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_ENABLED`. The default value is `false`.
+
+    The `exclude` attribute is a case-insensitive, comma-separated list of label names to exclude when you enable labels. You can also use the environment variable `NEW_RELIC_APPLICATION_LOGGING_FORWARDING_LABELS_EXCLUDE`. The default value is an empty string, which means "exclude nothing".  This attribute does not support wildcards or regex.
+  </Collapser>
+
   <Collapser
     id="localDecorating"
     title="Local log decoration"
@@ -3870,4 +3885,4 @@ For .NET Core apps, you can configure the following settings in `appsettings.jso
 
 <Callout variant="important">
   For [ASP.NET Core apps](https://asp.net/), the .NET Agent will read from `appsettings.{environment}.json` if you set the `ASPNETCORE_ENVIRONMENT` variable.
-</Callout>
+</Callout>

src/content/docs/apm/agents/net-agent/net-agent-api/net-agent-api.mdx

@@ -2334,7 +2334,7 @@ The following list contains the different calls you can make with the API, inclu
 
     ### Description
 
-    Sets the name of the current transaction. Before you use this call, ensure you understand the implications of [metric grouping issues](/docs/agents/manage-apm-agents/troubleshooting/metric-grouping-issues).
+    Set a custom transaction name, to be appended after an initial prefix (`WebTransaction` or `OtherTransaction`) based on the type of the current transaction. Before you use this call, ensure you understand the implications of [metric grouping issues](/docs/agents/manage-apm-agents/troubleshooting/metric-grouping-issues).
 
     If you use this call multiple times within the same transaction, each call overwrites the previous call and the last call sets the name.
 
@@ -2392,8 +2392,71 @@ The following list contains the different calls you can make with the API, inclu
 
     ### Examples
 
+    This example shows use of this API in an ASP.NET Core MVC controller. A transaction is created automatically by the agent's instrumentation for ASP.NET Core. The first part of the transaction name will continue to be `WebTransaction`.
+
+    ```cs
+    public class HomeController : Controller
+    {
+
+      public IActionResult Order(string product)
+      { 
+
+        // The commented-out API call below is probably a bad idea and will lead to a metric grouping issue (MGI)
+        // because too many transaction names will be created. Don't do this.
+        //NewRelic.Api.Agent.NewRelic.SetTransactionName("Other", $"ProductOrder-{product}");
+
+        // Do this instead if you want to record request-specific data about this MVC endpoint
+        var tx = NewRelic.Api.Agent.NewRelic.GetAgent().CurrentTransaction;
+        tx.AddCustomAttribute("productName", product);
+
+        // The default transaction name at this point will be: WebTransaction/MVC/Home/Order
+
+        // Set custom transaction name
+        NewRelic.Api.Agent.NewRelic.SetTransactionName("Other", "OrderProduct");
+
+        // Transaction name is now: WebTransaction/Other/OrderProduct
+
+        return View();
+      }
+    }  
+    ```
+
+    This example shows use of this API in a console application. Note the `[Transaction]` custom instrumentation attribute, which is necessary to create a transaction for the example method.  The first part of the transaction name will continue to be `OtherTransaction`.
+
     ```cs
-    NewRelic.Api.Agent.NewRelic.SetTransactionName("Other", "MyTransaction");
+    using NewRelic.Api.Agent;
+
+    namespace SetApplicationNameConsoleExample
+    {
+      internal class Program
+      {
+        static void Main(string[] args)
+        {
+          Console.WriteLine("Hello, World!");
+
+            var start = DateTime.Now;
+            while (DateTime.Now - start < TimeSpan.FromMinutes(2))
+            {
+                DoSomething();
+                Thread.Sleep(TimeSpan.FromSeconds(5));
+            }
+        }
+
+        [Transaction]  // Attribute-based custom instrumentation to create a transaction for this method
+        static void DoSomething()
+        {
+            Console.WriteLine("Doing something: " + Guid.NewGuid().ToString());
+
+            // Transaction name from default naming at this point is: OtherTransaction/Custom/SetApplicationNameConsoleExample.Program/DoSomething
+
+            NewRelic.Api.Agent.NewRelic.SetTransactionName("Console", "MyCustomTransactionName");
+
+            // Transaction name at this point is: OtherTransaction/Console/MyCustomTransactionName
+
+            // Note, however, that this transaction will still have a child segment (span) named "SetApplicationNameConsoleExample.Program.DoSomething"
+        }
+      }
+    }
     ```
   </Collapser>
 
@@ -2420,7 +2483,7 @@ The following list contains the different calls you can make with the API, inclu
 
     ### Description
 
-    Sets the URI of the current transaction. The URI appears in the `request.uri` attribute of [transaction traces](/docs/apm/transactions/transaction-traces/transaction-traces) and [transaction events](/docs/using-new-relic/metrics/analyze-your-metrics/data-collection-metric-timeslice-event-data), and it also can affect transaction naming.
+    Set the URI of the current transaction. The URI appears in the `request.uri` attribute of [transaction traces](/docs/apm/transactions/transaction-traces/transaction-traces) and [transaction events](/docs/using-new-relic/metrics/analyze-your-metrics/data-collection-metric-timeslice-event-data), and it also can affect transaction naming.
 
     If you use this call multiple times within the same transaction, each call overwrites the previous call. The last call sets the URI.