Switch pipeline trace to DiagnosticSource

src/Autofac/Builder/DeferredCallback.cs

@@ -28,8 +28,8 @@ public DeferredCallback(Action<IComponentRegistryBuilder> callback)
                 throw new ArgumentNullException(nameof(callback));
             }
 
-            this.Id = Guid.NewGuid();
-            this.Callback = callback;
+            Id = Guid.NewGuid();
+            Callback = callback;
         }
 
         /// <summary>
@@ -46,7 +46,7 @@ public Action<IComponentRegistryBuilder> Callback
         {
             get
             {
-                return this._callback;
+                return _callback;
             }
 
             set
@@ -56,7 +56,7 @@ public Action<IComponentRegistryBuilder> Callback
                     throw new ArgumentNullException(nameof(value));
                 }
 
-                this._callback = value;
+                _callback = value;
             }
         }
 

src/Autofac/Builder/SimpleActivatorData.cs

@@ -39,9 +39,7 @@ public class SimpleActivatorData : IConcreteActivatorData
         /// <param name="activator">The activator to return.</param>
         public SimpleActivatorData(IInstanceActivator activator)
         {
-            if (activator == null) throw new ArgumentNullException(nameof(activator));
-
-            Activator = activator;
+            Activator = activator ?? throw new ArgumentNullException(nameof(activator));
         }
 
         /// <summary>

src/Autofac/Core/Activators/ProvidedInstance/ProvidedInstanceActivator.cs

@@ -67,7 +67,7 @@ private object GetInstance()
             CheckNotDisposed();
 
             if (_activated)
-                throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, ProvidedInstanceActivatorResources.InstanceAlreadyActivated, this._instance.GetType()));
+                throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, ProvidedInstanceActivatorResources.InstanceAlreadyActivated, _instance.GetType()));
 
             _activated = true;
 

src/Autofac/Core/Activators/Reflection/BoundConstructor.cs

@@ -119,7 +119,7 @@ public object Instantiate()
         {
             if (!CanInstantiate)
             {
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, BoundConstructorResources.CannotInstantitate, this.Description));
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, BoundConstructorResources.CannotInstantitate, Description));
             }
 
             var values = new object?[_valueRetrievers!.Length];

src/Autofac/Core/Activators/Reflection/NoConstructorsFoundException.cs

@@ -51,7 +51,7 @@ public NoConstructorsFoundException(Type offendingType, string message)
             : base(message)
         {
             if (offendingType == null) throw new ArgumentNullException(nameof(offendingType));
-            this.OffendingType = offendingType;
+            OffendingType = offendingType;
         }
 
         /// <summary>
@@ -74,7 +74,7 @@ public NoConstructorsFoundException(Type offendingType, string message, Exceptio
             : base(message, innerException)
         {
             if (offendingType == null) throw new ArgumentNullException(nameof(offendingType));
-            this.OffendingType = offendingType;
+            OffendingType = offendingType;
         }
 
         /// <summary>

src/Autofac/Core/Activators/Reflection/ReflectionActivator.cs

@@ -109,7 +109,7 @@ public void ConfigurePipeline(IComponentRegistryServices componentRegistryServic
 
             _constructorBinders = binders;
 
-            pipelineBuilder.Use(this.ToString(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
+            pipelineBuilder.Use(ToString(), PipelinePhase.Activation, MiddlewareInsertionMode.EndOfPhase, (ctxt, next) =>
             {
                 ctxt.Instance = ActivateInstance(ctxt, ctxt.Parameters);
 

src/Autofac/Core/Container.cs

@@ -39,7 +39,7 @@ namespace Autofac.Core
     [DebuggerDisplay("Tag = {Tag}, IsDisposed = {IsDisposed}")]
     public class Container : Disposable, IContainer, IServiceProvider
     {
-        private readonly ILifetimeScope _rootLifetimeScope;
+        private readonly LifetimeScope _rootLifetimeScope;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Container"/> class.
@@ -100,7 +100,7 @@ public ILifetimeScope BeginLifetimeScope(object tag, Action<ContainerBuilder> co
         }
 
         /// <inheritdoc/>
-        public DiagnosticListener DiagnosticSource => this._rootLifetimeScope.DiagnosticSource;
+        public DiagnosticListener DiagnosticSource => _rootLifetimeScope.DiagnosticSource;
 
         /// <summary>
         /// Gets the disposer associated with this container. Instances can be associated

src/Autofac/Core/Lifetime/LifetimeScope.cs

@@ -81,7 +81,7 @@ protected LifetimeScope(IComponentRegistry componentRegistry, LifetimeScope pare
 
             _sharedInstances[SelfRegistrationId] = this;
             RootLifetimeScope = _parentScope.RootLifetimeScope;
-            this.DiagnosticSource = _parentScope.DiagnosticSource;
+            DiagnosticSource = _parentScope.DiagnosticSource;
         }
 
         /// <summary>
@@ -96,7 +96,8 @@ public LifetimeScope(IComponentRegistry componentRegistry, object tag)
 
             _sharedInstances[SelfRegistrationId] = this;
             RootLifetimeScope = this;
-            this.DiagnosticSource = new DiagnosticListener("Autofac");
+            DiagnosticSource = new DiagnosticListener("Autofac");
+            Disposer.AddInstanceForDisposal(DiagnosticSource);
         }
 
         /// <summary>
@@ -160,8 +161,11 @@ private void RaiseBeginning(ILifetimeScope scope)
             handler?.Invoke(this, new LifetimeScopeBeginningEventArgs(scope));
         }
 
-        /// <inheritdoc/>
-        public DiagnosticListener DiagnosticSource { get; }
+        /// <summary>
+        /// Gets the <see cref="System.Diagnostics.DiagnosticListener"/> to which
+        /// trace events should be written.
+        /// </summary>
+        internal DiagnosticListener DiagnosticSource { get; }
 
         /// <summary>
         /// Begin a new anonymous sub-scope, with additional components available to it.
@@ -292,7 +296,7 @@ public object ResolveComponent(ResolveRequest request)
 
             CheckNotDisposed();
 
-            var operation = new ResolveOperation(this);
+            var operation = new ResolveOperation(this, DiagnosticSource);
             var handler = ResolveOperationBeginning;
             handler?.Invoke(this, new ResolveOperationBeginningEventArgs(operation));
             return operation.Execute(request);

src/Autofac/Core/Lifetime/MatchingScopeLifetime.cs

@@ -43,12 +43,7 @@ public class MatchingScopeLifetime : IComponentLifetime
         /// <param name="lifetimeScopeTagsToMatch">The tags applied to matching scopes.</param>
         public MatchingScopeLifetime(params object[] lifetimeScopeTagsToMatch)
         {
-            if (lifetimeScopeTagsToMatch == null)
-            {
-                throw new ArgumentNullException(nameof(lifetimeScopeTagsToMatch));
-            }
-
-            this._tagsToMatch = lifetimeScopeTagsToMatch;
+            _tagsToMatch = lifetimeScopeTagsToMatch ?? throw new ArgumentNullException(nameof(lifetimeScopeTagsToMatch));
         }
 
         /// <summary>
@@ -62,7 +57,7 @@ public IEnumerable<object> TagsToMatch
         {
             get
             {
-                return this._tagsToMatch;
+                return _tagsToMatch;
             }
         }
 
@@ -82,7 +77,7 @@ public ISharingLifetimeScope FindScope(ISharingLifetimeScope mostNestedVisibleSc
             ISharingLifetimeScope? next = mostNestedVisibleScope;
             while (next != null)
             {
-                if (this._tagsToMatch.Contains(next.Tag))
+                if (_tagsToMatch.Contains(next.Tag))
                 {
                     return next;
                 }
@@ -91,7 +86,7 @@ public ISharingLifetimeScope FindScope(ISharingLifetimeScope mostNestedVisibleSc
             }
 
             throw new DependencyResolutionException(string.Format(
-                CultureInfo.CurrentCulture, MatchingScopeLifetimeResources.MatchingScopeNotFound, string.Join(", ", this._tagsToMatch)));
+                CultureInfo.CurrentCulture, MatchingScopeLifetimeResources.MatchingScopeNotFound, string.Join(", ", _tagsToMatch)));
         }
     }
 }

src/Autofac/Core/Resolving/Pipeline/ResolvePipelineBuilder.cs

@@ -270,34 +270,25 @@ Action<ResolveRequestContextBase> Chain(Action<ResolveRequestContextBase> next,
 
                 return (ctxt) =>
                 {
-                    // Optimise the path depending on whether diagnostics are enabled.
-                    if (ctxt.DiagnosticSource.MiddlewareDiagnosticsEnabled())
+                    ctxt.DiagnosticSource.MiddlewareStart(ctxt, stage);
+                    var succeeded = false;
+                    try
                     {
-                        ctxt.DiagnosticSource.MiddlewareStart(ctxt, stage);
-                        var succeeded = false;
-                        try
+                        ctxt.PhaseReached = stagePhase;
+                        stage.Execute(ctxt, next);
+                        succeeded = true;
+                    }
+                    finally
+                    {
+                        if (succeeded)
                         {
-                            ctxt.PhaseReached = stagePhase;
-                            stage.Execute(ctxt, next);
-                            succeeded = true;
+                            ctxt.DiagnosticSource.MiddlewareSuccess(ctxt, stage);
                         }
-                        finally
+                        else
                         {
-                            if (succeeded)
-                            {
-                                ctxt.DiagnosticSource.MiddlewareSuccess(ctxt, stage);
-                            }
-                            else
-                            {
-                                ctxt.DiagnosticSource.MiddlewareFailure(ctxt, stage);
-                            }
+                            ctxt.DiagnosticSource.MiddlewareFailure(ctxt, stage);
                         }
                     }
-                    else
-                    {
-                        ctxt.PhaseReached = stagePhase;
-                        stage.Execute(ctxt, next);
-                    }
                 };
             }
 

src/Autofac/Core/Resolving/Pipeline/ResolveRequestContext.cs

@@ -23,6 +23,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
+using System.Diagnostics;
+
 namespace Autofac.Core.Resolving.Pipeline
 {
     /// <summary>
@@ -36,11 +38,15 @@ internal sealed class ResolveRequestContext : ResolveRequestContextBase
         /// <param name="owningOperation">The owning resolve operation.</param>
         /// <param name="request">The initiating resolve request.</param>
         /// <param name="scope">The lifetime scope.</param>
+        /// <param name="diagnosticSource">
+        /// The <see cref="System.Diagnostics.DiagnosticListener"/> to which trace events should be written.
+        /// </param>
         internal ResolveRequestContext(
             ResolveOperationBase owningOperation,
             ResolveRequest request,
-            ISharingLifetimeScope scope)
-            : base(owningOperation, request, scope)
+            ISharingLifetimeScope scope,
+            DiagnosticListener diagnosticSource)
+            : base(owningOperation, request, scope, diagnosticSource)
         {
         }
 

src/Autofac/Core/Resolving/Pipeline/ResolveRequestContextBase.cs

@@ -48,16 +48,20 @@ public abstract class ResolveRequestContextBase : IComponentContext
         /// <param name="owningOperation">The owning resolve operation.</param>
         /// <param name="request">The initiating resolve request.</param>
         /// <param name="scope">The lifetime scope.</param>
+        /// <param name="diagnosticSource">
+        /// The <see cref="System.Diagnostics.DiagnosticListener"/> to which trace events should be written.
+        /// </param>
         internal ResolveRequestContextBase(
             ResolveOperationBase owningOperation,
             ResolveRequest request,
-            ISharingLifetimeScope scope)
+            ISharingLifetimeScope scope,
+            DiagnosticListener diagnosticSource)
         {
             Operation = owningOperation;
             ActivationScope = scope;
             Parameters = request.Parameters;
             PhaseReached = PipelinePhase.ResolveRequestStart;
-            this.DiagnosticSource = scope.DiagnosticSource;
+            DiagnosticSource = diagnosticSource;
             _resolveRequest = request;
         }
 
@@ -107,9 +111,9 @@ public abstract class ResolveRequestContextBase : IComponentContext
         public bool NewInstanceActivated => Instance is object && PhaseReached == PipelinePhase.Activation;
 
         /// <summary>
-        /// Gets the <see cref="System.Diagnostics.DiagnosticSource"/> for the request.
+        /// Gets the <see cref="System.Diagnostics.DiagnosticListener"/> to which trace events should be written.
         /// </summary>
-        public DiagnosticSource DiagnosticSource { get; }
+        public DiagnosticListener DiagnosticSource { get; }
 
         /// <summary>
         /// Gets the current resolve parameters. These can be changed using the <see cref="ChangeParameters(IEnumerable{Parameter})"/> method.

src/Autofac/Core/Resolving/ResolveOperation.cs

@@ -23,9 +23,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-using System.Diagnostics.CodeAnalysis;
-using Autofac.Core.Resolving.Pipeline;
-using Autofac.Diagnostics;
+using System.Diagnostics;
 
 namespace Autofac.Core.Resolving
 {
@@ -40,16 +38,18 @@ internal sealed class ResolveOperation : ResolveOperationBase
         /// </summary>
         /// <param name="mostNestedLifetimeScope">The most nested scope in which to begin the operation. The operation
         /// can move upward to less nested scopes as components with wider sharing scopes are activated.</param>
-        public ResolveOperation(ISharingLifetimeScope mostNestedLifetimeScope)
-            : base(mostNestedLifetimeScope)
+        /// <param name="diagnosticSource">
+        /// The <see cref="System.Diagnostics.DiagnosticListener"/> to which trace events should be written.
+        /// </param>
+        public ResolveOperation(ISharingLifetimeScope mostNestedLifetimeScope, DiagnosticListener diagnosticSource)
+            : base(mostNestedLifetimeScope, diagnosticSource)
         {
         }
 
         /// <summary>
         /// Execute the complete resolve operation.
         /// </summary>
         /// <param name="request">The resolution context.</param>
-        [SuppressMessage("CA1031", "CA1031", Justification = "General exception gets rethrown in a DependencyResolutionException.")]
         public object Execute(ResolveRequest request)
         {
             return ExecuteOperation(request);