Merge pull request #95482 from ecfan/patch-3

Updates per PM feedback + UX updates

Author: ShannonLeavitt

articles/connectors/media/connectors-native-reqres/add-response.png

@@ -109,7 +109,7 @@ Before you can create an Azure function starting from inside your logic app by u
 
    * Between existing steps in your logic app's workflow, move your mouse over the arrow, select the plus (+) sign, and then select **Add an action**.
 
-1. In the search box, enter "azure functions" as your filter. From the actions list, select this action: **Choose an Azure function**
+1. In the search box, enter "azure functions" as your filter. From the actions list, select the **Choose an Azure function** action, for example:
 
    ![Find "Azure functions"](./media/logic-apps-azure-functions/find-azure-functions-action.png)
 
@@ -121,26 +121,26 @@ Before you can create an Azure function starting from inside your logic app by u
 
    1. In the **Function name** box, provide a name for your function.
 
-   1. In the **Code** box, add your code to the function template, including the response and payload that you want returned to your logic app after your function finishes running.
+   1. In the **Code** box, add your code to the function template, including the response and payload that you want returned to your logic app after your function finishes running. When you're done, select **Create**.
 
-      ![Define your function](./media/logic-apps-azure-functions/function-definition.png)
+   For example:
 
-      In the template's code, the *`context` object* refers to the message that your logic app sends through the **Request Body** field in a later step. To access the `context` object's properties from inside your function, use this syntax:
+   ![Define your function](./media/logic-apps-azure-functions/add-code-function-definition.png)
 
-      `context.body.<property-name>`
+   In the template's code, the *`context` object* refers to the message that your logic app sends through the **Request Body** field in a later step. To access the `context` object's properties from inside your function, use this syntax:
 
-      For example, to reference the `content` property inside the `context` object, use this syntax:
+   `context.body.<property-name>`
 
-      `context.body.content`
+   For example, to reference the `content` property inside the `context` object, use this syntax:
 
-      The template code also includes an `input` variable, which stores the value from the `data` parameter so your function can perform operations on that value. Inside JavaScript functions, the `data` variable is also a shortcut for `context.body`.
+   `context.body.content`
 
-      > [!NOTE]
-      > The `body` property here applies to the `context` object and 
-      > isn't the same as the **Body** token from an action's output, 
-      > which you might also pass to your function.
+   The template code also includes an `input` variable, which stores the value from the `data` parameter so your function can perform operations on that value. Inside JavaScript functions, the `data` variable is also a shortcut for `context.body`.
 
-   1. When you're done, select **Create**.
+   > [!NOTE]
+   > The `body` property here applies to the `context` object and 
+   > isn't the same as the **Body** token from an action's output, 
+   > which you might also pass to your function.
 
 1. In the **Request Body** box, provide your function's input, which must be formatted as a JavaScript Object Notation (JSON) object.
 
@@ -164,7 +164,7 @@ To call existing Azure functions from your logic apps, you can add Azure functio
 
 1. Under the step where you want to add the function, select **New step**.
 
-1. Under **Choose an action**, in the search box, enter "azure functions" as your filter. From the actions list, select this action: **Choose an Azure function**
+1. Under **Choose an action**, in the search box, enter "azure functions" as your filter. From the actions list, select the **Choose an Azure function** action.
 
    ![Find "Azure functions"](./media/logic-apps-azure-functions/find-azure-functions-action.png)
 

articles/logic-apps/logic-apps-azure-functions.md

@@ -8,7 +8,7 @@ author: ecfan
 ms.author: estfan
 ms.reviewer: jehollan, klam, LADocs
 ms.topic: article
-ms.date: 06/04/2019
+ms.date: 11/08/2019
 ---
 
 # Call or trigger logic apps by using Azure Functions and Azure Service Bus
@@ -27,13 +27,13 @@ You can use [Azure Functions](../azure-functions/functions-overview.md) to trigg
 
 ## Create logic app
 
-For this scenario, you have a function running each logic app that you want to trigger. First, create a logic app that starts with an HTTP request trigger. The function calls that endpoint whenever a queue message is received.  
+For this scenario, you have a function running each logic app that you want to trigger. First, create a logic app that starts with an HTTP request trigger. The function calls that endpoint whenever a queue message is received.
 
 1. Sign in to the [Azure portal](https://portal.azure.com), and create blank logic app.
 
    If you're new to logic apps, review [Quickstart: Create your first logic app](../logic-apps/quickstart-create-first-logic-app-workflow.md).
 
-1. In the search box, enter "http request". From the triggers list, select this trigger: **When a HTTP request is received**
+1. In the search box, enter `http request`. From the triggers list, select the **When a HTTP request is received** trigger.
 
    ![Select trigger](./media/logic-apps-scenario-function-sb-trigger/when-http-request-received-trigger.png)
 
@@ -45,9 +45,9 @@ For this scenario, you have a function running each logic app that you want to t
 
    If you don't have a schema, but you have a sample payload in JSON format, you can generate a schema from that payload.
 
-   1. In the Request trigger, choose **Use sample payload to generate schema**.
+   1. In the Request trigger, select **Use sample payload to generate schema**.
 
-   1. Under **Enter or paste a sample JSON payload**, enter your sample payload, and then choose **Done**.
+   1. Under **Enter or paste a sample JSON payload**, enter your sample payload, and then select **Done**.
 
       ![Enter sample payload](./media/logic-apps-scenario-function-sb-trigger/enter-sample-payload.png)
 
@@ -97,9 +97,9 @@ Next, create the function that acts as the trigger and listens to the queue.
 
 1. In the Azure portal, open and expand your function app, if not already open. 
 
-1. Under your function app name, expand **Functions**. On the **Functions** pane, choose **New function**.
+1. Under your function app name, expand **Functions**. On the **Functions** pane, select **New function**.
 
-   ![Expand "Functions" and choose "New function"](./media/logic-apps-scenario-function-sb-trigger/create-new-function.png)
+   ![Expand "Functions" and select "New function"](./media/logic-apps-scenario-function-sb-trigger/add-new-function-to-function-app.png)
 
 1. Select this template based on whether you created a new function app where you selected .NET as the runtime stack, or you're using an existing function app.
 
@@ -111,27 +111,34 @@ Next, create the function that acts as the trigger and listens to the queue.
 
      ![Select template for existing function app](./media/logic-apps-scenario-function-sb-trigger/legacy-add-queue-trigger-template.png)
 
-1. On the **Azure Service Bus Queue trigger** pane, provide a name for your trigger, and set up the **Service Bus connection** for the queue, which uses the Azure Service Bus SDK `OnMessageReceive()` listener, and choose **Create**.
+1. On the **Azure Service Bus Queue trigger** pane, provide a name for your trigger, and set up the **Service Bus connection** for the queue, which uses the Azure Service Bus SDK `OnMessageReceive()` listener, and select **Create**.
 
-1. Write a basic function to call the previously created logic app endpoint by using the queue message as a trigger. This example uses the `application/json` message content type, but you can change this type as necessary. If possible, reuse the instance of HTTP clients. For more information, see [Manage connections in Azure Functions](../azure-functions/manage-connections.md).
+1. Write a basic function to call the previously created logic app endpoint by using the queue message as a trigger. Before you write your function, review these considerations:
+
+   * This example uses the `application/json` message content type, but you can change this type as necessary.
+   
+   * Due to possible concurrently running functions, high volumes, or heavy loads, avoid instantiating the [HTTPClient class](https://docs.microsoft.com/dotnet/api/system.net.http.httpclient) with the `using` statement and directly creating HTTPClient instances per request. For more information, see [Use HttpClientFactory to implement resilient HTTP requests](https://docs.microsoft.com/dotnet/architecture/microservices/implement-resilient-applications/use-httpclientfactory-to-implement-resilient-http-requests#issues-with-the-original-httpclient-class-available-in-net-core).
+   
+   * If possible, reuse the instance of HTTP clients. For more information, see [Manage connections in Azure Functions](../azure-functions/manage-connections.md).
+
+   This example uses the [`Task.Run` method](https://docs.microsoft.com/dotnet/api/system.threading.tasks.task.run) in [asynchronous](https://docs.microsoft.com/dotnet/csharp/language-reference/keywords/async) mode. For more information, see [Asynchronous programming with async and await](https://docs.microsoft.com/dotnet/csharp/programming-guide/concepts/async/).
 
    ```CSharp
    using System;
    using System.Threading.Tasks;
    using System.Net.Http;
    using System.Text;
 
-   // Callback URL for previously created Request trigger
+   // Can also fetch from App Settings or environment variable
    private static string logicAppUri = @"https://prod-05.westus.logic.azure.com:443/workflows/<remaining-callback-URL>";
 
-   // Reuse the instance of HTTP clients if possible
+   // Reuse the instance of HTTP clients if possible: https://docs.microsoft.com/azure/azure-functions/manage-connections
    private static HttpClient httpClient = new HttpClient();
 
-   public static void Run(string myQueueItem, ILogger log)
+   public static async Task Run(string myQueueItem, TraceWriter log) 
    {
-       log.LogInformation($"C# ServiceBus queue trigger function processed message: {myQueueItem}");
-
-       var response = httpClient.PostAsync(logicAppUri, new StringContent(myQueueItem, Encoding.UTF8, "application/json")).Result;
+      log.Info($"C# ServiceBus queue trigger function processed message: {myQueueItem}");
+      var response = await httpClient.PostAsync(logicAppUri, new StringContent(myQueueItem, Encoding.UTF8, "application/json")); 
    }
    ```
 
@@ -141,4 +148,4 @@ Next, create the function that acts as the trigger and listens to the queue.
 
 ## Next steps
 
-[Call, trigger, or nest workflows by using HTTP endpoints](../logic-apps/logic-apps-http-endpoint.md)
+* [Call, trigger, or nest workflows by using HTTP endpoints](../logic-apps/logic-apps-http-endpoint.md)