FO 3.2.14/CO 2.2.8

microsoft · Jan 31, 2024 · 4b9e786 · 4b9e786
2 parents 9d4f5dd + 6d008e0
commit 4b9e786
Show file tree

Hide file tree

Showing 60 changed files with 970 additions and 882 deletions.
diff --git a/Build-COSFPkgs.ps1 b/Build-COSFPkgs.ps1
@@ -23,11 +23,11 @@ function Build-SFPkg {
 try {
     Push-Location $scriptPath
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.SelfContained.2.2.7" "$scriptPath\bin\release\ClusterObserver\linux-x64\self-contained\ClusterObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.FrameworkDependent.2.2.7" "$scriptPath\bin\release\ClusterObserver\linux-x64\framework-dependent\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.SelfContained.2.2.8" "$scriptPath\bin\release\ClusterObserver\linux-x64\self-contained\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.FrameworkDependent.2.2.8" "$scriptPath\bin\release\ClusterObserver\linux-x64\framework-dependent\ClusterObserverType"
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.SelfContained.2.2.7" "$scriptPath\bin\release\ClusterObserver\win-x64\self-contained\ClusterObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.FrameworkDependent.2.2.7" "$scriptPath\bin\release\ClusterObserver\win-x64\framework-dependent\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.SelfContained.2.2.8" "$scriptPath\bin\release\ClusterObserver\win-x64\self-contained\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.FrameworkDependent.2.2.8" "$scriptPath\bin\release\ClusterObserver\win-x64\framework-dependent\ClusterObserverType"
 }
 finally {
     Pop-Location

diff --git a/Build-SFPkgs.ps1 b/Build-SFPkgs.ps1
@@ -23,11 +23,11 @@ function Build-SFPkg {
 try {
     Push-Location $scriptPath
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.2.13" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.2.13" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.2.14" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.2.14" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.2.13" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.2.13" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.2.14" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.2.14" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
 }
 finally {
     Pop-Location

diff --git a/ClusterObserver.nuspec.template b/ClusterObserver.nuspec.template
@@ -2,10 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
 	<metadata minClientVersion="3.3.0">
 		<id>%PACKAGE_ID%</id>
-		<version>2.2.7</version>
+		<version>2.2.8</version>
 		<releaseNotes>
-- Bug Fixes.
-- Performance and Code improvements.
+- *Breaking Change*: Telemetry configuration settings are now required to be overridden in ApplicationManifest.xml to support versionless, parameter-only application upgrades for telemetry settings. See [Issue 292](https://github.com/microsoft/service-fabric-observer/issues/292) for details. Just move your related settings' Value strings from Settings.xml to ApplicationManifest.xml app parameter (the names of these settings are the same).
+- Bug fix in app param update for log path and max archive lifetime settings.
+- Updated nuget package dependencies to latest versions.
 		</releaseNotes>
 		<authors>Microsoft</authors>
 		<license type="expression">MIT</license>

diff --git a/ClusterObserver/ClusterObserver.cs b/ClusterObserver/ClusterObserver.cs
@@ -104,7 +104,7 @@ public ClusterObserver(StatelessServiceContext serviceContext, bool ignoreDefaul
         public override async Task ObserveAsync(CancellationToken token)
         {
             if (!IsEnabled || (!IsTelemetryEnabled && !IsEtwEnabled)
-                || (RunInterval > TimeSpan.MinValue && DateTime.Now.Subtract(LastRunDateTime) < RunInterval))
+                || (RunInterval > TimeSpan.Zero && DateTime.Now.Subtract(LastRunDateTime) < RunInterval))
             {
                 return;
             }
@@ -816,7 +816,7 @@ private async Task ProcessEntityHealthAsync<EntityHealth>(EntityHealth entityHea
                             Description = healthEvent.HealthInformation.Description,
                             HealthState = healthEvent.HealthInformation.HealthState,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.
@@ -856,7 +856,7 @@ private async Task ProcessEntityHealthAsync<EntityHealth>(EntityHealth entityHea
                             Description = healthEvent.HealthInformation.Description,
                             HealthState = healthEvent.HealthInformation.HealthState,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.
@@ -909,7 +909,7 @@ await FabricClientInstance.QueryManager.GetDeployedServicePackageListAsync(
                             Description = healthEvent.HealthInformation.Description,
                             HealthState = healthEvent.HealthInformation.HealthState,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.
@@ -987,7 +987,7 @@ await FabricClientInstance.QueryManager.GetDeployedServicePackageListAsync(
                             Description = healthEvent.HealthInformation.Description,
                             HealthState = healthEvent.HealthInformation.HealthState,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.
@@ -1044,7 +1044,7 @@ await FabricClientInstance.QueryManager.GetReplicaListAsync(
                             HealthState = healthEvent.HealthInformation.HealthState,
                             ServiceKind = serviceKind,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.
@@ -1104,7 +1104,7 @@ await FabricClientInstance.QueryManager.GetReplicaListAsync(
                             Description = healthEvent.HealthInformation.Description,
                             HealthState = healthEvent.HealthInformation.HealthState,
                             Source = healthEvent.HealthInformation.SourceId,
-                            ObserverName = ClusterObserverConstants.ClusterObserverName
+                            ObserverName = ObserverName
                         };
 
                         // Telemetry.

diff --git a/ClusterObserver/ClusterObserver.csproj b/ClusterObserver/ClusterObserver.csproj
@@ -10,8 +10,8 @@
 		<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
 		<TargetLatestRuntimePatch>True</TargetLatestRuntimePatch>
 		<Product>ClusterObserver</Product>
-		<Version>2.2.7</Version>
-		<FileVersion>2.2.7</FileVersion>
+		<Version>2.2.8</Version>
+		<FileVersion>2.2.8</FileVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<StartupObject>ClusterObserver.Program</StartupObject>