Merge branch 'dev' into v3.x

Author: brettsam

src/WebJobs.Script.Grpc/generate_protos.bat

@@ -34,7 +34,7 @@ setlocal
 @rem enter Script.Rpc directory
 cd /d %~dp0
 
-set NUGET_PATH=%UserProfile%\.nuget\packages
+set NUGET_PATH="%UserProfile%\.nuget\packages"
 set GRPC_TOOLS_PATH=%NUGET_PATH%\grpc.tools\1.20.1\tools\windows_x86
 set PROTO_PATH=.\azure-functions-language-worker-protobuf\src\proto
 set PROTO=.\azure-functions-language-worker-protobuf\src\proto\FunctionRpc.proto

src/WebJobs.Script.WebHost/Configuration/ScriptApplicationHostOptionsSetup.cs

@@ -59,6 +59,7 @@ public void Configure(string name, ScriptApplicationHostOptions options)
                 options.ScriptPath = Path.Combine(tempRoot, @"functions\standby\wwwroot");
                 options.SecretsPath = Path.Combine(tempRoot, @"functions\standby\secrets");
                 options.IsSelfHost = options.IsSelfHost;
+                options.IsStandbyConfiguration = true;
             }
         }
 

src/WebJobs.Script.WebHost/DependencyInjection/DryIoc/Container.cs

@@ -64,7 +64,6 @@ namespace DryIoc
     using MemberAssignmentExpr = System.Linq.Expressions.MemberAssignment;
     using FactoryDelegateExpr = System.Linq.Expressions.Expression<FactoryDelegate>;
     using global::Microsoft.Azure.WebJobs.Script.WebHost.DependencyInjection.DryIoc;
-
 #endif
 
     /// <summary>IoC Container. Documentation is available at https://bitbucket.org/dadhi/dryioc. </summary>
@@ -432,11 +431,11 @@ private void ThrowIfContainerDisposed()
             _scopeContext == null ? _ownCurrentScope : _scopeContext.GetCurrentOrDefault();
 
         /// <inheritdoc />
-        public IResolverContext WithCurrentScope(IScope scope)
+        public IResolverContext WithCurrentScope(IScope scope, bool preferInterpretaion = false)
         {
             ThrowIfContainerDisposed();
             return new Container(Rules, _registry, _singletonScope, _scopeContext,
-                scope, _disposed, _disposeStackTrace, parent: this, root: _root ?? this);
+                scope, _disposed, _disposeStackTrace, parent: this, root: _root ?? this, preferInterpretation: preferInterpretaion);
         }
 
         void IResolverContext.UseInstance(Type serviceType, object instance, IfAlreadyRegistered ifAlreadyRegistered,
@@ -693,7 +692,7 @@ public IContainer With(Rules rules, IScopeContext scopeContext, RegistrySharing
                 : Ref.Of(_registry.Value.WithoutCache());
 
             return new Container(rules, registry, singletonScope, scopeContext,
-                _ownCurrentScope, _disposed, _disposeStackTrace, _parent, _root);
+                _ownCurrentScope, _disposed, _disposeStackTrace, _parent, _root, _preferInterpretation);
         }
 
         /// <summary>Produces new container which prevents any further registrations.</summary>
@@ -2593,7 +2592,7 @@ public interface IResolverContext : IResolver, IDisposable
         IScope CurrentScope { get; }
 
         /// <summary>Creates resolver context with specified current scope (or container which implements the context).</summary>
-        IResolverContext WithCurrentScope(IScope scope);
+        IResolverContext WithCurrentScope(IScope scope, bool preferInterpretation);
 
         /// <summary>Allows to put instance into the scope.</summary>
         void UseInstance(Type serviceType, object instance, IfAlreadyRegistered IfAlreadyRegistered,
@@ -2687,7 +2686,7 @@ public static IScope GetNamedScope(this IResolverContext r, object name, bool th
         ///     handler.Handle(data);
         /// }
         /// ]]></code></example>
-        public static IResolverContext OpenScope(this IResolverContext r, object name = null, bool trackInParent = false)
+        public static IResolverContext OpenScope(this IResolverContext r, object name = null, bool trackInParent = false, bool preferInterpretation = false)
         {
             // todo: Should we use OwnCurrentScope, then should it be in ResolverContext?
             var openedScope = r.ScopeContext == null
@@ -2697,7 +2696,7 @@ public static IResolverContext OpenScope(this IResolverContext r, object name =
             if (trackInParent)
                 (openedScope.Parent ?? r.SingletonScope).TrackDisposable(openedScope);
 
-            return r.WithCurrentScope(openedScope);
+            return r.WithCurrentScope(openedScope, preferInterpretation);
         }
     }
 

src/WebJobs.Script.WebHost/DependencyInjection/ScopedResolver.cs

@@ -40,7 +40,8 @@ public void Dispose()
         internal ServiceScope CreateChildScope(IServiceScopeFactory rootScopeFactory)
         {
             var scopedRoot = rootScopeFactory.CreateScope();
-            Container scopedContext = Container.OpenScope() as Container;
+            var preferInterpretation = (Container as Container).PreferInterpretation;
+            Container scopedContext = Container.OpenScope(preferInterpretation: preferInterpretation) as Container;
 
             Rules rules = scopedContext.Rules;
             foreach (var unknownServiceResolver in scopedContext.Rules.UnknownServiceResolvers)

src/WebJobs.Script.WebHost/DependencyInjection/WebHostServiceProvider.cs

@@ -48,7 +48,7 @@ public object GetService(Type serviceType)
 
         public IServiceScope CreateScope()
         {
-            return new JobHostServiceScope(_container.OpenScope());
+            return new JobHostServiceScope(_container.OpenScope(preferInterpretation: _container.PreferInterpretation));
         }
     }
 }

src/WebJobs.Script.WebHost/Diagnostics/LinuxAppServiceEventGenerator.cs

@@ -9,13 +9,15 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics
     internal class LinuxAppServiceEventGenerator : LinuxEventGenerator
     {
         private readonly LinuxAppServiceFileLoggerFactory _loggerFactory;
+        private readonly HostNameProvider _hostNameProvider;
 
-        public LinuxAppServiceEventGenerator(LinuxAppServiceFileLoggerFactory loggerFactory)
+        public LinuxAppServiceEventGenerator(LinuxAppServiceFileLoggerFactory loggerFactory, HostNameProvider hostNameProvider)
         {
             _loggerFactory = loggerFactory;
+            _hostNameProvider = hostNameProvider ?? throw new ArgumentNullException(nameof(hostNameProvider));
         }
 
-        public static string TraceEventRegex { get; } = $"(?<Level>[0-6]),(?<SubscriptionId>[^,]*),(?<AppName>[^,]*),(?<FunctionName>[^,]*),(?<EventName>[^,]*),(?<Source>[^,]*),\"(?<Details>.*)\",\"(?<Summary>.*)\",(?<HostVersion>[^,]*),(?<EventTimestamp>[^,]+),(?<ExceptionType>[^,]*),\"(?<ExceptionMessage>.*)\",(?<FunctionInvocationId>[^,]*),(?<HostInstanceId>[^,]*),(?<ActivityId>[^,\"]*)";
+        public static string TraceEventRegex { get; } = $"(?<Level>[0-6]),(?<SubscriptionId>[^,]*),(?<HostName>[^,]*),(?<AppName>[^,]*),(?<FunctionName>[^,]*),(?<EventName>[^,]*),(?<Source>[^,]*),\"(?<Details>.*)\",\"(?<Summary>.*)\",(?<HostVersion>[^,]*),(?<EventTimestamp>[^,]+),(?<ExceptionType>[^,]*),\"(?<ExceptionMessage>.*)\",(?<FunctionInvocationId>[^,]*),(?<HostInstanceId>[^,]*),(?<ActivityId>[^,\"]*)";
 
         public static string MetricEventRegex { get; } = $"(?<SubscriptionId>[^,]*),(?<AppName>[^,]*),(?<FunctionName>[^,]*),(?<EventName>[^,]*),(?<Average>\\d*),(?<Min>\\d*),(?<Max>\\d*),(?<Count>\\d*),(?<HostVersion>[^,]*),(?<EventTimestamp>[^,]+),(?<Details>[^,\"]*)";
 
@@ -27,10 +29,11 @@ public override void LogFunctionTraceEvent(LogLevel level, string subscriptionId
         {
             var eventTimestamp = DateTime.UtcNow.ToString(EventTimestampFormat);
             var hostVersion = ScriptHost.Version;
+            var hostName = _hostNameProvider.Value;
             FunctionsSystemLogsEventSource.Instance.SetActivityId(activityId);
 
             var logger = _loggerFactory.GetOrCreate(FunctionsLogsCategory);
-            WriteEvent(logger, $"{(int)ToEventLevel(level)},{subscriptionId},{appName},{functionName},{eventName},{source},{NormalizeString(details)},{NormalizeString(summary)},{hostVersion},{eventTimestamp},{exceptionType},{NormalizeString(exceptionMessage)},{functionInvocationId},{hostInstanceId},{activityId}");
+            WriteEvent(logger, $"{(int)ToEventLevel(level)},{subscriptionId},{hostName},{appName},{functionName},{eventName},{source},{NormalizeString(details)},{NormalizeString(summary)},{hostVersion},{eventTimestamp},{exceptionType},{NormalizeString(exceptionMessage)},{functionInvocationId},{hostInstanceId},{activityId}");
         }
 
         public override void LogFunctionMetricEvent(string subscriptionId, string appName, string functionName, string eventName, long average,

src/WebJobs.Script.WebHost/Diagnostics/LinuxEventGenerator.cs

@@ -12,16 +12,23 @@ public abstract class LinuxEventGenerator : IEventGenerator
         public static readonly string EventTimestampFormat = "MM/dd/yyyy hh:mm:ss.fff tt";
 
         // These names should match the source file names for fluentd
-        public static readonly string FunctionsLogsCategory = "functionslogs";
+        public static readonly string FunctionsLogsCategory = "functionslogsv2";
         public static readonly string FunctionsMetricsCategory = "functionsmetrics";
         public static readonly string FunctionsDetailsCategory = "functionsdetails";
         public static readonly string FunctionsExecutionEventsCategory = "functionexecutionevents";
 
         internal static string NormalizeString(string value)
         {
-            // need to remove newlines for csv output
+            // Need to remove newlines for csv output
             value = value.Replace(Environment.NewLine, " ");
 
+            // Need to replace double quotes with single quotes as
+            // our regex query looks at double quotes as delimeter for
+            // individual column
+            // TODO: Once the regex takes into account for quotes, we can
+            // safely remove this
+            value = value.Replace("\"", "'");
+
             // Wrap string literals in enclosing quotes
             // For string columns that may contain quotes and/or
             // our delimiter ',', before writing the value we

src/WebJobs.Script.WebHost/HostNameProvider.cs

@@ -21,13 +21,11 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost
     public class HostNameProvider
     {
         private readonly IEnvironment _environment;
-        private readonly ILogger _logger;
         private string _hostName;
 
-        public HostNameProvider(IEnvironment environment, ILogger<HostNameProvider> logger)
+        public HostNameProvider(IEnvironment environment)
         {
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
-            _logger = logger;
         }
 
         public virtual string Value
@@ -52,17 +50,17 @@ public virtual string Value
             }
         }
 
-        public virtual void Synchronize(HttpRequest request)
+        public virtual void Synchronize(HttpRequest request, ILogger logger)
         {
             string hostNameHeaderValue = request.Headers[ScriptConstants.AntaresDefaultHostNameHeader];
             if (!string.IsNullOrEmpty(hostNameHeaderValue) &&
                 string.Compare(Value, hostNameHeaderValue) != 0)
             {
-                    if (string.Compare(Value, hostNameHeaderValue) != 0)
-                    {
-                        _logger.LogInformation("HostName updated from '{0}' to '{1}'", Value, hostNameHeaderValue);
-                        _hostName = hostNameHeaderValue;
-                    }
+                if (string.Compare(Value, hostNameHeaderValue) != 0)
+                {
+                    logger.LogInformation("HostName updated from '{0}' to '{1}'", Value, hostNameHeaderValue);
+                    _hostName = hostNameHeaderValue;
+                }
             }
         }