Merge branch 'dev' into shkr/placeholder_start

Author: kshyju

eng/build/Workers.Java.props

@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.2" />
   </ItemGroup>
 
 </Project>

release_notes.md

@@ -1,20 +1,9 @@
+### Release notes
+
 <!-- Please add your release notes in the following format:
 - My change description (#PR)
 -->
-- Memory allocation optimizations in `ScriptStartupTypeLocator.GetExtensionsStartupTypesAsync` (#11012)
-- Fix invocation timeout when incoming request contains "x-ms-invocation-id" header (#10980)
-- Warn if .azurefunctions folder does not exist (#10967)
-- Memory allocation & CPU optimizations in `GrpcMessageExtensionUtilities.ConvertFromHttpMessageToExpando` (#11054)
-- Replace `Timer` with `while`-loop in `FlexConsumptionMetricsPublisher` (#11071)
-- Memory allocation optimizations in `ReadLanguageWorkerFile` by reading files in buffered chunks, preventing LOH allocations (#11069)
-- Enhancing the capability to send startup failure logs to AppInsights/Otel. (#11055)
-- Added support for collecting cross-platform perf traces and generating PGO JIT traces (#11062)
-- Memory allocation optimizations in `DependencyHelper.GetExtensionRequirements` (#11022)
-- Fix Instance Manager for CV1 Migration (#11072)
-- Avoid setting up OTel and AzMon exporter in the placeholder mode. (#11090)
-- Update Java Worker Version to [2.19.1](https://github.com/Azure/azure-functions-java-worker/releases/tag/2.19.1)
-- Memory allocation optimizations in `FeatureFlags.IsEnabled` by adopting zero-allocation `ContainsToken` for efficient delimited token search (#11075)
-- Improvements to coldstart pipeline (#11102).
-- Update Python Worker Version to [4.38.0](https://github.com/Azure/azure-functions-python-worker/releases/tag/4.38.0)
-- Only start the Diagnostic Events flush logs timer when events are present, preventing unnecessary flush attempts (#11100).
 - Improved metadata binding validation (#11101)
+- Adding activity sources for Durable and WebJobs (Kafka and RabbitMQ) (#11137)
+- Add JitTrace Files for v4.1041
+- Fix startup deadlock on transient exceptions (#11142)

src/Directory.Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>4.1041.100</VersionPrefix>
+    <VersionPrefix>4.1042.100</VersionPrefix>
     <UpdateBuildNumber>true</UpdateBuildNumber>
   </PropertyGroup>
 </Project>

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs

@@ -26,6 +26,7 @@
 using Microsoft.Azure.WebJobs.Script.Grpc.Eventing;
 using Microsoft.Azure.WebJobs.Script.Grpc.Extensions;
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.WebJobs.Script.Http;
 using Microsoft.Azure.WebJobs.Script.ManagedDependencies;
 using Microsoft.Azure.WebJobs.Script.Workers;
 using Microsoft.Azure.WebJobs.Script.Workers.Rpc;

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannelFactory.cs

@@ -8,6 +8,7 @@
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Eventing;
 using Microsoft.Azure.WebJobs.Script.Grpc.Eventing;
+using Microsoft.Azure.WebJobs.Script.Http;
 using Microsoft.Azure.WebJobs.Script.Workers;
 using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using Microsoft.Azure.WebJobs.Script.Workers.SharedMemoryDataTransfer;

src/WebJobs.Script.Grpc/GrpcServiceCollectionsExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.WebJobs.Script.Http;
 using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using Microsoft.Extensions.DependencyInjection;
 

src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

@@ -18,7 +18,6 @@
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
     <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
-    <PackageReference Include="Yarp.ReverseProxy" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/WebJobs.Script.SiteExtension/New-PrivateSiteExtension.ps1

@@ -65,7 +65,7 @@ if (-not (Join-Path $InputPath "extension.xml" | Test-Path))
     exit 1
 }
 
-if ($AppendOutputName || !$OutputPath)
+if ($AppendOutputName -or !$OutputPath)
 {
     $runtime = $Bitness -eq '32bit' ? 'win-x86' : 'win-x64'
     $leaf = (Split-Path $InputPath -Leaf)

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

@@ -29,7 +29,8 @@ public class AzureMonitorDiagnosticLogger : ILogger
         private readonly IEventGenerator _eventGenerator;
         private readonly IEnvironment _environment;
         private readonly IExternalScopeProvider _scopeProvider;
-        private AppServiceOptions _appServiceOptions;
+        private bool _isAzureMonitorLoggingEnabled;
+        private IOptionsMonitor<AppServiceOptions> _appServiceOptionsMonitor;
 
         public AzureMonitorDiagnosticLogger(string category, string hostInstanceId, IEventGenerator eventGenerator, IEnvironment environment, IExternalScopeProvider scopeProvider,
             HostNameProvider hostNameProvider, IOptionsMonitor<AppServiceOptions> appServiceOptionsMonitor)
@@ -40,10 +41,9 @@ public AzureMonitorDiagnosticLogger(string category, string hostInstanceId, IEve
             _environment = environment ?? throw new ArgumentNullException(nameof(environment));
             _scopeProvider = scopeProvider ?? throw new ArgumentNullException(nameof(scopeProvider));
             _hostNameProvider = hostNameProvider ?? throw new ArgumentNullException(nameof(hostNameProvider));
-            _ = appServiceOptionsMonitor ?? throw new ArgumentNullException(nameof(appServiceOptionsMonitor));
-
-            appServiceOptionsMonitor.OnChange(newOptions => _appServiceOptions = newOptions);
-            _appServiceOptions = appServiceOptionsMonitor.CurrentValue;
+            _appServiceOptionsMonitor = appServiceOptionsMonitor ?? throw new ArgumentNullException(nameof(appServiceOptionsMonitor));
+            UpdateAppServiceOptions(_appServiceOptionsMonitor.CurrentValue);
+            _appServiceOptionsMonitor.OnChange(UpdateAppServiceOptions);
 
             _roleInstance = _environment.GetInstanceId();
 
@@ -55,7 +55,7 @@ public AzureMonitorDiagnosticLogger(string category, string hostInstanceId, IEve
         public bool IsEnabled(LogLevel logLevel)
         {
             // We want to instantiate this Logger in placeholder mode to warm it up, but do not want to log anything.
-            return !string.IsNullOrEmpty(_hostNameProvider.Value) && !_environment.IsPlaceholderModeEnabled();
+            return _isAzureMonitorLoggingEnabled && !string.IsNullOrEmpty(_hostNameProvider.Value) && !_environment.IsPlaceholderModeEnabled();
         }
 
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
@@ -107,7 +107,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             using (JsonTextWriter writer = new JsonTextWriter(sw) { Formatting = Formatting.None })
             {
                 writer.WriteStartObject();
-                WritePropertyIfNotNull(writer, "appName", _appServiceOptions.AppName);
+                WritePropertyIfNotNull(writer, "appName", _appServiceOptionsMonitor.CurrentValue.AppName);
                 WritePropertyIfNotNull(writer, "roleInstance", _roleInstance);
                 WritePropertyIfNotNull(writer, "message", formattedMessage);
                 WritePropertyIfNotNull(writer, "category", _category);
@@ -136,6 +136,11 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             _eventGenerator.LogAzureMonitorDiagnosticLogEvent(logLevel, _hostNameProvider.Value, AzureMonitorOperationName, AzureMonitorCategoryName, _regionName, sw.ToString());
         }
 
+        private void UpdateAppServiceOptions(AppServiceOptions appServiceOptions)
+        {
+            _isAzureMonitorLoggingEnabled = !(_environment.IsConsumptionOnLegion() && !_appServiceOptionsMonitor.CurrentValue.IsAzureMonitorLoggingEnabled);
+        }
+
         private static void WritePropertyIfNotNull<T>(JsonTextWriter writer, string propertyName, T propertyValue)
         {
             if (propertyValue != null)

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

@@ -729,7 +729,7 @@ internal HttpRequestMessage BuildSetTriggersRequest()
         }
 
         // This function will call POST https://{app}.azurewebsites.net/operation/settriggers with the content
-        // of triggers. It'll verify app ownership using a SWT token valid for 5 minutes. It should be plenty.
+        // of triggers. It'll verify app ownership using a site token valid for 5 minutes. It should be plenty.
         private async Task<(bool Success, string ErrorMessage)> SetTriggersAsync(string content)
         {
             // sanitize the content before logging
@@ -747,12 +747,6 @@ internal HttpRequestMessage BuildSetTriggersRequest()
                 request.Headers.Add("User-Agent", ScriptConstants.FunctionsUserAgent);
                 request.Content = new StringContent(content, Encoding.UTF8, "application/json");
 
-                if (_hostingConfigOptions.Value.SwtIssuerEnabled)
-                {
-                    string swtToken = SimpleWebTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(5));
-                    request.Headers.Add(ScriptConstants.SiteRestrictedTokenHeaderName, swtToken);
-                }
-
                 string jwtToken = JwtTokenHelper.CreateToken(DateTime.UtcNow.AddMinutes(5));
                 request.Headers.Add(ScriptConstants.SiteTokenHeaderName, jwtToken);