From 9747cdd7d171f3539fef0fec85c054c499f787dd Mon Sep 17 00:00:00 2001
From: Esteban Beltran <academo@users.noreply.github.com>
Date: Tue, 3 Oct 2023 10:22:17 +0200
Subject: [PATCH] Sandbox: Update to latest near membrane version ^0.13.0
 (#75605)

* Sandbox: Update to latest near membrane version ^0.13.0

* Use exact version

* Replace throw with reject

* Add nera membrane to renovate skip list
---
 .github/renovate.json5                        |  3 ++
 package.json                                  |  6 +--
 .../plugins/sandbox/sandbox_plugin_loader.ts  | 42 +---------------
 yarn.lock                                     | 48 +++++++++----------
 4 files changed, 31 insertions(+), 68 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 2f760c42165..be44fa33c7d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -16,6 +16,9 @@
     "systemjs",
     "ts-loader", // we should remove ts-loader and use babel-loader instead
     "ora", // we should bump this once we move to esm modules
+    "@locker/near-membrane-dom", // critical library. we need to bump this only intentionally
+    "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
+    "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
   ],
   "includePaths": ["package.json", "packages/**"],
   "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
diff --git a/package.json b/package.json
index def058bf1ac..fdf917b05fc 100644
--- a/package.json
+++ b/package.json
@@ -259,9 +259,9 @@
     "@lezer/common": "1.0.2",
     "@lezer/highlight": "1.1.3",
     "@lezer/lr": "1.3.3",
-    "@locker/near-membrane-dom": "^0.12.15",
-    "@locker/near-membrane-shared": "^0.12.15",
-    "@locker/near-membrane-shared-dom": "^0.12.15",
+    "@locker/near-membrane-dom": "0.13.3",
+    "@locker/near-membrane-shared": "0.13.3",
+    "@locker/near-membrane-shared-dom": "0.13.3",
     "@opentelemetry/api": "1.4.1",
     "@opentelemetry/exporter-collector": "0.25.0",
     "@opentelemetry/semantic-conventions": "1.15.0",
diff --git a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts b/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
index e169905fab6..46b901f74ae 100644
--- a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
+++ b/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
@@ -161,22 +161,6 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
           }
         },
       }),
-      // This improves the error message output for plugins
-      // because errors thrown inside of the sandbox have a stack
-      // trace that is difficult to read due to all the sandboxing
-      // layers.
-      instrumentation: {
-        // near-membrane concept of "activity" is something that happens inside
-        // the plugin instrumentation
-        startActivity() {
-          return {
-            stop: () => {},
-            error: getActivityErrorHandler(meta.id),
-          };
-        },
-        log: () => {},
-        error: () => {},
-      },
     });
 
     patchSandboxEnvironmentPrototype(sandboxEnvironment);
@@ -186,8 +170,7 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
     try {
       pluginCode = await getPluginCode(meta);
     } catch (e) {
-      throw new Error(`Could not load plugin ${meta.id}: ` + e);
-      reject(new Error(`Could not load plugin ${meta.id}: ` + e));
+      reject(new Error(`Could not load plugin code ${meta.id}: ` + e));
     }
 
     try {
@@ -206,29 +189,6 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
   });
 }
 
-function getActivityErrorHandler(pluginId: string) {
-  return async function error(proxyError?: Error & { sandboxError?: boolean }) {
-    if (!proxyError) {
-      return;
-    }
-    // flag this error as a sandbox error
-    proxyError.sandboxError = true;
-
-    //  create a new error to unwrap it from the proxy
-    const newError = new Error(proxyError.message.toString());
-    newError.name = proxyError.name.toString();
-    newError.stack = proxyError.stack || '';
-
-    // If you are seeing this is because
-    // the plugin is throwing an error
-    // and it is not being caught by the plugin code
-    // This is a sandbox wrapper error.
-    // and not the real error
-    console.log(`[sandbox] Error from plugin ${pluginId}`);
-    console.error(newError);
-  };
-}
-
 function resolvePluginDependencies(deps: string[]) {
   // resolve dependencies
   const resolvedDeps: CompartmentDependencyModule[] = [];
diff --git a/yarn.lock b/yarn.lock
index 2fd50607391..6c0ca94abf6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6151,39 +6151,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-base@npm:0.12.15":
-  version: 0.12.15
-  resolution: "@locker/near-membrane-base@npm:0.12.15"
+"@locker/near-membrane-base@npm:0.13.3":
+  version: 0.13.3
+  resolution: "@locker/near-membrane-base@npm:0.13.3"
   dependencies:
-    "@locker/near-membrane-shared": 0.12.15
-  checksum: 353b172bcd3a1d3790ca0baef4b8d0aabb7c1077cfb4452df9f4b36b44bafe054ab5d9b9cb4ec47deb6504bbaa4b516554a0406cbfa948cea2ceb4b4926a5d67
+    "@locker/near-membrane-shared": 0.13.3
+  checksum: c523503566823cd82ef8e7f0a848b903c8b0d547c04d2498028497f8ccc63f2fc552c86f0196164627f391cec050d8df46244ba21b8675907a7581c0e7b5194a
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-dom@npm:^0.12.15":
-  version: 0.12.15
-  resolution: "@locker/near-membrane-dom@npm:0.12.15"
+"@locker/near-membrane-dom@npm:0.13.3":
+  version: 0.13.3
+  resolution: "@locker/near-membrane-dom@npm:0.13.3"
   dependencies:
-    "@locker/near-membrane-base": 0.12.15
-    "@locker/near-membrane-shared": 0.12.15
-    "@locker/near-membrane-shared-dom": 0.12.15
-  checksum: cd0d692f36665031f2485c8e4ff40e8cf051b7cecdf34b34171446585791f59b0b69b4570490918084178b37a26986f501b128b52c49b9b25aa8958e0cea15a8
+    "@locker/near-membrane-base": 0.13.3
+    "@locker/near-membrane-shared": 0.13.3
+    "@locker/near-membrane-shared-dom": 0.13.3
+  checksum: 3f226a6d4eb60d46fbacee6c837110321e958758b23c0669a85e938f5b4282ba5c46356938948eb40b7339431165904149ebd935a40f6e4e71cc173ce023bea3
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-shared-dom@npm:0.12.15, @locker/near-membrane-shared-dom@npm:^0.12.15":
-  version: 0.12.15
-  resolution: "@locker/near-membrane-shared-dom@npm:0.12.15"
+"@locker/near-membrane-shared-dom@npm:0.13.3":
+  version: 0.13.3
+  resolution: "@locker/near-membrane-shared-dom@npm:0.13.3"
   dependencies:
-    "@locker/near-membrane-shared": 0.12.15
-  checksum: 2faabd8dc7d508d35f17f8573a78a5ec48aaa232e53791e182792516dec285e60c32e811ffd00bd1c916e56ba1e1ff7199fc8e4cdcf061b388a8ba6f22ad44c4
+    "@locker/near-membrane-shared": 0.13.3
+  checksum: d6428c57702ecbee660b4c57f7d1de6f3068a44218795547697f506f07aab56dca919f289163e0c61c397ca605a446b3b78e47a2fa39b86da57d7fcecd9fe42d
   languageName: node
   linkType: hard
 
-"@locker/near-membrane-shared@npm:0.12.15, @locker/near-membrane-shared@npm:^0.12.15":
-  version: 0.12.15
-  resolution: "@locker/near-membrane-shared@npm:0.12.15"
-  checksum: de5d44022148f7f9183781d50d591a40d8b54cc7692bbd54ee865c0a7ddb6bf15d465fb0e804ad86cbea9135cc7d31983eaed9c8cdbbe9dc94d9e74eaac75134
+"@locker/near-membrane-shared@npm:0.13.3":
+  version: 0.13.3
+  resolution: "@locker/near-membrane-shared@npm:0.13.3"
+  checksum: ccab2a50a01abb84be0428eb77c817d86a292d954e58eb56d9df0e69793bbfb1557611e21a4d3220af9d959f2129f8e170527ba9d994cd0208a3164b3a29c69c
   languageName: node
   linkType: hard
 
@@ -19998,9 +19998,9 @@ __metadata:
     "@lezer/common": 1.0.2
     "@lezer/highlight": 1.1.3
     "@lezer/lr": 1.3.3
-    "@locker/near-membrane-dom": ^0.12.15
-    "@locker/near-membrane-shared": ^0.12.15
-    "@locker/near-membrane-shared-dom": ^0.12.15
+    "@locker/near-membrane-dom": 0.13.3
+    "@locker/near-membrane-shared": 0.13.3
+    "@locker/near-membrane-shared-dom": 0.13.3
     "@opentelemetry/api": 1.4.1
     "@opentelemetry/exporter-collector": 0.25.0
     "@opentelemetry/semantic-conventions": 1.15.0