[9.2] [Synthetics] Sync task de-dupe cache init !! (#241094) (#241470)

# Backport

This will backport the following commits from `main` to `9.2`:
- [[Synthetics] Sync task de-dupe cache init !!
(#241094)](#241094)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT
[{"author":{"name":"Shahzad","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-10-31T15:03:22Z","message":"[Synthetics]
Sync task de-dupe cache init !! (#241094)\n\n## Summary\n\nRun with
cache was called being twice in the code flow, this make sure\nto do it
only once.\n\n\n### After\nThere should be only one span for Find latest
synthetics package\n<img width=\"1724\" height=\"894\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/79e90175-3179-4212-bd7d-0fe5220dcbca\"\n/>\n\n###
Before\n\n<img width=\"2556\" height=\"1186\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/fa7079e0-c86d-4383-b266-ad1bf0914666\"\n/>","sha":"db6da914f49e2a3d2d1231a71415357bc6829041","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:obs-ux-management","backport:version","author:obs-ux-management","v9.3.0","v8.19.7","v9.1.7","v9.2.1"],"title":"[Synthetics]
Sync task de-dupe cache init
!!","number":241094,"url":"https://github.com/elastic/kibana/pull/241094","mergeCommit":{"message":"[Synthetics]
Sync task de-dupe cache init !! (#241094)\n\n## Summary\n\nRun with
cache was called being twice in the code flow, this make sure\nto do it
only once.\n\n\n### After\nThere should be only one span for Find latest
synthetics package\n<img width=\"1724\" height=\"894\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/79e90175-3179-4212-bd7d-0fe5220dcbca\"\n/>\n\n###
Before\n\n<img width=\"2556\" height=\"1186\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/fa7079e0-c86d-4383-b266-ad1bf0914666\"\n/>","sha":"db6da914f49e2a3d2d1231a71415357bc6829041"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","9.1","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/241094","number":241094,"mergeCommit":{"message":"[Synthetics]
Sync task de-dupe cache init !! (#241094)\n\n## Summary\n\nRun with
cache was called being twice in the code flow, this make sure\nto do it
only once.\n\n\n### After\nThere should be only one span for Find latest
synthetics package\n<img width=\"1724\" height=\"894\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/79e90175-3179-4212-bd7d-0fe5220dcbca\"\n/>\n\n###
Before\n\n<img width=\"2556\" height=\"1186\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/fa7079e0-c86d-4383-b266-ad1bf0914666\"\n/>","sha":"db6da914f49e2a3d2d1231a71415357bc6829041"}},{"branch":"8.19","label":"v8.19.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Shahzad <[email protected]>

Author: kibanamachine

x-pack/solutions/observability/plugins/synthetics/server/synthetics_route_wrapper.ts

@@ -66,7 +66,7 @@ export const syntheticsRouteWrapper: SyntheticsRouteWrapper = (
       const spaceId = server.spaces?.spacesService.getSpaceId(request) ?? DEFAULT_SPACE_ID;
 
       try {
-        const res = await syntheticsRoute.handler({
+        const data = {
           syntheticsEsClient,
           savedObjectsClient,
           context,
@@ -76,7 +76,10 @@ export const syntheticsRouteWrapper: SyntheticsRouteWrapper = (
           spaceId,
           syntheticsMonitorClient,
           monitorConfigRepository,
-        });
+        };
+
+        const res = await server.fleet.runWithCache(() => syntheticsRoute.handler(data));
+
         if (isKibanaResponse(res)) {
           return res;
         }

x-pack/solutions/observability/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts

@@ -148,74 +148,72 @@ export class SyntheticsPrivateLocation {
     if (configs.length === 0) {
       return { created: [], failed: [] };
     }
-    return this.runWithCache(async () => {
-      const newPolicies: NewPackagePolicyWithId[] = [];
-      const newPolicyTemplate = await this.buildNewPolicy();
+    const newPolicies: NewPackagePolicyWithId[] = [];
+    const newPolicyTemplate = await this.buildNewPolicy();
 
-      for (const { config, globalParams } of configs) {
-        try {
-          const { locations } = config;
-          const fleetManagedLocations = locations.filter((loc) => !loc.isServiceManaged);
-
-          for (const privateLocation of fleetManagedLocations) {
-            const location = privateLocations?.find((loc) => loc.id === privateLocation.id)!;
-            if (!location) {
-              throw new Error(
-                `Unable to find Synthetics private location for agentId ${privateLocation.id}`
-              );
-            }
+    for (const { config, globalParams } of configs) {
+      try {
+        const { locations } = config;
+        const fleetManagedLocations = locations.filter((loc) => !loc.isServiceManaged);
 
-            const newPolicy = await this.generateNewPolicy(
-              config,
-              location,
-              newPolicyTemplate,
-              spaceId,
-              globalParams,
-              maintenanceWindows,
-              testRunId,
-              runOnce
+        for (const privateLocation of fleetManagedLocations) {
+          const location = privateLocations?.find((loc) => loc.id === privateLocation.id)!;
+          if (!location) {
+            throw new Error(
+              `Unable to find Synthetics private location for agentId ${privateLocation.id}`
             );
+          }
 
-            if (!newPolicy) {
-              throw new Error(
-                `Unable to create Synthetics package policy for monitor ${
-                  config[ConfigKey.NAME]
-                } with private location ${location.label}`
-              );
-            }
-            if (newPolicy) {
-              if (testRunId) {
-                newPolicies.push(newPolicy as NewPackagePolicyWithId);
-              } else {
-                newPolicies.push({
-                  ...newPolicy,
-                  id: this.getPolicyId(config, location.id, spaceId),
-                });
-              }
+          const newPolicy = await this.generateNewPolicy(
+            config,
+            location,
+            newPolicyTemplate,
+            spaceId,
+            globalParams,
+            maintenanceWindows,
+            testRunId,
+            runOnce
+          );
+
+          if (!newPolicy) {
+            throw new Error(
+              `Unable to create Synthetics package policy for monitor ${
+                config[ConfigKey.NAME]
+              } with private location ${location.label}`
+            );
+          }
+          if (newPolicy) {
+            if (testRunId) {
+              newPolicies.push(newPolicy as NewPackagePolicyWithId);
+            } else {
+              newPolicies.push({
+                ...newPolicy,
+                id: this.getPolicyId(config, location.id, spaceId),
+              });
             }
           }
-        } catch (e) {
-          this.server.logger.error(e);
-          throw e;
-        }
-      }
-
-      if (newPolicies.length === 0) {
-        throw new Error('Failed to build package policies for all monitors');
-      }
-
-      try {
-        const result = await this.createPolicyBulk(newPolicies);
-        if (result?.created && result?.created?.length > 0 && testRunId) {
-          // ignore await here, we don't want to wait for this to finish
-          void scheduleCleanUpTask(this.server);
         }
-        return result;
       } catch (e) {
         this.server.logger.error(e);
         throw e;
       }
-    });
+    }
+
+    if (newPolicies.length === 0) {
+      throw new Error('Failed to build package policies for all monitors');
+    }
+
+    try {
+      const result = await this.createPolicyBulk(newPolicies);
+      if (result?.created && result?.created?.length > 0 && testRunId) {
+        // ignore await here, we don't want to wait for this to finish
+        void scheduleCleanUpTask(this.server);
+      }
+      return result;
+    } catch (e) {
+      this.server.logger.error(e);
+      throw e;
+    }
   }
 
   async inspectPackagePolicy({
@@ -276,90 +274,88 @@ export class SyntheticsPrivateLocation {
       };
     }
 
-    return this.runWithCache(async () => {
-      const [newPolicyTemplate, existingPolicies] = await Promise.all([
-        this.buildNewPolicy(),
-        this.getExistingPolicies(
-          configs.map(({ config }) => config),
-          allPrivateLocations,
-          spaceId
-        ),
-      ]);
-
-      const policiesToUpdate: NewPackagePolicyWithId[] = [];
-      const policiesToCreate: NewPackagePolicyWithId[] = [];
-      const policiesToDelete: string[] = [];
-
-      for (const { config, globalParams } of configs) {
-        const { locations } = config;
+    const [newPolicyTemplate, existingPolicies] = await Promise.all([
+      this.buildNewPolicy(),
+      this.getExistingPolicies(
+        configs.map(({ config }) => config),
+        allPrivateLocations,
+        spaceId
+      ),
+    ]);
 
-        const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
+    const policiesToUpdate: NewPackagePolicyWithId[] = [];
+    const policiesToCreate: NewPackagePolicyWithId[] = [];
+    const policiesToDelete: string[] = [];
 
-        for (const privateLocation of allPrivateLocations) {
-          const hasLocation = monitorPrivateLocations?.some((loc) => loc.id === privateLocation.id);
-          const currId = this.getPolicyId(config, privateLocation.id, spaceId);
-          const hasPolicy = existingPolicies?.some((policy) => policy.id === currId);
-          try {
-            if (hasLocation) {
-              const newPolicy = await this.generateNewPolicy(
-                config,
-                privateLocation,
-                newPolicyTemplate,
-                spaceId,
-                globalParams,
-                maintenanceWindows
-              );
-
-              if (!newPolicy) {
-                throwAddEditError(hasPolicy, privateLocation.label);
-              }
+    for (const { config, globalParams } of configs) {
+      const { locations } = config;
 
-              if (hasPolicy) {
-                policiesToUpdate.push({ ...newPolicy, id: currId } as NewPackagePolicyWithId);
-              } else {
-                policiesToCreate.push({ ...newPolicy, id: currId } as NewPackagePolicyWithId);
-              }
-            } else if (hasPolicy) {
-              policiesToDelete.push(currId);
+      const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
+
+      for (const privateLocation of allPrivateLocations) {
+        const hasLocation = monitorPrivateLocations?.some((loc) => loc.id === privateLocation.id);
+        const currId = this.getPolicyId(config, privateLocation.id, spaceId);
+        const hasPolicy = existingPolicies?.some((policy) => policy.id === currId);
+        try {
+          if (hasLocation) {
+            const newPolicy = await this.generateNewPolicy(
+              config,
+              privateLocation,
+              newPolicyTemplate,
+              spaceId,
+              globalParams,
+              maintenanceWindows
+            );
+
+            if (!newPolicy) {
+              throwAddEditError(hasPolicy, privateLocation.label);
+            }
+
+            if (hasPolicy) {
+              policiesToUpdate.push({ ...newPolicy, id: currId } as NewPackagePolicyWithId);
+            } else {
+              policiesToCreate.push({ ...newPolicy, id: currId } as NewPackagePolicyWithId);
             }
-          } catch (e) {
-            this.server.logger.error(e);
-            throwAddEditError(hasPolicy, privateLocation.label, config[ConfigKey.NAME]);
+          } else if (hasPolicy) {
+            policiesToDelete.push(currId);
           }
+        } catch (e) {
+          this.server.logger.error(e);
+          throwAddEditError(hasPolicy, privateLocation.label, config[ConfigKey.NAME]);
         }
       }
+    }
 
-      this.server.logger.debug(
-        `[editingMonitors] Creating ${policiesToCreate.length} policies, updating ${policiesToUpdate.length} policies, and deleting ${policiesToDelete.length} policies`
-      );
+    this.server.logger.debug(
+      `[editingMonitors] Creating ${policiesToCreate.length} policies, updating ${policiesToUpdate.length} policies, and deleting ${policiesToDelete.length} policies`
+    );
 
-      const [_createResponse, failedUpdatesRes, _deleteResponse] = await Promise.all([
-        this.createPolicyBulk(policiesToCreate),
-        this.updatePolicyBulk(policiesToUpdate),
-        this.deletePolicyBulk(policiesToDelete),
-      ]);
+    const [_createResponse, failedUpdatesRes, _deleteResponse] = await Promise.all([
+      this.createPolicyBulk(policiesToCreate),
+      this.updatePolicyBulk(policiesToUpdate),
+      this.deletePolicyBulk(policiesToDelete),
+    ]);
 
-      const failedUpdates = failedUpdatesRes?.map(({ packagePolicy, error }) => {
-        const policyConfig = configs.find(({ config }) => {
-          const { locations } = config;
+    const failedUpdates = failedUpdatesRes?.map(({ packagePolicy, error }) => {
+      const policyConfig = configs.find(({ config }) => {
+        const { locations } = config;
 
-          const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
-          for (const privateLocation of monitorPrivateLocations) {
-            const currId = this.getPolicyId(config, privateLocation.id, spaceId);
-            return currId === packagePolicy.id;
-          }
-        });
-        return {
-          error,
-          packagePolicy,
-          config: policyConfig?.config,
-        };
+        const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
+        for (const privateLocation of monitorPrivateLocations) {
+          const currId = this.getPolicyId(config, privateLocation.id, spaceId);
+          return currId === packagePolicy.id;
+        }
       });
-
       return {
-        failedUpdates,
+        error,
+        packagePolicy,
+        config: policyConfig?.config,
       };
     });
+
+    return {
+      failedUpdates,
+    };
   }
 
   async getExistingPolicies(
@@ -436,39 +432,37 @@ export class SyntheticsPrivateLocation {
   }
 
   async deleteMonitors(configs: HeartbeatConfig[], spaceId: string) {
-    return this.runWithCache(async () => {
-      const soClient = this.server.coreStart.savedObjects.createInternalRepository();
-      const esClient = this.server.coreStart.elasticsearch.client.asInternalUser;
+    const soClient = this.server.coreStart.savedObjects.createInternalRepository();
+    const esClient = this.server.coreStart.elasticsearch.client.asInternalUser;
 
-      const policyIdsToDelete = [];
-      for (const config of configs) {
-        const { locations } = config;
+    const policyIdsToDelete = [];
+    for (const config of configs) {
+      const { locations } = config;
 
-        const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
+      const monitorPrivateLocations = locations.filter((loc) => !loc.isServiceManaged);
 
-        for (const privateLocation of monitorPrivateLocations) {
-          policyIdsToDelete.push(this.getPolicyId(config, privateLocation.id, spaceId));
-        }
+      for (const privateLocation of monitorPrivateLocations) {
+        policyIdsToDelete.push(this.getPolicyId(config, privateLocation.id, spaceId));
       }
-      if (policyIdsToDelete.length > 0) {
-        const result = await this.server.fleet.packagePolicyService.delete(
-          soClient,
-          esClient,
-          policyIdsToDelete,
-          {
-            force: true,
-            asyncDeploy: true,
-          }
-        );
-        const failedPolicies = result?.filter((policy) => {
-          return !policy.success && policy?.statusCode !== 404;
-        });
-        if (failedPolicies?.length === policyIdsToDelete.length) {
-          throw new Error(deletePolicyError(configs[0][ConfigKey.NAME]));
+    }
+    if (policyIdsToDelete.length > 0) {
+      const result = await this.server.fleet.packagePolicyService.delete(
+        soClient,
+        esClient,
+        policyIdsToDelete,
+        {
+          force: true,
+          asyncDeploy: true,
         }
-        return result;
+      );
+      const failedPolicies = result?.filter((policy) => {
+        return !policy.success && policy?.statusCode !== 404;
+      });
+      if (failedPolicies?.length === policyIdsToDelete.length) {
+        throw new Error(deletePolicyError(configs[0][ConfigKey.NAME]));
       }
-    });
+      return result;
+    }
   }
 
   async getAgentPolicies() {
@@ -481,10 +475,6 @@ export class SyntheticsPrivateLocation {
     }
     return undefined;
   }
-
-  async runWithCache<T>(fn: () => Promise<T>): Promise<T> {
-    return await this.server.fleet.runWithCache(fn);
-  }
 }
 
 const throwAddEditError = (hasPolicy: boolean, location?: string, name?: string) => {

x-pack/solutions/observability/plugins/synthetics/server/tasks/sync_private_locations_monitors_task.ts

@@ -132,6 +132,8 @@ export class SyncPrivateLocationMonitorsTask {
             soClient,
             encryptedSavedObjects,
           });
+        } else {
+          this.debugLog(`No private locations found, skipping sync`);
         }
         this.debugLog(`Sync of private location monitors succeeded`);
       } else {