Load post registered services (#15)

* Add post-registered services like TelemetryClient to Autofac. Fixes #10
* Fix empty PACKAGE_VERSION in devops.

Author: junalmeida

.github/workflows/main.yml

@@ -19,7 +19,8 @@ jobs:
   build:
     name: "Build"
     runs-on: "ubuntu-latest"
-     
+    outputs:
+      PACKAGE_VERSION: ${{ steps.version-number.outputs.PACKAGE_VERSION }}    
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -34,10 +35,12 @@ jobs:
             return commit_details.data.author.date
             
       - name: "Set Version Number"
+        id: version-number
         run: |
           echo "VERSION_NUMBER=$(date -d ${{ steps.author-date.outputs.result }} +%Y.%m.%d.%H%M)" >> $GITHUB_ENV
           PACKAGE_VERSION=$(cat "$PACKAGE_PROJECT" | grep -oPm1 "(?<=<PackageVersion>)[^<]+")
           echo "PACKAGE_VERSION=$PACKAGE_VERSION.${{ github.run_number }}" >> $GITHUB_ENV
+          echo "::set-output name=PACKAGE_VERSION::$PACKAGE_VERSION.${{ github.run_number }}"
 
       - name: Setup NuGet
         uses: NuGet/setup-nuget@v1
@@ -64,7 +67,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/master' && !contains(github.event.push.commits.*.message, 'readme') }}
     environment: 
       name: nuget
-      url: https://www.nuget.org/packages/${{ env.NUGET_NAME }}/${{ env.PACKAGE_VERSION }}
+      url: https://www.nuget.org/packages/${{ env.NUGET_NAME }}/${{ needs.build.outputs.PACKAGE_VERSION }}
 
     steps:
       - uses: actions/download-artifact@v2
@@ -79,17 +82,17 @@ jobs:
             echo "Pushing $f...";
             nuget push "$f" -NonInteractive -Source "$NUGET_SOURCE" -ApiKey $NUGET_KEY;
           done;
-        
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:
-          tag_name: "v${{ env.PACKAGE_VERSION }}"
-          release_name: ${{ env.PACKAGE_VERSION }}
+          tag_name: "v${{ needs.build.outputs.PACKAGE_VERSION }}"
+          release_name: ${{ needs.build.outputs.PACKAGE_VERSION }}
           body: |
-            Changes in this [Release](https://www.nuget.org/packages/${{ env.NUGET_NAME }}/${{ env.PACKAGE_VERSION }})
+            Changes in this [Release](https://www.nuget.org/packages/${{ env.NUGET_NAME }}/${{ needs.build.outputs.PACKAGE_VERSION }})
             ${{ github.event.head_commit.message }}
           draft: false
           prerelease: false

Autofac.Extensions.DependencyInjection.AzureFunctions/ConfigurationExtensions.cs

@@ -19,30 +19,59 @@ public static class ConfigurationExtensions
         /// <returns>The IFunctionsHostBuilder.</returns>
         public static IFunctionsHostBuilder UseAutofacServiceProviderFactory(this IFunctionsHostBuilder hostBuilder, Action<ContainerBuilder> configurationAction = null)
         {
-            var containerBuilder = new ContainerBuilder();
-            containerBuilder.Populate(hostBuilder.Services);
-            containerBuilder.RegisterModule<LoggerModule>();
+            // Adding as a Singleton service will make sure post-registered
+            // services like TelemetryClient will be in the scope.
+            hostBuilder.Services.AddSingleton((ctx) =>
+            {
+                var containerBuilder = new ContainerBuilder();
 
-            // Call the user code to configure the container
-            configurationAction?.Invoke(containerBuilder);
+                containerBuilder.Populate(hostBuilder.Services);
+                containerBuilder.RegisterModule<LoggerModule>();
 
-            var container = containerBuilder.Build();
+                // Call the user code to configure the container
+                configurationAction?.Invoke(containerBuilder);
 
-            var scoped = new ScopedJobActivator(new AutofacServiceProvider(container));
+                var container = containerBuilder.Build();
+                return new AutofacContainer(container);
+            });
 
             // Replacing Azure Functions ServiceProvider
-            hostBuilder.Services.Replace(ServiceDescriptor.Singleton(typeof(IJobActivator), scoped));
-            hostBuilder.Services.Replace(ServiceDescriptor.Singleton(typeof(IJobActivatorEx), scoped));
+            hostBuilder.Services.Replace(ServiceDescriptor.Singleton(typeof(IJobActivator), typeof(ScopedJobActivator)));
+            hostBuilder.Services.Replace(ServiceDescriptor.Singleton(typeof(IJobActivatorEx), typeof(ScopedJobActivator)));
 
             // This will create a scoped execution when a function is triggered.
-            hostBuilder.Services.AddScoped((provider) =>
-            {
-                var lifetimeScope = container.BeginLifetimeScope(Scopes.RootLifetimeScopeTag);
-
-                return lifetimeScope;
-            });
+            hostBuilder.Services.AddScoped<ScopedContainer>();
 
             return hostBuilder;
         }
     }
+
+    internal class AutofacContainer : IDisposable
+    {
+        public IContainer Container { get; }
+
+        public AutofacContainer(IContainer container)
+        {
+            Container = container;
+        }
+
+        public void Dispose()
+        {
+            Container.Dispose();
+        }
+    }
+
+    internal class ScopedContainer : IDisposable
+    {
+        public ILifetimeScope Scope { get; }
+        public ScopedContainer(AutofacContainer container)
+        {
+            Scope = container.Container.BeginLifetimeScope(Scopes.RootLifetimeScopeTag);
+        }
+
+        public void Dispose()
+        {
+            Scope.Dispose();
+        }
+    }
 }

Autofac.Extensions.DependencyInjection.AzureFunctions/ScopedJobActivator.cs

@@ -17,14 +17,14 @@ public ScopedJobActivator(IServiceProvider serviceProvider)
 
         public T CreateInstance<T>()
         {
-            var scope = _serviceProvider.GetService<ILifetimeScope>();
+            var scope = _serviceProvider.GetRequiredService<ScopedContainer>().Scope;
 
             return CreateInstance<T>(scope);
         }
 
         public T CreateInstance<T>(IFunctionInstanceEx functionInstance)
         {
-            var scope = functionInstance.InstanceServices.GetService<ILifetimeScope>() ?? _serviceProvider.GetService<ILifetimeScope>();
+            var scope = functionInstance.InstanceServices.GetService<ScopedContainer>()?.Scope ?? _serviceProvider.GetRequiredService<ScopedContainer>()?.Scope;
 
             // Some dependencies of ILoggerFactory are registered after 
             // FunctionsStartup, thus not allowing us to get the 

SampleAutofacFunction/Functions/Function2.cs

@@ -1,3 +1,4 @@
+using Microsoft.ApplicationInsights;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.WebJobs;
@@ -6,6 +7,7 @@
 using SampleAutofacFunction.Services;
 using SampleAutofacFunction.Settings;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace SampleAutofacFunction.Functions
@@ -15,13 +17,15 @@ public class Function2 : IDisposable
         private readonly IService1 _service1;
         private readonly MySettings _settings;
         private readonly ILogger _logger;
+        private readonly TelemetryClient _client;
         private readonly Guid _id = Guid.NewGuid();
 
-        public Function2(IService1 service1, MySettings settings, ILogger logger)
+        public Function2(IService1 service1, MySettings settings, ILogger logger, TelemetryClient client)
         {
             _service1 = service1;
             _settings = settings;
             _logger = logger;
+            _client = client;
             _logger.LogWarning($"Creating {this}");
         }
 
@@ -46,6 +50,14 @@ This HTTP triggered function executed successfully.
 UrlRequested: {req.Path}
 ";
 
+            _client.TrackEvent("HTTP Function Event", new Dictionary<string, string>() {
+                { "Injected Service Value", value },
+                { "MySettings Value1", _settings.Value1 },
+                { "MySettings Value2", _settings.Value2 },
+                { "UrlRequested", req.Path}
+            });
+
+
             await Task.Delay(1000);
             _logger.LogInformation(responseMessage);
             return new OkObjectResult(responseMessage);

SampleAutofacFunction/SampleAutofacFunction.csproj

@@ -4,7 +4,9 @@
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.4" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.27" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.11" />
   </ItemGroup>
   <ItemGroup>

SampleAutofacFunction/Startup.cs

@@ -22,6 +22,7 @@ public override void Configure(IFunctionsHostBuilder builder)
         private void ConfigureLogger(ILoggingBuilder builder, IConfiguration config)
         {
             builder.AddConfiguration(config.GetSection("Logging"));
+            builder.AddApplicationInsightsWebJobs();
         }
 
         private void ConfigureContainer(ContainerBuilder builder)