From 81b741c80206fa9779f959b7e471e79648d59786 Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Fri, 1 Aug 2025 15:42:53 -0700 Subject: [PATCH 1/3] bundle message updated --- .../Diagnostics/Extensions/LoggerExtension.cs | 21 +++---------------- .../FunctionAppValidationServiceTests.cs | 9 ++------ 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/WebJobs.Script/Diagnostics/Extensions/LoggerExtension.cs b/src/WebJobs.Script/Diagnostics/Extensions/LoggerExtension.cs index 225f86ae84..99228e761d 100644 --- a/src/WebJobs.Script/Diagnostics/Extensions/LoggerExtension.cs +++ b/src/WebJobs.Script/Diagnostics/Extensions/LoggerExtension.cs @@ -206,15 +206,10 @@ internal static class LoggerExtension private static readonly Action _publishingMetrics = LoggerMessage.Define(LogLevel.Debug, new EventId(338, nameof(PublishingMetrics)), "{metrics}"); - private static readonly Action _outdatedExtensionBundleFuture = + private static readonly Action _outdatedExtensionBundle = LoggerMessage.Define(LogLevel.Warning, new EventId(342, nameof(OutdatedExtensionBundle)), - "Your current bundle version {currentVersion} will reach end of support on Aug 4, 2026. Upgrade to [{suggestedMinVersion}.*, {suggestedMaxVersion}.0.0). For more information, see https://aka.ms/FunctionsBundlesUpgrade"); - - private static readonly Action _outdatedExtensionBundlePast = - LoggerMessage.Define(LogLevel.Warning, - new EventId(342, nameof(OutdatedExtensionBundle)), - "Your current bundle version {currentVersion} has reached end of support on Aug 4, 2026. Upgrade to [{suggestedMinVersion}.*, {suggestedMaxVersion}.0.0). For more information, see https://aka.ms/FunctionsBundlesUpgrade"); + "Your app is using an older version - {currentVersion} of extension bundle. Upgrade to [{suggestedMinVersion}.*, {suggestedMaxVersion}.0.0). For more information, see https://aka.ms/FunctionsBundlesUpgrade"); public static void PublishingMetrics(this ILogger logger, string metrics) { @@ -420,17 +415,7 @@ public static void IncorrectAzureFunctionsFolderPath(this ILogger logger, string public static void OutdatedExtensionBundle(this ILogger logger, string currentVersion, int suggestedMinVersion, int suggestedMaxVersion) { - var currentTime = DateTime.UtcNow; - var deprecationDate = new DateTime(2026, 8, 5, 0, 0, 0, DateTimeKind.Utc); - - if (currentTime >= deprecationDate) - { - _outdatedExtensionBundlePast(logger, currentVersion, suggestedMinVersion, suggestedMaxVersion, null); - } - else - { - _outdatedExtensionBundleFuture(logger, currentVersion, suggestedMinVersion, suggestedMaxVersion, null); - } + _outdatedExtensionBundle(logger, currentVersion, suggestedMinVersion, suggestedMaxVersion, null); } } } \ No newline at end of file diff --git a/test/WebJobs.Script.Tests/Description/FunctionAppValidationServiceTests.cs b/test/WebJobs.Script.Tests/Description/FunctionAppValidationServiceTests.cs index 1258fdc12a..0f2f886515 100644 --- a/test/WebJobs.Script.Tests/Description/FunctionAppValidationServiceTests.cs +++ b/test/WebJobs.Script.Tests/Description/FunctionAppValidationServiceTests.cs @@ -198,14 +198,9 @@ public void GetOutdatedBundleWarningMessage_LogsWarning(string bundleId, string // Assert var logMessages = _testLoggerProvider.GetAllLogMessages(); - // Check for both possible resource strings (future and past deprecation) - bool hasFutureWarning = logMessages.Any(m => m.FormattedMessage.Contains(bundleVersion) - && m.FormattedMessage.Contains("will reach end of support on Aug 4, 2026.") + bool hasOutdatedBundleLog = logMessages.Any(m => m.FormattedMessage.Contains(bundleVersion) + && m.FormattedMessage.Contains("older version") && m.Level == LogLevel.Warning); - bool hasPastWarning = logMessages.Any(m => m.FormattedMessage.Contains(bundleVersion) - && m.FormattedMessage.Contains("has reached end of support on Aug 4, 2026.") - && m.Level == LogLevel.Warning); - bool hasOutdatedBundleLog = hasFutureWarning || hasPastWarning; Assert.Equal(shouldLogEvent, hasOutdatedBundleLog); } From fe4336e5ac014379391142347a78857381ee8e6f Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Fri, 1 Aug 2025 15:45:20 -0700 Subject: [PATCH 2/3] add release notes --- release_notes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release_notes.md b/release_notes.md index 84ef3fd44e..c020840d90 100644 --- a/release_notes.md +++ b/release_notes.md @@ -3,4 +3,5 @@ -- Add JitTrace Files for v4.1042 \ No newline at end of file +- Add JitTrace Files for v4.1042 +- Update outdated bundle message - removed deprecation date #11230 From e44e3e6eb4f0e59fefb41d6c637418b97e2a9a9d Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Wed, 13 Aug 2025 13:54:56 -0700 Subject: [PATCH 3/3] update release notes --- release_notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_notes.md b/release_notes.md index 0cd217223f..86c22783a7 100644 --- a/release_notes.md +++ b/release_notes.md @@ -5,5 +5,5 @@ --> - Add JitTrace Files for v4.1042 - Updating OTel related nuget packages (#11216) -- Moving to version 1.5.7 of Microsoft.Azure.AppService.Middleware.Functions () +- Moving to version 1.5.7 of Microsoft.Azure.AppService.Middleware.Functions (#11231) - Update outdated bundle message - removed deprecation date (#11230)