updating after rename

brettsam · brettsam · commit 8ff0fd4cd566 · 2021-02-18T11:07:16.000-08:00
diff --git a/samples/SampleApp/Blob/BlobFunction.cs b/samples/SampleApp/Blob/BlobFunction.cs
@@ -17,7 +17,7 @@ public static void Run(
             [BlobInput("test-samples-input/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("BlobFunction");
             logger.LogInformation($"Triggered Item = {myTriggerItem}");
             logger.LogInformation($"Input Item = {myBlob}");
 
diff --git a/samples/SampleApp/CosmosDB/CosmosDBFunction.cs b/samples/SampleApp/CosmosDB/CosmosDBFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
@@ -19,7 +19,7 @@ public static void Run(
                 LeaseCollectionName = "leases", CreateLeaseCollectionIfNotExists = true)] IReadOnlyList<MyDocument> input,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("CosmosDBFunction");
 
             if (input != null && input.Any())
             {
diff --git a/samples/SampleApp/DependencyInjection/DependencyInjectionFunction.cs b/samples/SampleApp/DependencyInjection/DependencyInjectionFunction.cs
@@ -6,26 +6,26 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.Http;
-using Microsoft.Azure.Functions.Worker.Pipeline;
 using Microsoft.Extensions.Logging;
 
 namespace SampleApp
 {
     public class DependencyInjectionFunction
     {
         private readonly IHttpResponderService _responderService;
+        private readonly ILogger<DependencyInjectionFunction> _logger;
 
-        public DependencyInjectionFunction(IHttpResponderService responderService)
+        public DependencyInjectionFunction(IHttpResponderService responderService, ILogger<DependencyInjectionFunction> logger)
         {
             _responderService = responderService;
+            _logger = logger;
         }
 
         [FunctionName(nameof(DependencyInjectionFunction))]
         public HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
-            FunctionContext executionContext)
+            FunctionContext context)
         {
-            var logger = executionContext.Logger;
-            logger.LogInformation("message logged");
+            _logger.LogInformation("message logged");
 
             return _responderService.ProcessRequest(req);
         }
diff --git a/samples/SampleApp/EventGrid/EventGridFunction.cs b/samples/SampleApp/EventGrid/EventGridFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.EventGrid;
@@ -15,7 +15,7 @@ public static class EventGridFunction
         [EventGridOutput("output", TopicEndpointUri = "MyEventGridTopicUriSetting", TopicKeySetting = "MyEventGridTopicKeySetting")]
         public static void Run([EventGridTrigger] MyEventType input, FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("EventGridFunction");
 
             logger.LogInformation(input.Data.ToString());
 
diff --git a/samples/SampleApp/EventHubs/EventHubsFunction.cs b/samples/SampleApp/EventHubs/EventHubsFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.EventHubs;
@@ -16,7 +16,7 @@ public static class EventHubsFunction
         public static void Run([EventHubTrigger("src", Connection = "EventHubConnectionAppSetting")] string input,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("EventHubsFunction");
 
             logger.LogInformation(input);
 
diff --git a/samples/SampleApp/Http/HttpFunction.cs b/samples/SampleApp/Http/HttpFunction.cs
@@ -6,7 +6,6 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.Http;
-using Microsoft.Azure.Functions.Worker.Pipeline;
 using Microsoft.Extensions.Logging;
 
 namespace SampleApp
@@ -17,7 +16,7 @@ public static class HttpFunction
         public static HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,
             FunctionContext executionContext)
         {
-            var logger = executionContext.Logger;
+            var logger = executionContext.GetLogger("HttpFunction");
             logger.LogInformation("message logged");
             var response = new HttpResponseData(HttpStatusCode.OK);
             var headers = new Dictionary<string, string>();
diff --git a/samples/SampleApp/Kafka/KafkaFunction.cs b/samples/SampleApp/Kafka/KafkaFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.Kafka;
@@ -17,7 +17,7 @@ public static void Run([KafkaTrigger("LocalBroker", "stringTopicTenPartitions",
             ConsumerGroup = "$Default", AuthenticationMode = BrokerAuthenticationMode.Plain)] string input,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("KafkaFunction");
 
             logger.LogInformation(input);
 
diff --git a/samples/SampleApp/Queue/QueueFunction.cs b/samples/SampleApp/Queue/QueueFunction.cs
@@ -15,7 +15,7 @@ public static class QueueFunction
         public static void Run([QueueTrigger("functionstesting2", Connection = "AzureWebJobsStorage")] Book myQueueItem,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("QueueFunction");
             logger.LogInformation($"Book name = {myQueueItem.Name}");
 
             // Queue Output
diff --git a/samples/SampleApp/RabbitMQ/RabbitMQFunction.cs b/samples/SampleApp/RabbitMQ/RabbitMQFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.RabbitMQ;
@@ -16,7 +16,7 @@ public static class RabbitMQFunction
         public static void Run([RabbitMQTrigger("queue", ConnectionStringSetting = "rabbitMQConnectionAppSetting")] string item,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("RabbitMQFunction");
 
             logger.LogInformation(item);
 
diff --git a/samples/SampleApp/ServiceBus/ServiceBusFunction.cs b/samples/SampleApp/ServiceBus/ServiceBusFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.ServiceBus;
@@ -16,7 +16,7 @@ public static class ServiceBusFunction
         public static void Run([ServiceBusTrigger("queue", Connection = "ServiceBusConnection")] string item,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("ServiceBusFunction");
 
             logger.LogInformation(item);
 
diff --git a/samples/SampleApp/SignalR/SignalRFunction.cs b/samples/SampleApp/SignalR/SignalRFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.SignalRService;
@@ -18,7 +18,7 @@ public static class SignalRFunction
             [SignalRConnectionInfoInput(HubName = "chat")] MyConnectionInfo connectionInfo,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("SignalRFunction");
 
             logger.LogInformation(item);
             logger.LogInformation($"Connection URL = {connectionInfo.Url}");
diff --git a/samples/SampleApp/Table/TableFunction.cs b/samples/SampleApp/Table/TableFunction.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-﻿using System;
+using System;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;
 using Microsoft.Azure.Functions.Worker.Extensions.Storage;
@@ -18,7 +18,7 @@ public static void Run([QueueTrigger("table-items")] string input,
             [TableInput("MyTable", "MyPartition", "{queueTrigger}")] JObject tableItem,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("TableFunction");
 
             logger.LogInformation(tableItem.ToString());
 
diff --git a/samples/SampleApp/Timer/TimerFunction.cs b/samples/SampleApp/Timer/TimerFunction.cs
@@ -15,7 +15,7 @@ public static class TimerFunction
         public static void Run([TimerTrigger("0 */5 * * * *")] MyInfo timerInfo,
             FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("TimerFunction");
             logger.LogInformation($"Function Ran. Next timer schedule = {timerInfo.ScheduleStatus.Next}");
         }
     }
diff --git a/samples/SampleApp/Warmup/Warmup.cs b/samples/SampleApp/Warmup/Warmup.cs
@@ -13,7 +13,7 @@ public static class Warmup
         [FunctionName("Warmup")]
         public static void Run([WarmupTrigger] object _, FunctionContext context)
         {
-            var logger = context.Logger;
+            var logger = context.GetLogger("Warmup");
 
             logger.LogInformation("Function App instance is now warm!");
         }
diff --git a/src/DotNetWorker/Context/FunctionContext.cs b/src/DotNetWorker/Context/FunctionContext.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Azure.Functions.Worker.Context;
-using Microsoft.Azure.Functions.Worker.Logging;
 
 namespace Microsoft.Azure.Functions.Worker
 {
@@ -33,11 +32,6 @@ public abstract class FunctionContext
         /// </summary>
         public abstract object? InvocationResult { get; set; }
 
-        /// <summary>
-        /// GEts or sets an <see cref="InvocationLogger"/> scoped to the current invocation.
-        /// </summary>
-        public abstract InvocationLogger? Logger { get; set; }
-
         // TODO: Double-check previous projects for layout of FunctionInvocation, Bindings, 
         /// <summary>
         /// Gets or sets a key/value collection with results for defined output bindings.
diff --git a/src/DotNetWorker/Context/FunctionExecutionContextExtensions.cs b/src/DotNetWorker/Context/FunctionExecutionContextExtensions.cs
@@ -8,12 +8,12 @@ namespace Microsoft.Azure.Functions.Worker
 {
     public static class FunctionExecutionContextExtensions
     {
-        public static ILogger<T> GetLogger<T>(this FunctionExecutionContext context)
+        public static ILogger<T> GetLogger<T>(this FunctionContext context)
         {
             return context.InstanceServices.GetService<ILogger<T>>();
         }
 
-        public static ILogger GetLogger(this FunctionExecutionContext context, string categoryName)
+        public static ILogger GetLogger(this FunctionContext context, string categoryName)
         {
             return context.InstanceServices
                    .GetService<ILoggerFactory>()
diff --git a/src/DotNetWorker/Converters/FunctionContextConverter.cs b/src/DotNetWorker/Converters/FunctionContextConverter.cs
@@ -7,9 +7,9 @@ public bool TryConvert(ConverterContext context, out object? target)
             target = null;
 
             // Special handling for the context.
-            if (context.Parameter.Type == typeof(FunctionExecutionContext))
+            if (context.Parameter.Type == typeof(FunctionContext))
             {
-                target = context.ExecutionContext;
+                target = context.FunctionContext;
                 return true;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static void Run(`
`17`	`17`	`[BlobInput("test-samples-input/sample1.txt", Connection = "AzureWebJobsStorage")] string myBlob,`
`18`	`18`	`FunctionContext context)`
`19`	`19`	`{`
`20`		`- var logger = context.Logger;`
	`20`	`+ var logger = context.GetLogger("BlobFunction");`
`21`	`21`	`logger.LogInformation($"Triggered Item = {myTriggerItem}");`
`22`	`22`	`logger.LogInformation($"Input Item = {myBlob}");`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -6,26 +6,26 @@`
`6`	`6`	`using Microsoft.Azure.Functions.Worker;`
`7`	`7`	`using Microsoft.Azure.Functions.Worker.Extensions.Abstractions;`
`8`	`8`	`using Microsoft.Azure.Functions.Worker.Extensions.Http;`
`9`		`-using Microsoft.Azure.Functions.Worker.Pipeline;`
`10`	`9`	`using Microsoft.Extensions.Logging;`
`11`	`10`
`12`	`11`	`namespace SampleApp`
`13`	`12`	`{`
`14`	`13`	`public class DependencyInjectionFunction`
`15`	`14`	`{`
`16`	`15`	`private readonly IHttpResponderService _responderService;`
	`16`	`+ private readonly ILogger<DependencyInjectionFunction> _logger;`
`17`	`17`
`18`		`- public DependencyInjectionFunction(IHttpResponderService responderService)`
	`18`	`+ public DependencyInjectionFunction(IHttpResponderService responderService, ILogger<DependencyInjectionFunction> logger)`
`19`	`19`	`{`
`20`	`20`	`_responderService = responderService;`
	`21`	`+ _logger = logger;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`[FunctionName(nameof(DependencyInjectionFunction))]`
`24`	`25`	`public HttpResponseData Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequestData req,`
`25`		`- FunctionContext executionContext)`
	`26`	`+ FunctionContext context)`
`26`	`27`	`{`
`27`		`- var logger = executionContext.Logger;`
`28`		`- logger.LogInformation("message logged");`
	`28`	`+ _logger.LogInformation("message logged");`
`29`	`29`
`30`	`30`	`return _responderService.ProcessRequest(req);`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class QueueFunction`
`15`	`15`	`public static void Run([QueueTrigger("functionstesting2", Connection = "AzureWebJobsStorage")] Book myQueueItem,`
`16`	`16`	`FunctionContext context)`
`17`	`17`	`{`
`18`		`- var logger = context.Logger;`
	`18`	`+ var logger = context.GetLogger("QueueFunction");`
`19`	`19`	`logger.LogInformation($"Book name = {myQueueItem.Name}");`
`20`	`20`
`21`	`21`	`// Queue Output`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class TimerFunction`
`15`	`15`	`public static void Run([TimerTrigger("0 /5 * * *")] MyInfo timerInfo,`
`16`	`16`	`FunctionContext context)`
`17`	`17`	`{`
`18`		`- var logger = context.Logger;`
	`18`	`+ var logger = context.GetLogger("TimerFunction");`
`19`	`19`	`logger.LogInformation($"Function Ran. Next timer schedule = {timerInfo.ScheduleStatus.Next}");`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static class Warmup`
`13`	`13`	`[FunctionName("Warmup")]`
`14`	`14`	`public static void Run([WarmupTrigger] object _, FunctionContext context)`
`15`	`15`	`{`
`16`		`- var logger = context.Logger;`
	`16`	`+ var logger = context.GetLogger("Warmup");`
`17`	`17`
`18`	`18`	`logger.LogInformation("Function App instance is now warm!");`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ namespace Microsoft.Azure.Functions.Worker`
`8`	`8`	`{`
`9`	`9`	`public static class FunctionExecutionContextExtensions`
`10`	`10`	`{`
`11`		`- public static ILogger<T> GetLogger<T>(this FunctionExecutionContext context)`
	`11`	`+ public static ILogger<T> GetLogger<T>(this FunctionContext context)`
`12`	`12`	`{`
`13`	`13`	`return context.InstanceServices.GetService<ILogger<T>>();`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static ILogger GetLogger(this FunctionExecutionContext context, string categoryName)`
	`16`	`+ public static ILogger GetLogger(this FunctionContext context, string categoryName)`
`17`	`17`	`{`
`18`	`18`	`return context.InstanceServices`
`19`	`19`	`.GetService<ILoggerFactory>()`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ public bool TryConvert(ConverterContext context, out object? target)`
`7`	`7`	`target = null;`
`8`	`8`
`9`	`9`	`// Special handling for the context.`
`10`		`- if (context.Parameter.Type == typeof(FunctionExecutionContext))`
	`10`	`+ if (context.Parameter.Type == typeof(FunctionContext))`
`11`	`11`	`{`
`12`		`- target = context.ExecutionContext;`
	`12`	`+ target = context.FunctionContext;`
`13`	`13`	`return true;`
`14`	`14`	`}`
`15`	`15`